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

Merge pull request #2531 from RyanDwyer/maybe-fix-transaction-crash

Browse source 
Don't use bitfield to test for similar transactions
This commit is contained in:
Drew DeVault 2018-08-29 08:40:13 -04:00 committed by GitHub
parent 5f6dcffe47 b12f7be907
commit 3686724c9e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
sway/desktop/transaction.c
View file

@ -22,7 +22,6 @@ struct sway_transaction {
list_t *instructions; // struct sway_transaction_instruction * list_t *instructions; // struct sway_transaction_instruction *
size_t num_waiting; size_t num_waiting;
size_t num_configures; size_t num_configures;
uint32_t con_ids; // Bitwise XOR of view container IDs
struct timespec commit_time; struct timespec commit_time;
}; };
@ -228,6 +227,22 @@ static void transaction_apply(struct sway_transaction *transaction) {
static void transaction_commit(struct sway_transaction *transaction); static void transaction_commit(struct sway_transaction *transaction);
// Return true if both transactions operate on the same containers
static bool transaction_same_containers(struct sway_transaction *a,
struct sway_transaction *b) {
if (a->instructions->length != b->instructions->length) {
return false;
}
for (int i = 0; i < a->instructions->length; ++i) {
struct sway_transaction_instruction *a_inst = a->instructions->items[i];
struct sway_transaction_instruction *b_inst = b->instructions->items[i];
if (a_inst->container != b_inst->container) {
return false;
}
}
return true;
}
static void transaction_progress_queue() { static void transaction_progress_queue() {
if (!server.transactions->length) { if (!server.transactions->length) {
return; return;
@ -252,7 +267,7 @@ static void transaction_progress_queue() {
while (server.transactions->length >= 2) { while (server.transactions->length >= 2) {
struct sway_transaction *a = server.transactions->items[0]; struct sway_transaction *a = server.transactions->items[0];
struct sway_transaction *b = server.transactions->items[1]; struct sway_transaction *b = server.transactions->items[1];
if (a->con_ids == b->con_ids) { if (transaction_same_containers(a, b)) {
list_del(server.transactions, 0); list_del(server.transactions, 0);
transaction_destroy(a); transaction_destroy(a);
} else { } else {
@ -304,7 +319,6 @@ static void transaction_commit(struct sway_transaction *transaction) {
instruction->state.view_width, instruction->state.view_width,
instruction->state.view_height); instruction->state.view_height);
++transaction->num_waiting; ++transaction->num_waiting;
transaction->con_ids ^= con->id;
// 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
// means we can send a frame done event to make the client redraw it // means we can send a frame done event to make the client redraw it