diff options
| author | Jean-Sébastien Pédron <jean-sebastien@rabbitmq.com> | 2015-07-30 17:13:01 +0200 |
|---|---|---|
| committer | Jean-Sébastien Pédron <jean-sebastien@rabbitmq.com> | 2015-08-05 16:16:38 +0200 |
| commit | 52a12c0cd87fee85c50ed0affa5362764bd9775e (patch) | |
| tree | 4ead54771ffaf6af428cce066b69fccdc228256d /test/src | |
| parent | 78bf4ce6ef185669066213dca38bc641138108a8 (diff) | |
| download | rabbitmq-server-git-52a12c0cd87fee85c50ed0affa5362764bd9775e.tar.gz | |
GM: Convert the testsuite to use `time_compat`
References #233.
Diffstat (limited to 'test/src')
| -rw-r--r-- | test/src/gm_soak_test.erl | 13 | ||||
| -rw-r--r-- | test/src/gm_speed_test.erl | 8 |
2 files changed, 13 insertions, 8 deletions
diff --git a/test/src/gm_soak_test.erl b/test/src/gm_soak_test.erl index 32476b56bc..64baa035b7 100644 --- a/test/src/gm_soak_test.erl +++ b/test/src/gm_soak_test.erl @@ -35,9 +35,11 @@ with_state(Fun) -> inc() -> case 1 + get(count) of - 100000 -> Now = now(), + 100000 -> Now = time_compat:monotonic_time(), Start = put(ts, Now), - Diff = timer:now_diff(Now, Start), + Diff = time_compat:convert_time_unit(Now - Start, + native, + micro_seconds), Rate = 100000 / (Diff / 1000000), io:format("~p seeing ~p msgs/sec~n", [self(), Rate]), put(count, 0); @@ -48,7 +50,7 @@ joined([], Members) -> io:format("Joined ~p (~p members)~n", [self(), length(Members)]), put(state, dict:from_list([{Member, empty} || Member <- Members])), put(count, 0), - put(ts, now()), + put(ts, time_compat:monotonic_time()), ok. members_changed([], Births, Deaths) -> @@ -101,8 +103,9 @@ handle_terminate([], Reason) -> spawn_member() -> spawn_link( fun () -> - {MegaSecs, Secs, MicroSecs} = now(), - random:seed(MegaSecs, Secs, MicroSecs), + random:seed(erlang:phash2([node()]), + time_compat:monotonic_time(), + time_compat:unique_integer()), %% start up delay of no more than 10 seconds timer:sleep(random:uniform(10000)), {ok, Pid} = gm:start_link( diff --git a/test/src/gm_speed_test.erl b/test/src/gm_speed_test.erl index f11e7d487b..b0693fc136 100644 --- a/test/src/gm_speed_test.erl +++ b/test/src/gm_speed_test.erl @@ -49,12 +49,14 @@ wile_e_coyote(Time, WriteUnit) -> receive joined -> ok end, timer:sleep(1000), %% wait for all to join timer:send_after(Time, stop), - Start = now(), + Start = time_compat:monotonic_time(), {Sent, Received} = loop(Pid, WriteUnit, 0, 0), - End = now(), + End = time_compat:monotonic_time(), ok = gm:leave(Pid), receive terminated -> ok end, - Elapsed = timer:now_diff(End, Start) / 1000000, + Elapsed = time_compat:convert_time_unit(End - Start, + native, + micro_seconds) / 1000000, io:format("Sending rate: ~p msgs/sec~nReceiving rate: ~p msgs/sec~n~n", [Sent/Elapsed, Received/Elapsed]), ok. |