mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-25 17:31:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Handle out-of-fd situations gracefully for transaction and urgent timers

Browse source
This commit is contained in:
Ryan Dwyer 2018-07-28 09:22:37 +10:00
parent a2164c6661
commit 32663b7b01
2 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
sway/desktop/transaction.c
View file

@ -316,7 +316,14 @@ static void transaction_commit(struct sway_transaction *transaction) {
// Set up a timer which the views must respond within
transaction->timer = wl_event_loop_add_timer(server.wl_event_loop,
handle_timeout, transaction);
wl_event_source_timer_update(transaction->timer, txn_timeout_ms);
if (transaction->timer) {
wl_event_source_timer_update(transaction->timer, txn_timeout_ms);
} else {
wlr_log(WLR_ERROR, "Unable to create transaction timer. "
"There might not be any available file descriptors. "
"Some imperfect frames might be rendered.");
handle_timeout(transaction);
}
}
// The debug tree shows the pending/live tree. Here is a good place to

10
sway/input/seat.c
View file

@ -696,8 +696,14 @@ void seat_set_focus_warp(struct sway_seat *seat,
config->urgent_timeout > 0) {
view->urgent_timer = wl_event_loop_add_timer(server.wl_event_loop,
handle_urgent_timeout, view);
wl_event_source_timer_update(view->urgent_timer,
config->urgent_timeout);
if (view->urgent_timer) {
wl_event_source_timer_update(view->urgent_timer,
config->urgent_timeout);
} else {
wlr_log(WLR_ERROR, "Unable to create urgency timer. "
"There might not be any available file descriptors.");
handle_urgent_timeout(view);
}
} else {
view_set_urgent(view, false);
}