summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Sackman <matthew@lshift.net>2009-10-29 16:48:59 +0000
committerMatthew Sackman <matthew@lshift.net>2009-10-29 16:48:59 +0000
commitf25509f3cdca230dfd89358a6e2b88175f8cf2b6 (patch)
tree0543740c2c61191b7c3107135c94b24391785b6b
parent65ae3759422e4455ac4d3bcb60d1fa4c2814145b (diff)
downloadrabbitmq-server-f25509f3cdca230dfd89358a6e2b88175f8cf2b6.tar.gz
Minor improvements to spec and some cosmetics
-rw-r--r--src/vm_memory_monitor.erl21
1 files changed, 10 insertions, 11 deletions
diff --git a/src/vm_memory_monitor.erl b/src/vm_memory_monitor.erl
index 82bccc38..d0aa1b7d 100644
--- a/src/vm_memory_monitor.erl
+++ b/src/vm_memory_monitor.erl
@@ -73,13 +73,13 @@
-ifdef(use_specs).
--spec(start_link/1 :: (_) -> 'ignore' | {error,_} | {ok,pid()}).
--spec(update/0 :: () -> ok).
--spec(get_total_memory/0 :: () -> non_neg_integer() | unknown).
--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() ).
--spec(set_vm_memory_high_watermark/1 :: (float()) -> ok ).
+-spec(start_link/1 :: (float()) -> ('ignore' | {error, any()} | {'ok', pid()})).
+-spec(update/0 :: () -> 'ok').
+-spec(get_total_memory/0 :: () -> (non_neg_integer() | unknown)).
+-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()).
+-spec(set_vm_memory_high_watermark/1 :: (float()) -> 'ok').
-endif.
@@ -211,12 +211,11 @@ get_mem_limit(MemFraction, TotalMemory) ->
%% Internal Helpers
%%----------------------------------------------------------------------------
cmd(Command) ->
- [Exec| _Rest] = string:tokens(Command, " "),
+ Exec = hd(string:tokens(Command, " ")),
case os:find_executable(Exec) of
false -> throw({command_not_found, Exec});
- _ -> ok
- end,
- os:cmd(Command).
+ _ -> os:cmd(Command)
+ end.
%% get_total_memory(OS) -> Total
%% Windows and Freebsd code based on: memsup:get_memory_usage/1