From c3ef36d6b5d36f783f41b8860cee321b652f91e3 Mon Sep 17 00:00:00 2001
From: Ryan Dwyer <ryandwyer1@gmail.com>
Date: Wed, 15 Aug 2018 10:03:55 +1000
Subject: Simplify transactions
Commit 4b8e3a885be74c588291c51f798de80bd81a92db makes it so only one
transaction is committed (ie. configures sent) at a time. This commit
removes the now-unnecessary code which was used to support concurrent
committed transactions.
* Instead of containers storing a list of instructions which they've
been sent, it now stores a single instruction.
* Containers now have an ntxnrefs property. Previously we knew how many
references there were by the length of the instruction list.
* Instructions no longer need a ready property. It was used to avoid
marking an instruction ready twice when they were in a list, but this is
now avoided because there is only one instruction and we nullify the
container->instruction pointer when it's ready.
* When a transaction applies, we no longer need to consider releasing
and resaving the surface, as we know there are no other committed
transactions.
* transaction_notify_view_ready has been renamed to
view_notify_view_ready_by_serial to make it consistent with
transaction_notify_view_ready_by_size.
* Out-of-memory checks have been added when creating transactions and
instructions.
---
include/sway/tree/container.h | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
(limited to 'include/sway/tree')
diff --git a/include/sway/tree/container.h b/include/sway/tree/container.h
index 2a22f196..b64a2e63 100644
--- a/include/sway/tree/container.h
+++ b/include/sway/tree/container.h
@@ -151,7 +151,12 @@ struct sway_container {
struct wlr_texture *title_urgent;
size_t title_height;
- list_t *instructions; // struct sway_transaction_instruction *
+ // The number of transactions which reference this container.
+ size_t ntxnrefs;
+
+ // If this container is a view and is waiting for the client to respond to a
+ // configure then this will be populated, otherwise NULL.
+ struct sway_transaction_instruction *instruction;
bool destroying;
--
cgit v1.2.3