diff options
| author | Matthias Radestock <matthias@rabbitmq.com> | 2012-08-03 00:09:29 +0100 |
|---|---|---|
| committer | Matthias Radestock <matthias@rabbitmq.com> | 2012-08-03 00:09:29 +0100 |
| commit | 31cefc007ba67b4bd5ce4ce9f87aa3d7eecd546d (patch) | |
| tree | 7c8d3e6ca11a438245734a80c9a0e544d44cb874 /src | |
| parent | a2632aeabd14a43051601cdb4b9d2f3bc90e3dd5 (diff) | |
| download | rabbitmq-server-31cefc007ba67b4bd5ce4ce9f87aa3d7eecd546d.tar.gz | |
tiny refactor
Diffstat (limited to 'src')
| -rw-r--r-- | src/vm_memory_monitor.erl | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/src/vm_memory_monitor.erl b/src/vm_memory_monitor.erl index f95a44a0..7cba36f8 100644 --- a/src/vm_memory_monitor.erl +++ b/src/vm_memory_monitor.erl @@ -52,8 +52,7 @@ timeout, timer, alarmed, - alarm_set, - alarm_clear + alarm_funs }). %%---------------------------------------------------------------------------- @@ -107,15 +106,14 @@ start_link(MemFraction) -> start_link(MemFraction, AlarmSet, AlarmClear) -> gen_server:start_link({local, ?SERVER}, ?MODULE, - [MemFraction, AlarmSet, AlarmClear], []). + [MemFraction, {AlarmSet, AlarmClear}], []). -init([MemFraction, AlarmSet, AlarmClear]) -> +init([MemFraction, AlarmFuns]) -> TRef = start_timer(?DEFAULT_MEMORY_CHECK_INTERVAL), - State = #state { timeout = ?DEFAULT_MEMORY_CHECK_INTERVAL, - timer = TRef, - alarmed = false, - alarm_set = AlarmSet, - alarm_clear = AlarmClear }, + State = #state { timeout = ?DEFAULT_MEMORY_CHECK_INTERVAL, + timer = TRef, + alarmed = false, + alarm_funs = AlarmFuns }, {ok, set_mem_limits(State, MemFraction)}. handle_call(get_vm_memory_high_watermark, _From, State) -> @@ -181,9 +179,8 @@ set_mem_limits(State, MemFraction) -> memory_limit = MemLim }). internal_update(State = #state { memory_limit = MemLimit, - alarmed = Alarmed, - alarm_set = AlarmSet, - alarm_clear = AlarmClear }) -> + alarmed = Alarmed, + alarm_funs = {AlarmSet, AlarmClear} }) -> MemUsed = erlang:memory(total), NewAlarmed = MemUsed > MemLimit, case {Alarmed, NewAlarmed} of |