Browse Source

Use registry count tin benchmarks.

Roberto Ostinelli 3 years ago
parent
commit
46a137bad4
2 changed files with 21 additions and 23 deletions
  1. 3 3
      src/syn_backbone.erl
  2. 18 20
      test/syn_benchmark.erl

+ 3 - 3
src/syn_backbone.erl

@@ -117,7 +117,7 @@ handle_call(Request, From, State) ->
     {noreply, State :: map(), Timeout :: non_neg_integer()} |
     {stop, Reason :: any(), State :: map()}.
 handle_cast(Msg, State) ->
-    error_logger:warning_msg("SYN[~p] Received an unknown cast message: ~p", [node(), Msg]),
+    error_logger:warning_msg("SYN[~s] Received an unknown cast message: ~p", [node(), Msg]),
     {noreply, State}.
 
 %% ----------------------------------------------------------------------------------------------------------
@@ -128,7 +128,7 @@ handle_cast(Msg, State) ->
     {noreply, State :: map(), Timeout :: non_neg_integer()} |
     {stop, Reason :: any(), State :: map()}.
 handle_info(Info, State) ->
-    error_logger:warning_msg("SYN[~p] Received an unknown info message: ~p", [node(), Info]),
+    error_logger:warning_msg("SYN[~s] Received an unknown info message: ~p", [node(), Info]),
     {noreply, State}.
 
 %% ----------------------------------------------------------------------------------------------------------
@@ -136,7 +136,7 @@ handle_info(Info, State) ->
 %% ----------------------------------------------------------------------------------------------------------
 -spec terminate(Reason :: any(), State :: map()) -> terminated.
 terminate(Reason, _State) ->
-    error_logger:info_msg("SYN[~p] Terminating with reason: ~p", [node(), Reason]),
+    error_logger:info_msg("SYN[~s] Terminating with reason: ~p", [node(), Reason]),
     %% return
     terminated.
 

+ 18 - 20
test/syn_benchmark.erl

@@ -35,7 +35,7 @@
     unregister_on_node/3,
     do_unregister_on_node/2,
     wait_registration_propagation/1,
-    wait_unregistration_propagation/1
+    wait_unregistration_propagation/0
 ]).
 -export([
     start_profiling/0,
@@ -103,7 +103,7 @@ start() ->
     io:format("      --> MIN: ~p secs.~n", [lists:min(RegRemoteNodesTimes)]),
     io:format("      --> MAX: ~p secs.~n", [lists:max(RegRemoteNodesTimes)]),
 
-    {RegPropagationTimeMs, _} = timer:tc(?MODULE, wait_registration_propagation, [NodesInfo]),
+    {RegPropagationTimeMs, _} = timer:tc(?MODULE, wait_registration_propagation, [ProcessCount]),
     RegPropagationTime = RegPropagationTimeMs / 1000000,
     io:format("----> Eventual additional time to propagate all to master: ~p secs.~n", [RegPropagationTime]),
 
@@ -126,7 +126,7 @@ start() ->
     io:format("      --> MIN: ~p secs.~n", [lists:min(UnregRemoteNodesTimes)]),
     io:format("      --> MAX: ~p secs.~n", [lists:max(UnregRemoteNodesTimes)]),
 
-    {UnregPropagationTimeMs, _} = timer:tc(?MODULE, wait_unregistration_propagation, [NodesInfo]),
+    {UnregPropagationTimeMs, _} = timer:tc(?MODULE, wait_unregistration_propagation, []),
     UnregPropagationTime = UnregPropagationTimeMs / 1000000,
     io:format("----> Eventual additional time to propagate all to master: ~p secs.~n", [UnregPropagationTime]),
 
@@ -148,7 +148,7 @@ start() ->
     io:format("      --> MIN: ~p secs.~n", [lists:min(ReRegRemoteNodesTimes)]),
     io:format("      --> MAX: ~p secs.~n", [lists:max(ReRegRemoteNodesTimes)]),
 
-    {ReRegPropagationTimeMs, _} = timer:tc(?MODULE, wait_registration_propagation, [NodesInfo]),
+    {ReRegPropagationTimeMs, _} = timer:tc(?MODULE, wait_registration_propagation, [ProcessCount]),
     ReRegPropagationTime = ReRegPropagationTimeMs / 1000000,
     io:format("----> Eventual additional time to propagate all to master: ~p secs.~n", [ReRegPropagationTime]),
 
@@ -163,7 +163,7 @@ start() ->
     end, PidsMap),
 
     %% wait all unregistered
-    {KillPropagationTimeMs, _} = timer:tc(?MODULE, wait_unregistration_propagation, [NodesInfo]),
+    {KillPropagationTimeMs, _} = timer:tc(?MODULE, wait_unregistration_propagation, []),
     KillPropagationTime = KillPropagationTimeMs / 1000000,
     io:format("----> Time to propagate killed process to to master: ~p secs.~n", [KillPropagationTime]),
 
@@ -215,26 +215,24 @@ wait_from_all_remote_nodes([RemoteNode | Tail], Times) ->
             wait_from_all_remote_nodes(Tail, [Time | Times])
     end.
 
-wait_registration_propagation([]) -> ok;
-wait_registration_propagation([{_Node, _FromName, ToName} | NodeInfosTail] = NodesInfo) ->
-    case syn:lookup(ToName) of
-        undefined ->
-            timer:sleep(50),
-            wait_registration_propagation(NodesInfo);
+wait_registration_propagation(ProcessCount) ->
+    case syn:registry_count(default) of
+        ProcessCount ->
+            ok;
 
-        {_Pid, undefined} ->
-            wait_registration_propagation(NodeInfosTail)
+        _ ->
+            timer:sleep(50),
+            wait_registration_propagation(ProcessCount)
     end.
 
-wait_unregistration_propagation([]) -> ok;
-wait_unregistration_propagation([{_Node, _FromName, ToName} | NodeInfosTail] = NodesInfo) ->
-    case syn:lookup(ToName) of
-        undefined ->
-            wait_unregistration_propagation(NodeInfosTail);
+wait_unregistration_propagation() ->
+    case syn:registry_count(default) of
+        0 ->
+            ok;
 
-        {_Pid, undefined} ->
+        _ ->
             timer:sleep(50),
-            wait_unregistration_propagation(NodesInfo)
+            wait_unregistration_propagation()
     end.
 
 start_profiling() ->