File 0625-statistics_SUITE-Make-wall_clock_update-1-... of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 0625-statistics_SUITE-Make-wall_clock_update-1-more-toler.patch of Package erlang (Revision a2c746346df91f7eba485155dba10e85)

Currently displaying revision a2c746346df91f7eba485155dba10e85 , Show latest

From 4cace1572816fbe754eca6c17f0351dbecf54567 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Gustavsson?= <bjorn@erlang.org>
Date: Mon, 25 Mar 2019 13:14:14 +0100
Subject: [PATCH] statistics_SUITE: Make wall_clock_update/1 more tolerant

Be more tolerant of time deviations, to avoid that this
test case fails on slow computers.
---
 erts/emulator/test/statistics_SUITE.erl | 43 ++++++++++++++++++++-------------
 1 file changed, 26 insertions(+), 17 deletions(-)

diff --git a/erts/emulator/test/statistics_SUITE.erl b/erts/emulator/test/statistics_SUITE.erl
index ae3099633a..d278ac86c7 100644
--- a/erts/emulator/test/statistics_SUITE.erl
+++ b/erts/emulator/test/statistics_SUITE.erl
@@ -93,25 +93,34 @@ wall_clock_zero_diff1(0) ->
 %% statistics(wall_clock) are compatible, and are within a small number
 %% of ms of the amount of real time we waited for.
 wall_clock_update(Config) when is_list(Config) ->
-    wall_clock_update1(6).
+    N = 10,
+    Inc = 200,
+    TotalTime = wall_clock_update1(N, Inc, 0),
+    Overhead = TotalTime - N * Inc,
+    IsDebug = test_server:is_debug(),
 
-wall_clock_update1(N) when N > 0 ->
-    {T1_wc_time, _} = statistics(wall_clock),
-    receive after 1000 -> ok end,
-    {T2_wc_time, Wc_Diff} = statistics(wall_clock),
-
-    Wc_Diff = T2_wc_time - T1_wc_time,
-    io:format("Wall clock diff = ~p; should be  = 1000..1040~n", [Wc_Diff]),
-    case test_server:is_debug() of
-        false ->
-            true = Wc_Diff =< 1040;
+    %% Check that the average overhead is reasonable.
+    if
+        Overhead < N * 100 ->
+            ok;
+        IsDebug, Overhead < N * 1000 ->
+            ok;
         true ->
-            true = Wc_Diff =< 2000	%Be more tolerant in debug-compiled emulator.
-    end,
-    true = Wc_Diff >= 1000,
-    wall_clock_update1(N-1);
-wall_clock_update1(0) ->
-    ok.
+            io:format("There was an overhead of ~p ms during ~p rounds.",
+                      [Overhead,N]),
+            ct:fail(too_much_overhead)
+    end.
+
+wall_clock_update1(N, Inc, Total) when N > 0 ->
+    {Time1, _} = statistics(wall_clock),
+    receive after Inc -> ok end,
+    {Time2, WcDiff} = statistics(wall_clock),
+    WcDiff = Time2 - Time1,
+    io:format("Wall clock diff = ~p (expected at least ~p)\n", [WcDiff,Inc]),
+    true = WcDiff >= Inc,
+    wall_clock_update1(N-1, Inc, Total + WcDiff);
+wall_clock_update1(0, _, Total) ->
+    Total.
 
 
 %%% Test statistics(runtime).
-- 
2.16.4

Places

File 0625-statistics_SUITE-Make-wall_clock_update-1-more-toler.patch of Package erlang (Revision a2c746346df91f7eba485155dba10e85)

Places