diff options
author | Simon MacMullen <simon@rabbitmq.com> | 2012-10-19 14:30:31 +0100 |
---|---|---|
committer | Simon MacMullen <simon@rabbitmq.com> | 2012-10-19 14:30:31 +0100 |
commit | 57a8e604bbde9ae11b58af94a1e95a525c3c3a84 (patch) | |
tree | bc2cad3d216794c4326f6611c3d31a5c5c1c44c3 | |
parent | 5a7a2b531dd233d414973d08988138580fda6fc9 (diff) | |
download | rabbitmq-server-57a8e604bbde9ae11b58af94a1e95a525c3c3a84.tar.gz |
Rearrange order of args to gm:start_link/4 since it seems to make invocations more compact. Curiously I did not need to rearrange the spec as it was already that way round :-)bug25215
-rw-r--r-- | src/gm.erl | 6 | ||||
-rw-r--r-- | src/gm_soak_test.erl | 5 | ||||
-rw-r--r-- | src/gm_speed_test.erl | 5 | ||||
-rw-r--r-- | src/gm_tests.erl | 15 | ||||
-rw-r--r-- | src/rabbit_mirror_queue_coordinator.erl | 5 | ||||
-rw-r--r-- | src/rabbit_mirror_queue_slave.erl | 5 |
6 files changed, 17 insertions, 24 deletions
@@ -509,8 +509,8 @@ table_definitions() -> {Name, Attributes} = ?TABLE, [{Name, [?TABLE_MATCH | Attributes]}]. -start_link(GroupName, Module, TxnFun, Args) -> - gen_server2:start_link(?MODULE, [GroupName, Module, TxnFun, Args], []). +start_link(GroupName, Module, Args, TxnFun) -> + gen_server2:start_link(?MODULE, [GroupName, Module, Args, TxnFun], []). leave(Server) -> gen_server2:cast(Server, leave). @@ -531,7 +531,7 @@ forget_group(GroupName) -> end), ok. -init([GroupName, Module, TxnFun, Args]) -> +init([GroupName, Module, Args, TxnFun]) -> {MegaSecs, Secs, MicroSecs} = now(), random:seed(MegaSecs, Secs, MicroSecs), Self = make_member(GroupName), diff --git a/src/gm_soak_test.erl b/src/gm_soak_test.erl index f49ed94b..5fbfc223 100644 --- a/src/gm_soak_test.erl +++ b/src/gm_soak_test.erl @@ -106,9 +106,8 @@ spawn_member() -> %% start up delay of no more than 10 seconds timer:sleep(random:uniform(10000)), {ok, Pid} = gm:start_link( - ?MODULE, ?MODULE, - fun rabbit_misc:execute_mnesia_transaction/1, - []), + ?MODULE, ?MODULE, [], + fun rabbit_misc:execute_mnesia_transaction/1), Start = random:uniform(10000), send_loop(Pid, Start, Start + random:uniform(10000)), gm:leave(Pid), diff --git a/src/gm_speed_test.erl b/src/gm_speed_test.erl index fd9bd79e..84d4ab2f 100644 --- a/src/gm_speed_test.erl +++ b/src/gm_speed_test.erl @@ -44,9 +44,8 @@ terminate(Owner, _Reason) -> %% other wile_e_coyote(Time, WriteUnit) -> - {ok, Pid} = gm:start_link(?MODULE, ?MODULE, - fun rabbit_misc:execute_mnesia_transaction/1, - self()), + {ok, Pid} = gm:start_link(?MODULE, ?MODULE, self(), + fun rabbit_misc:execute_mnesia_transaction/1), receive joined -> ok end, timer:sleep(1000), %% wait for all to join timer:send_after(Time, stop), diff --git a/src/gm_tests.erl b/src/gm_tests.erl index 7a4a11a3..a9c0ba90 100644 --- a/src/gm_tests.erl +++ b/src/gm_tests.erl @@ -77,9 +77,8 @@ test_member_death() -> with_two_members( fun (Pid, Pid2) -> {ok, Pid3} = gm:start_link( - ?MODULE, ?MODULE, - fun rabbit_misc:execute_mnesia_transaction/1, - self()), + ?MODULE, ?MODULE, self(), + fun rabbit_misc:execute_mnesia_transaction/1), passed = receive_joined(Pid3, [Pid, Pid2, Pid3], timeout_joining_gm_group_3), passed = receive_birth(Pid, Pid3, timeout_waiting_for_birth_3_1), @@ -131,14 +130,12 @@ test_broadcast_fun(Fun) -> with_two_members(Fun) -> ok = gm:create_tables(), - {ok, Pid} = gm:start_link(?MODULE, ?MODULE, - fun rabbit_misc:execute_mnesia_transaction/1, - self()), + {ok, Pid} = gm:start_link(?MODULE, ?MODULE, self(), + fun rabbit_misc:execute_mnesia_transaction/1), passed = receive_joined(Pid, [Pid], timeout_joining_gm_group_1), - {ok, Pid2} = gm:start_link(?MODULE, ?MODULE, - fun rabbit_misc:execute_mnesia_transaction/1, - self()), + {ok, Pid2} = gm:start_link(?MODULE, ?MODULE, self(), + fun rabbit_misc:execute_mnesia_transaction/1), passed = receive_joined(Pid2, [Pid, Pid2], timeout_joining_gm_group_2), passed = receive_birth(Pid, Pid2, timeout_waiting_for_birth_2), diff --git a/src/rabbit_mirror_queue_coordinator.erl b/src/rabbit_mirror_queue_coordinator.erl index daa247df..e1a21cf7 100644 --- a/src/rabbit_mirror_queue_coordinator.erl +++ b/src/rabbit_mirror_queue_coordinator.erl @@ -327,9 +327,8 @@ init([#amqqueue { name = QueueName } = Q, GM, DeathFun, DepthFun]) -> GM1 = case GM of undefined -> {ok, GM2} = gm:start_link( - QueueName, ?MODULE, - fun rabbit_misc:execute_mnesia_transaction/1, - [self()]), + QueueName, ?MODULE, [self()], + fun rabbit_misc:execute_mnesia_transaction/1), receive {joined, GM2, _Members} -> ok end, diff --git a/src/rabbit_mirror_queue_slave.erl b/src/rabbit_mirror_queue_slave.erl index 627630af..d0efe37a 100644 --- a/src/rabbit_mirror_queue_slave.erl +++ b/src/rabbit_mirror_queue_slave.erl @@ -99,9 +99,8 @@ init(Q = #amqqueue { name = QName }) -> %% above. %% process_flag(trap_exit, true), %% amqqueue_process traps exits too. - {ok, GM} = gm:start_link(QName, ?MODULE, - fun rabbit_misc:execute_mnesia_transaction/1, - [self()]), + {ok, GM} = gm:start_link(QName, ?MODULE, [self()], + fun rabbit_misc:execute_mnesia_transaction/1), receive {joined, GM} -> ok end, Self = self(), Node = node(), |