alex/swayfx
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2663 from ianyfan/fix-txn-state-leaks

Browse source 
Free transaction state upon destruction by removing pointer indirection
This commit is contained in:
Ryan Dwyer 2018-09-28 18:27:01 +10:00 committed by GitHub
parent 0b2afee711 0dfcadc1cf
commit 5104bd2c59
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
sway/desktop/transaction.c
View file

@ -31,14 +31,14 @@ struct sway_transaction_instruction {
struct sway_transaction *transaction; struct sway_transaction *transaction;
struct sway_node *node; struct sway_node *node;
union { union {
struct sway_output_state *output_state; struct sway_output_state output_state;
struct sway_workspace_state *workspace_state; struct sway_workspace_state workspace_state;
struct sway_container_state *container_state; struct sway_container_state container_state;
}; };
uint32_t serial; uint32_t serial;
}; };
static struct sway_transaction *transaction_create() { static struct sway_transaction *transaction_create(void) {
struct sway_transaction *transaction = struct sway_transaction *transaction =
calloc(1, sizeof(struct sway_transaction)); calloc(1, sizeof(struct sway_transaction));
if (!sway_assert(transaction, "Unable to allocate transaction")) { if (!sway_assert(transaction, "Unable to allocate transaction")) {
@ -86,14 +86,7 @@ static void transaction_destroy(struct sway_transaction *transaction) {
static void copy_output_state(struct sway_output *output, static void copy_output_state(struct sway_output *output,
struct sway_transaction_instruction *instruction) { struct sway_transaction_instruction *instruction) {
struct sway_output_state *state = struct sway_output_state *state = &instruction->output_state;
calloc(1, sizeof(struct sway_output_state));
if (!state) {
wlr_log(WLR_ERROR, "Could not allocate output state");
return;
}
instruction->output_state = state;
state->workspaces = create_list(); state->workspaces = create_list();
list_cat(state->workspaces, output->workspaces); list_cat(state->workspaces, output->workspaces);
@ -102,13 +95,7 @@ static void copy_output_state(struct sway_output *output,
static void copy_workspace_state(struct sway_workspace *ws, static void copy_workspace_state(struct sway_workspace *ws,
struct sway_transaction_instruction *instruction) { struct sway_transaction_instruction *instruction) {
struct sway_workspace_state *state = struct sway_workspace_state *state = &instruction->workspace_state;
calloc(1, sizeof(struct sway_workspace_state));
if (!state) {
wlr_log(WLR_ERROR, "Could not allocate workspace state");
return;
}
instruction->workspace_state = state;
state->fullscreen = ws->fullscreen; state->fullscreen = ws->fullscreen;
state->x = ws->x; state->x = ws->x;
@ -138,13 +125,7 @@ static void copy_workspace_state(struct sway_workspace *ws,
static void copy_container_state(struct sway_container *container, static void copy_container_state(struct sway_container *container,
struct sway_transaction_instruction *instruction) { struct sway_transaction_instruction *instruction) {
struct sway_container_state *state = struct sway_container_state *state = &instruction->container_state;
calloc(1, sizeof(struct sway_container_state));
if (!state) {
wlr_log(WLR_ERROR, "Could not allocate container state");
return;
}
instruction->container_state = state;
state->layout = container->layout; state->layout = container->layout;
state->con_x = container->x; state->con_x = container->x;
@ -301,15 +282,15 @@ static void transaction_apply(struct sway_transaction *transaction) {
case N_ROOT: case N_ROOT:
break; break;
case N_OUTPUT: case N_OUTPUT:
apply_output_state(node->sway_output, instruction->output_state); apply_output_state(node->sway_output, &instruction->output_state);
break; break;
case N_WORKSPACE: case N_WORKSPACE:
apply_workspace_state(node->sway_workspace, apply_workspace_state(node->sway_workspace,
instruction->workspace_state); &instruction->workspace_state);
break; break;
case N_CONTAINER: case N_CONTAINER:
apply_container_state(node->sway_container, apply_container_state(node->sway_container,
instruction->container_state); &instruction->container_state);
break; break;
} }
@ -335,7 +316,7 @@ static bool transaction_same_nodes(struct sway_transaction *a,
return true; return true;
} }
static void transaction_progress_queue() { static void transaction_progress_queue(void) {
if (!server.transactions->length) { if (!server.transactions->length) {
return; return;
} }
@ -390,7 +371,7 @@ static bool should_configure(struct sway_node *node,
return false; return false;
} }
struct sway_container_state *cstate = &node->sway_container->current; struct sway_container_state *cstate = &node->sway_container->current;
struct sway_container_state *istate = instruction->container_state; struct sway_container_state *istate = &instruction->container_state;
#ifdef HAVE_XWAYLAND #ifdef HAVE_XWAYLAND
// Xwayland views are position-aware and need to be reconfigured // Xwayland views are position-aware and need to be reconfigured
// when their position changes. // when their position changes.
@ -418,10 +399,10 @@ static void transaction_commit(struct sway_transaction *transaction) {
struct sway_node *node = instruction->node; struct sway_node *node = instruction->node;
if (should_configure(node, instruction)) { if (should_configure(node, instruction)) {
instruction->serial = view_configure(node->sway_container->view, instruction->serial = view_configure(node->sway_container->view,
instruction->container_state->view_x, instruction->container_state.view_x,
instruction->container_state->view_y, instruction->container_state.view_y,
instruction->container_state->view_width, instruction->container_state.view_width,
instruction->container_state->view_height); instruction->container_state.view_height);
++transaction->num_waiting; ++transaction->num_waiting;
// From here on we are rendering a saved buffer of the view, which // From here on we are rendering a saved buffer of the view, which
@ -513,8 +494,8 @@ void transaction_notify_view_ready_by_size(struct sway_view *view,
int width, int height) { int width, int height) {
struct sway_transaction_instruction *instruction = struct sway_transaction_instruction *instruction =
view->container->node.instruction; view->container->node.instruction;
if (instruction->container_state->view_width == width && if (instruction->container_state.view_width == width &&
instruction->container_state->view_height == height) { instruction->container_state.view_height == height) {
set_instruction_ready(instruction); set_instruction_ready(instruction);
} }
} }