Nulo/river
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Gracefully handle transaction preemption

Browse source
This commit is contained in:
Isaac Freund 2020-03-28 21:05:56 +01:00
parent d34df295f7
commit 029e49e1c5
No known key found for this signature in database
GPG key ID: 86DED400DDFD7A11
1 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/root.zig
View file

@ -188,11 +188,17 @@ pub const Root = struct {
/// Initiate an atomic change to the layout. This change will not be /// Initiate an atomic change to the layout. This change will not be
/// applied until all affected clients ack a configure and commit a buffer. /// applied until all affected clients ack a configure and commit a buffer.
fn startTransaction(self: *Self) void { fn startTransaction(self: *Self) void {
std.debug.assert(self.pending_count == 0); // If a new transaction is started while another is in progress, we need
// to reset the pending count to 0 and clear serials from the views
self.pending_count = 0;
var it = self.views.first; var it = self.views.first;
while (it) |node| : (it = node.next) { while (it) |node| : (it = node.next) {
const view = &node.data; const view = &node.data;
// Clear the serial in case this transaction is interrupting a prior one.
view.pending_serial = null;
if (view.needsConfigure()) { if (view.needsConfigure()) {
view.configurePending(); view.configurePending();
self.pending_count += 1; self.pending_count += 1;
@ -202,7 +208,12 @@ pub const Root = struct {
// redrawing. // redrawing.
view.sendFrameDone(); view.sendFrameDone();
} }
view.stashBuffer();
// If there is a saved buffer present, then this transaction is interrupting
// a previous transaction and we should keep the old buffer.
if (view.stashed_buffer == null) {
view.stashBuffer();
}
} }
// TODO: start a timer and handle timeout waiting for all clients to ack // TODO: start a timer and handle timeout waiting for all clients to ack