mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-12-29 16:36:26 +01:00
Code Issues Projects Releases Packages Wiki Activity

Implement transaction timings debug

Browse source 
Launch sway with SWAY_DEBUG=txn_timings to enable it.
This commit is contained in:
Ryan Dwyer 2018-06-25 09:09:43 +10:00
parent a3976e2659
commit 289d696adc
3 changed files with 29 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/sway/server.h
View file

@ -45,6 +45,8 @@ struct sway_server {
struct wlr_wl_shell *wl_shell; struct wlr_wl_shell *wl_shell;
struct wl_listener wl_shell_surface; struct wl_listener wl_shell_surface;
bool debug_txn_timings;
bool terminating; bool terminating;
struct sway_transaction *head_transaction; // singly linked list struct sway_transaction *head_transaction; // singly linked list

23
sway/desktop/transaction.c
View file

@ -2,6 +2,7 @@
#include <stdbool.h> #include <stdbool.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <time.h>
#include <wlr/types/wlr_buffer.h> #include <wlr/types/wlr_buffer.h>
#include <wlr/types/wlr_linux_dmabuf.h> #include <wlr/types/wlr_linux_dmabuf.h>
#include "sway/debug.h" #include "sway/debug.h"
@ -32,6 +33,8 @@ struct sway_transaction {
list_t *damage; // struct wlr_box * list_t *damage; // struct wlr_box *
size_t num_waiting; size_t num_waiting;
struct sway_transaction *next; struct sway_transaction *next;
struct timespec create_time;
struct timespec commit_time;
}; };
struct sway_transaction_instruction { struct sway_transaction_instruction {
@ -48,6 +51,9 @@ struct sway_transaction *transaction_create() {
calloc(1, sizeof(struct sway_transaction)); calloc(1, sizeof(struct sway_transaction));
transaction->instructions = create_list(); transaction->instructions = create_list();
transaction->damage = create_list(); transaction->damage = create_list();
if (server.debug_txn_timings) {
clock_gettime(CLOCK_MONOTONIC, &transaction->create_time);
}
return transaction; return transaction;
} }
@ -177,6 +183,20 @@ void transaction_add_damage(struct sway_transaction *transaction,
*/ */
static void transaction_apply(struct sway_transaction *transaction) { static void transaction_apply(struct sway_transaction *transaction) {
wlr_log(L_DEBUG, "Applying transaction %p", transaction); wlr_log(L_DEBUG, "Applying transaction %p", transaction);
if (server.debug_txn_timings) {
struct timespec now;
clock_gettime(CLOCK_MONOTONIC, &now);
struct timespec *create = &transaction->create_time;
struct timespec *commit = &transaction->commit_time;
float ms_arranging = (commit->tv_sec - create->tv_sec) * 1000 +
(commit->tv_nsec - create->tv_nsec) / 1000000.0;
float ms_waiting = (now.tv_sec - commit->tv_sec) * 1000 +
(now.tv_nsec - commit->tv_nsec) / 1000000.0;
float ms_total = ms_arranging + ms_waiting;
wlr_log(L_DEBUG, "Transaction %p: %.1fms arranging, %.1fms waiting, "
"%.1fms total (%.1f frames if 60hz)", transaction,
ms_arranging, ms_waiting, ms_total, ms_total / (1000 / 60));
}
int i; int i;
// Apply the instruction state to the container's current state // Apply the instruction state to the container's current state
for (i = 0; i < transaction->instructions->length; ++i) { for (i = 0; i < transaction->instructions->length; ++i) {
@ -271,6 +291,9 @@ void transaction_commit(struct sway_transaction *transaction) {
} }
list_add(con->instructions, instruction); list_add(con->instructions, instruction);
} }
if (server.debug_txn_timings) {
clock_gettime(CLOCK_MONOTONIC, &transaction->commit_time);
}
if (server.head_transaction) { if (server.head_transaction) {
// There is another transaction in progress - we must add this one to // There is another transaction in progress - we must add this one to
// the queue so we complete after it. // the queue so we complete after it.

4
sway/server.c
View file

@ -113,6 +113,10 @@ bool server_init(struct sway_server *server) {
return false; return false;
} }
const char *debug = getenv("SWAY_DEBUG");
if (debug != NULL && strcmp(debug, "txn_timings") == 0) {
server->debug_txn_timings = true;
}
server->destroying_containers = create_list(); server->destroying_containers = create_list();
input_manager = input_manager_create(server); input_manager = input_manager_create(server);