summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Radestock <matthias@lshift.net>2010-01-27 17:42:31 +0000
committerMatthias Radestock <matthias@lshift.net>2010-01-27 17:42:31 +0000
commit2ce4994c9c71be3eae142fed69be1093347a20d9 (patch)
tree150cddef84a8b4991cb73382c66364b5d395bc2f
parent15186bf88b3eb997adf835477857a9b383b1d488 (diff)
downloadrabbitmq-server-2ce4994c9c71be3eae142fed69be1093347a20d9.tar.gz
minor addition to vm_memory_monitor API
We need this in bug 21673.
-rw-r--r--src/vm_memory_monitor.erl10
1 files changed, 9 insertions, 1 deletions
diff --git a/src/vm_memory_monitor.erl b/src/vm_memory_monitor.erl
index a8a1af0b..91788caa 100644
--- a/src/vm_memory_monitor.erl
+++ b/src/vm_memory_monitor.erl
@@ -51,7 +51,8 @@
-export([update/0, get_total_memory/0,
get_check_interval/0, set_check_interval/1,
- get_vm_memory_high_watermark/0, set_vm_memory_high_watermark/1]).
+ get_vm_memory_high_watermark/0, set_vm_memory_high_watermark/1,
+ get_memory_limit/0]).
-define(SERVER, ?MODULE).
@@ -77,6 +78,7 @@
('ignore' | {'error', any()} | {'ok', pid()})).
-spec(update/0 :: () -> 'ok').
-spec(get_total_memory/0 :: () -> (non_neg_integer() | 'unknown')).
+-spec(get_memory_limit/0 :: () -> (non_neg_integer() | 'undefined')).
-spec(get_check_interval/0 :: () -> non_neg_integer()).
-spec(set_check_interval/1 :: (non_neg_integer()) -> 'ok').
-spec(get_vm_memory_high_watermark/0 :: () -> float()).
@@ -108,6 +110,9 @@ set_vm_memory_high_watermark(Fraction) ->
gen_server:call(?MODULE, {set_vm_memory_high_watermark, Fraction},
infinity).
+get_memory_limit() ->
+ gen_server:call(?MODULE, get_memory_limit, infinity).
+
%%----------------------------------------------------------------------------
%% gen_server callbacks
%%----------------------------------------------------------------------------
@@ -153,6 +158,9 @@ handle_call({set_check_interval, Timeout}, _From, State) ->
{ok, cancel} = timer:cancel(State#state.timer),
{reply, ok, State#state{timeout = Timeout, timer = start_timer(Timeout)}};
+handle_call(get_memory_limit, _From, State) ->
+ {reply, State#state.memory_limit, State};
+
handle_call(_Request, _From, State) ->
{noreply, State}.