summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMatthew Sackman <matthew@lshift.net>2009-08-28 15:26:56 +0100
committerMatthew Sackman <matthew@lshift.net>2009-08-28 15:26:56 +0100
commitcdf508e5815e290c836bb60a4f6d8b235a8f69c9 (patch)
treeefc2692fc1dc257b6ab916970e6f457524516ad9 /src
parent2391849dacc3ca253502f7afe4a2fe341a46266c (diff)
parentb95a5d7b8dd887905270537296fedf4c741ef18b (diff)
downloadrabbitmq-server-git-cdf508e5815e290c836bb60a4f6d8b235a8f69c9.tar.gz
sigh, merge
Diffstat (limited to 'src')
-rw-r--r--src/rabbit_memory_manager.erl8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/rabbit_memory_manager.erl b/src/rabbit_memory_manager.erl
index 2fb593e916..eb37a6f3b4 100644
--- a/src/rabbit_memory_manager.erl
+++ b/src/rabbit_memory_manager.erl
@@ -45,6 +45,8 @@
-define(SERVER, ?MODULE).
+%%----------------------------------------------------------------------------
+
-ifdef(use_specs).
-spec(start_link/0 :: () ->
@@ -56,6 +58,8 @@
-endif.
+%%----------------------------------------------------------------------------
+
-record(state, { available_tokens,
processes,
callbacks,
@@ -161,6 +165,8 @@ info() ->
conserve_memory(_Pid, Conserve) ->
gen_server2:pcast(?SERVER, 9, {conserve_memory, Conserve}).
+%%----------------------------------------------------------------------------
+
init([]) ->
process_flag(trap_exit, true),
rabbit_alarm:register(self(), {?MODULE, conserve_memory, []}),
@@ -293,6 +299,8 @@ terminate(_Reason, State) ->
code_change(_OldVsn, State, _Extra) ->
{ok, State}.
+%%----------------------------------------------------------------------------
+
find_process(Pid, Procs) ->
case dict:find(Pid, Procs) of
{ok, Value} -> Value;