diff options
Diffstat (limited to 'sway/desktop/transaction.c')
-rw-r--r-- | sway/desktop/transaction.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sway/desktop/transaction.c b/sway/desktop/transaction.c index 179af617..2b3f87c3 100644 --- a/sway/desktop/transaction.c +++ b/sway/desktop/transaction.c | |||
@@ -175,7 +175,7 @@ void transaction_add_container(struct sway_transaction *transaction, | |||
175 | * Apply a transaction to the "current" state of the tree. | 175 | * Apply a transaction to the "current" state of the tree. |
176 | */ | 176 | */ |
177 | static void transaction_apply(struct sway_transaction *transaction) { | 177 | static void transaction_apply(struct sway_transaction *transaction) { |
178 | wlr_log(L_DEBUG, "Applying transaction %p", transaction); | 178 | wlr_log(WLR_DEBUG, "Applying transaction %p", transaction); |
179 | if (server.debug_txn_timings) { | 179 | if (server.debug_txn_timings) { |
180 | struct timespec now; | 180 | struct timespec now; |
181 | clock_gettime(CLOCK_MONOTONIC, &now); | 181 | clock_gettime(CLOCK_MONOTONIC, &now); |
@@ -186,7 +186,7 @@ static void transaction_apply(struct sway_transaction *transaction) { | |||
186 | float ms_waiting = (now.tv_sec - commit->tv_sec) * 1000 + | 186 | float ms_waiting = (now.tv_sec - commit->tv_sec) * 1000 + |
187 | (now.tv_nsec - commit->tv_nsec) / 1000000.0; | 187 | (now.tv_nsec - commit->tv_nsec) / 1000000.0; |
188 | float ms_total = ms_arranging + ms_waiting; | 188 | float ms_total = ms_arranging + ms_waiting; |
189 | wlr_log(L_DEBUG, "Transaction %p: %.1fms arranging, %.1fms waiting, " | 189 | wlr_log(WLR_DEBUG, "Transaction %p: %.1fms arranging, %.1fms waiting, " |
190 | "%.1fms total (%.1f frames if 60Hz)", transaction, | 190 | "%.1fms total (%.1f frames if 60Hz)", transaction, |
191 | ms_arranging, ms_waiting, ms_total, ms_total / (1000.0f / 60)); | 191 | ms_arranging, ms_waiting, ms_total, ms_total / (1000.0f / 60)); |
192 | } | 192 | } |
@@ -251,7 +251,7 @@ static void transaction_progress_queue() { | |||
251 | 251 | ||
252 | static int handle_timeout(void *data) { | 252 | static int handle_timeout(void *data) { |
253 | struct sway_transaction *transaction = data; | 253 | struct sway_transaction *transaction = data; |
254 | wlr_log(L_DEBUG, "Transaction %p timed out (%li waiting)", | 254 | wlr_log(WLR_DEBUG, "Transaction %p timed out (%li waiting)", |
255 | transaction, transaction->num_waiting); | 255 | transaction, transaction->num_waiting); |
256 | transaction->num_waiting = 0; | 256 | transaction->num_waiting = 0; |
257 | transaction_progress_queue(); | 257 | transaction_progress_queue(); |
@@ -286,7 +286,7 @@ static bool should_configure(struct sway_container *con, | |||
286 | } | 286 | } |
287 | 287 | ||
288 | void transaction_commit(struct sway_transaction *transaction) { | 288 | void transaction_commit(struct sway_transaction *transaction) { |
289 | wlr_log(L_DEBUG, "Transaction %p committing with %i instructions", | 289 | wlr_log(WLR_DEBUG, "Transaction %p committing with %i instructions", |
290 | transaction, transaction->instructions->length); | 290 | transaction, transaction->instructions->length); |
291 | transaction->num_waiting = 0; | 291 | transaction->num_waiting = 0; |
292 | for (int i = 0; i < transaction->instructions->length; ++i) { | 292 | for (int i = 0; i < transaction->instructions->length; ++i) { |
@@ -319,7 +319,7 @@ void transaction_commit(struct sway_transaction *transaction) { | |||
319 | } else { | 319 | } else { |
320 | // There are no other transactions in progress, and this one has nothing | 320 | // There are no other transactions in progress, and this one has nothing |
321 | // to wait for, so we can skip the queue. | 321 | // to wait for, so we can skip the queue. |
322 | wlr_log(L_DEBUG, "Transaction %p has nothing to wait for", transaction); | 322 | wlr_log(WLR_DEBUG, "Transaction %p has nothing to wait for", transaction); |
323 | transaction_apply(transaction); | 323 | transaction_apply(transaction); |
324 | transaction_destroy(transaction); | 324 | transaction_destroy(transaction); |
325 | idle_inhibit_v1_check_active(server.idle_inhibit_manager_v1); | 325 | idle_inhibit_v1_check_active(server.idle_inhibit_manager_v1); |
@@ -350,7 +350,7 @@ static void set_instruction_ready( | |||
350 | struct timespec *start = &transaction->commit_time; | 350 | struct timespec *start = &transaction->commit_time; |
351 | float ms = (now.tv_sec - start->tv_sec) * 1000 + | 351 | float ms = (now.tv_sec - start->tv_sec) * 1000 + |
352 | (now.tv_nsec - start->tv_nsec) / 1000000.0; | 352 | (now.tv_nsec - start->tv_nsec) / 1000000.0; |
353 | wlr_log(L_DEBUG, "Transaction %p: %li/%li ready in %.1fms (%s)", | 353 | wlr_log(WLR_DEBUG, "Transaction %p: %li/%li ready in %.1fms (%s)", |
354 | transaction, | 354 | transaction, |
355 | transaction->num_configures - transaction->num_waiting + 1, | 355 | transaction->num_configures - transaction->num_waiting + 1, |
356 | transaction->num_configures, ms, | 356 | transaction->num_configures, ms, |
@@ -362,7 +362,7 @@ static void set_instruction_ready( | |||
362 | // If the transaction has timed out then its num_waiting will be 0 already. | 362 | // If the transaction has timed out then its num_waiting will be 0 already. |
363 | if (transaction->num_waiting > 0 && --transaction->num_waiting == 0) { | 363 | if (transaction->num_waiting > 0 && --transaction->num_waiting == 0) { |
364 | #if !TRANSACTION_DEBUG | 364 | #if !TRANSACTION_DEBUG |
365 | wlr_log(L_DEBUG, "Transaction %p is ready", transaction); | 365 | wlr_log(WLR_DEBUG, "Transaction %p is ready", transaction); |
366 | wl_event_source_timer_update(transaction->timer, 0); | 366 | wl_event_source_timer_update(transaction->timer, 0); |
367 | transaction_progress_queue(); | 367 | transaction_progress_queue(); |
368 | #endif | 368 | #endif |