summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Sackman <matthew@lshift.net>2010-04-30 16:23:35 +0100
committerMatthew Sackman <matthew@lshift.net>2010-04-30 16:23:35 +0100
commit5e52def50bfb33718cf8a518f4011c67187d947e (patch)
tree3d81ae111eca79c7ed4bdfcb5aec78b771217400
parent0a1b0627161542d554ac70bb30df69795d787f0f (diff)
parentb4b40403d6d3a8431ec174e15bea84a1b0f615dc (diff)
downloadrabbitmq-server-git-5e52def50bfb33718cf8a518f4011c67187d947e.tar.gz
Merging bug22616 into bug21673
-rw-r--r--src/worker_pool_worker.erl15
1 files changed, 7 insertions, 8 deletions
diff --git a/src/worker_pool_worker.erl b/src/worker_pool_worker.erl
index d3942a1b6e..57901fd5cf 100644
--- a/src/worker_pool_worker.erl
+++ b/src/worker_pool_worker.erl
@@ -48,7 +48,8 @@
-spec(submit/2 :: (pid(), fun (() -> A) | {atom(), atom(), [any()]}) -> A).
-spec(submit_async/2 ::
(pid(), fun (() -> any()) | {atom(), atom(), [any()]}) -> 'ok').
-
+-spec(run/1 :: (fun (() -> A)) -> A;
+ ({atom(), atom(), [any()]}) -> any()).
-spec(set_maximum_since_use/2 :: (pid(), non_neg_integer()) -> 'ok').
-endif.
@@ -72,6 +73,11 @@ submit_async(Pid, Fun) ->
set_maximum_since_use(Pid, Age) ->
gen_server2:pcast(Pid, 8, {set_maximum_since_use, Age}).
+run({M, F, A}) ->
+ apply(M, F, A);
+run(Fun) ->
+ Fun().
+
%%----------------------------------------------------------------------------
init([WId]) ->
@@ -110,10 +116,3 @@ code_change(_OldVsn, State, _Extra) ->
terminate(_Reason, State) ->
State.
-
-%%----------------------------------------------------------------------------
-
-run({M, F, A}) ->
- apply(M, F, A);
-run(Fun) ->
- Fun().