diff options
| author | Matthew Sackman <matthew@lshift.net> | 2009-10-29 17:39:56 +0000 |
|---|---|---|
| committer | Matthew Sackman <matthew@lshift.net> | 2009-10-29 17:39:56 +0000 |
| commit | bbfe1e56bc931765d0a411a8e1022e0596efbde7 (patch) | |
| tree | 4fd1a8abfdc4bc59d81095f8dc4c453f9c1c2ea2 /src | |
| parent | 5a4bee772eec493a17353a67baf6cbaf0360b5e4 (diff) | |
| download | rabbitmq-server-git-bbfe1e56bc931765d0a411a8e1022e0596efbde7.tar.gz | |
set limits for 32bit to 4GB and 64bit to 256TB. Set default vm_memory_high_watermark to 0.4, and adjust display of memory size in undetected OS case
Diffstat (limited to 'src')
| -rw-r--r-- | src/vm_memory_monitor.erl | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/vm_memory_monitor.erl b/src/vm_memory_monitor.erl index d0aa1b7de7..6da47933a4 100644 --- a/src/vm_memory_monitor.erl +++ b/src/vm_memory_monitor.erl @@ -95,9 +95,10 @@ init([MemFraction]) -> TotalMemory = case get_total_memory() of unknown -> - rabbit_log:warning("Unknown total memory size for your OS ~p. " - "Assuming memory size is ~p bytes.~n", - [os:type(), ?MEMORY_SIZE_FOR_UNKNOWN_OS]), + rabbit_log:warning( + "Unknown total memory size for your OS ~p. " + "Assuming memory size is ~pMB.~n", + [os:type(), trunc(?MEMORY_SIZE_FOR_UNKNOWN_OS/1048576)]), ?MEMORY_SIZE_FOR_UNKNOWN_OS; M -> M end, @@ -199,8 +200,8 @@ start_timer(Timeout) -> %% in big trouble anyway. get_vm_limit() -> case erlang:system_info(wordsize) of - 4 -> 2147483648; %% 2 GB for 32 bits 2^31 - 8 -> 140737488355328 %% 128 TB for 64 bits 2^47 + 4 -> 4294967296; %% 4 GB for 32 bits 2^32 + 8 -> 281474976710656 %% 256 TB for 64 bits 2^48 %% http://en.wikipedia.org/wiki/X86-64#Virtual_address_space_details end. |