From ef4515a674373db2f6494fb7cce1d7b5be44b77f Mon Sep 17 00:00:00 2001 From: Armin Novak Date: Tue, 14 Feb 2017 12:28:58 +0100 Subject: [PATCH] Added FPS in profiler print. --- libfreerdp/utils/profiler.c | 38 +++++++++++++++++++++++--------------- 1 file changed, 23 insertions(+), 15 deletions(-) diff --git a/libfreerdp/utils/profiler.c b/libfreerdp/utils/profiler.c index 7ed61f1..fe714a1 100644 --- a/libfreerdp/utils/profiler.c +++ b/libfreerdp/utils/profiler.c @@ -32,13 +32,14 @@ PROFILER* profiler_create(char* name) { PROFILER* profiler; - profiler = (PROFILER*) malloc(sizeof(PROFILER)); + if (!profiler) return NULL; - + profiler->name = name; profiler->stopwatch = stopwatch_create(); + if (!profiler->stopwatch) { free(profiler); @@ -49,9 +50,8 @@ PROFILER* profiler_create(char* name) } void profiler_free(PROFILER* profiler) -{ +{ stopwatch_free(profiler->stopwatch); - free(profiler); } @@ -65,24 +65,32 @@ void profiler_exit(PROFILER* profiler) stopwatch_stop(profiler->stopwatch); } -void profiler_print_header() +void profiler_print_header(void) { - WLog_INFO(TAG, " |-----------------------|"); - WLog_INFO(TAG, " PROFILER | elapsed seconds |"); - WLog_INFO(TAG, "|--------------------------------------------|-----------------------|"); - WLog_INFO(TAG, "| code section | iterations | total | avg. |"); - WLog_INFO(TAG, "|-------------------------------|------------|-----------|-----------|"); + WLog_INFO(TAG, + " |-----------------------|-----------------------|"); + WLog_INFO(TAG, + " PROFILER | elapsed seconds | FPS |"); + WLog_INFO(TAG, + "|--------------------------------------------|-----------------------|-----------------------"); + WLog_INFO(TAG, + "| code section | iterations | total | avg. | total | avg. |"); + WLog_INFO(TAG, + "|-------------------------------|------------|-----------|-----------|-----------|-----------|"); } void profiler_print(PROFILER* profiler) { - double elapsed_sec = stopwatch_get_elapsed_time_in_seconds(profiler->stopwatch); - double avg_sec = elapsed_sec / (double) profiler->stopwatch->count; - WLog_INFO(TAG, "| %-30.30s| %10"PRIu32" | %9f | %9f |", - profiler->name, profiler->stopwatch->count, elapsed_sec, avg_sec); + const double elapsed_sec = stopwatch_get_elapsed_time_in_seconds(profiler->stopwatch); + const double avg_sec = elapsed_sec / (double) profiler->stopwatch->count; + const double fps = 1.0 / elapsed_sec; + const double avg_fps = 1.0 / avg_sec; + WLog_INFO(TAG, "| %-30.30s| %10"PRIu32" | %9f | %9f | %9f | %9f |", + profiler->name, profiler->stopwatch->count, elapsed_sec, avg_sec, + fps, avg_fps); } -void profiler_print_footer() +void profiler_print_footer(void) { WLog_INFO(TAG, "|--------------------------------------------------------------------|"); } -- 2.7.4