From b1408f1a9eff70e23edd7ae23f90c3bd8baa7f76 Mon Sep 17 00:00:00 2001 From: Dmitry Rozenshtein Date: Mon, 7 Nov 2011 14:21:38 +0200 Subject: [PATCH] Changes: Updated testscript for performance measurement (workaround for MCompositor XGrabServer delay) RevBy: TrustMe --- debian/changelog | 1 + tests/harmattan/testscripts/test-perf.rb | 8 ++++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index ec190ac..f31fb2f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ applauncherd (2.0.8) stable; urgency=low * Fixes: NB#288982 - COREWEB: booster '__assert_fail append_pending_request _XReply' + * Changes: Updated testscript for performance measurement (workaround for MCompositor XGrabServer delay) -- Alexey Shilov Fri, 04 Nov 2011 17:06:18 +0200 diff --git a/tests/harmattan/testscripts/test-perf.rb b/tests/harmattan/testscripts/test-perf.rb index 6317f5b..43372c2 100755 --- a/tests/harmattan/testscripts/test-perf.rb +++ b/tests/harmattan/testscripts/test-perf.rb @@ -33,7 +33,9 @@ class TC_PerformanceTests < Test::Unit::TestCase FALA_GETTIME_BINARY = '/usr/bin/fala_gettime_ms' MATTI_LOCATION='/usr/lib/qt4/plugins/testability/libtestability.so' TEMPORARY_MATTI_LOCATION='/root/libtestability.so' - + # MCompositor does XGrabServer for about 300 ms (doing startup animation), during this time pixelchanged can't connect to XServer and just waits. + # So we're substracting 300 ms from results. + MCOMPOSITOR_XGRABSERVER_DELAY_CONSTANT = 300 @start_time = 0 @end_time = 0 @@ -407,9 +409,11 @@ class TC_PerformanceTests < Test::Unit::TestCase win_cache_sum += @win_from_cache end - start_time_sum += @end_time - @start_time + start_time_sum += @end_time - @start_time - MCOMPOSITOR_XGRABSERVER_DELAY_CONSTANT end + print_debug ("MCompositor does XGrabServer for about #{MCOMPOSITOR_XGRABSERVER_DELAY_CONSTANT} ms (doing startup animation), during this time pixelchanged can't connect to XServer and just waits.") + print_debug ("So we're substracting #{MCOMPOSITOR_XGRABSERVER_DELAY_CONSTANT} ms from startup time!\n") print_debug ("Startup time in milliseconds\n") print_debug ("Application: #{@options[:application]} \n")