aboutsummaryrefslogtreecommitdiff
path: root/render.c
diff options
context:
space:
mode:
Diffstat (limited to 'render.c')
-rw-r--r--render.c69
1 files changed, 40 insertions, 29 deletions
diff --git a/render.c b/render.c
index 886da0b9..8651c99f 100644
--- a/render.c
+++ b/render.c
@@ -72,44 +72,55 @@ presented(void *data,
.tv_usec = tv_nsec / 1000,
};
- struct timeval diff = {0};
- const char *source = NULL;
+ bool use_input = (input.tv_sec > 0 || input.tv_usec > 0) &&
+ timercmp(&presented, &input, >);
+ char msg[1024];
+ int chars = 0;
- if (input.tv_sec != 0 || input.tv_usec != 0) {
+ if (use_input) {
+ struct timeval diff;
+ timersub(&commit, &input, &diff);
+ chars += snprintf(&msg[chars], sizeof(msg) - chars,
+ "input - %luµs -> ", diff.tv_usec);
+ }
+
+ struct timeval diff;
+ timersub(&presented, &commit, &diff);
+ chars += snprintf(&msg[chars], sizeof(msg) - chars,
+ "commit - %luµs -> ", diff.tv_usec);
+
+ if (use_input)
timersub(&presented, &input, &diff);
- source = "input";
- } else if (commit.tv_sec != 0 || commit.tv_usec != 0) {
+ else
timersub(&presented, &commit, &diff);
- source = "commit";
- }
- if (source != NULL) {
+ chars += snprintf(&msg[chars], sizeof(msg) - chars,
+ "presented (total: %luµs)", diff.tv_usec);
- unsigned frame_count = 0;
- if (diff.tv_sec == 0 && tll_length(term->window->on_outputs) > 0) {
- const struct monitor *mon = tll_front(term->window->on_outputs);
- frame_count = (double)diff.tv_usec / (1. / mon->refresh * 1000000.);
- }
+ unsigned frame_count = 0;
+ if (diff.tv_sec == 0 && tll_length(term->window->on_outputs) > 0) {
+ const struct monitor *mon = tll_front(term->window->on_outputs);
+ frame_count = (double)diff.tv_usec / (1. / mon->refresh * 1000000.);
+ }
- presentation_statistics.total++;
- if (frame_count >= 2)
- presentation_statistics.two++;
- else if (frame_count >= 1)
- presentation_statistics.one++;
- else
- presentation_statistics.zero++;
+ presentation_statistics.total++;
+ if (frame_count >= 2)
+ presentation_statistics.two++;
+ else if (frame_count >= 1)
+ presentation_statistics.one++;
+ else
+ presentation_statistics.zero++;
- #define _log_fmt "%s to screen time: %lus %luµs (more than %u frames)"
+#define _log_fmt "%s (more than %u frames)"
- if (frame_count >= 2)
- LOG_ERR(_log_fmt, source, diff.tv_sec, diff.tv_usec, frame_count);
- else if (frame_count >= 1)
- LOG_WARN(_log_fmt, source, diff.tv_sec, diff.tv_usec, frame_count);
- else
- LOG_INFO(_log_fmt, source, diff.tv_sec, diff.tv_usec, frame_count);
+ if (frame_count >= 2)
+ LOG_ERR(_log_fmt, msg, frame_count);
+ else if (frame_count >= 1)
+ LOG_WARN(_log_fmt, msg, frame_count);
+ else
+ LOG_INFO(_log_fmt, msg, frame_count);
- #undef _log_fmt
- }
+#undef _log_fmt
wp_presentation_feedback_destroy(wp_presentation_feedback);
memset(&term->render.input_time, 0, sizeof(term->render.input_time));