diff options
| author | Michael Klishin <mklishin@pivotal.io> | 2017-06-26 19:20:27 +0300 |
|---|---|---|
| committer | Michael Klishin <mklishin@pivotal.io> | 2017-06-26 19:20:27 +0300 |
| commit | d472412571bc10a1809bfd5ad3115f9d53ace883 (patch) | |
| tree | 566d9905bb72204cadb0389cd7b700b933a0bbbb /src | |
| parent | 9b25c146c39910787a0c0862f7c73b0b7c35f607 (diff) | |
| parent | 93b965c5ab96b81f71bc64e3b43097e4a8f97b96 (diff) | |
| download | rabbitmq-server-git-d472412571bc10a1809bfd5ad3115f9d53ace883.tar.gz | |
Merge branch 'master' into rabbitmq-mqtt-139
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_variable_queue.erl | 6 | ||||
| -rw-r--r-- | src/term_to_binary_compat.erl | 1 | ||||
| -rw-r--r-- | src/vm_memory_monitor.erl | 10 |
3 files changed, 8 insertions, 9 deletions
diff --git a/src/rabbit_variable_queue.erl b/src/rabbit_variable_queue.erl index 86321003c9..40967e316e 100644 --- a/src/rabbit_variable_queue.erl +++ b/src/rabbit_variable_queue.erl @@ -35,6 +35,10 @@ -export([move_messages_to_vhost_store/0]). +-export([migrate_queue/3, migrate_message/3, get_per_vhost_store_client/2, + get_global_store_client/1, log_upgrade_verbose/1, + log_upgrade_verbose/2]). + -include_lib("stdlib/include/qlc.hrl"). -define(QUEUE_MIGRATION_BATCH_SIZE, 100). @@ -359,8 +363,6 @@ -rabbit_upgrade({multiple_routing_keys, local, []}). -rabbit_upgrade({move_messages_to_vhost_store, message_store, []}). --compile(export_all). - -type seq_id() :: non_neg_integer(). -type rates() :: #rates { in :: float(), diff --git a/src/term_to_binary_compat.erl b/src/term_to_binary_compat.erl index 13396ddacb..b5e8f72bd4 100644 --- a/src/term_to_binary_compat.erl +++ b/src/term_to_binary_compat.erl @@ -22,4 +22,3 @@ term_to_binary_1(Term) -> term_to_binary(Term, [{minor_version, 1}]). - diff --git a/src/vm_memory_monitor.erl b/src/vm_memory_monitor.erl index f21dc91e0a..b07ff27f17 100644 --- a/src/vm_memory_monitor.erl +++ b/src/vm_memory_monitor.erl @@ -189,14 +189,12 @@ get_system_process_resident_memory({unix,openbsd}) -> get_system_process_resident_memory({win32,_OSname}) -> OsPid = os:getpid(), - Cmd = " tasklist /fi \"pid eq " ++ OsPid ++ "\" /fo LIST 2>&1 ", + Cmd = "wmic process where processid=" ++ OsPid ++ " get WorkingSetSize /value 2>&1", CmdOutput = os:cmd(Cmd), - %% Memory usage is displayed in kilobytes - %% with comma-separated thousands - case re:run(CmdOutput, "Mem Usage:\\s+([0-9,]+)\\s+K", [{capture, all_but_first, list}]) of + %% Memory usage is displayed in bytes + case re:run(CmdOutput, "WorkingSetSize=([0-9]+)", [{capture, all_but_first, binary}]) of {match, [Match]} -> - NoCommas = [ N || N <- Match, N =/= $, ], - {ok, list_to_integer(NoCommas) * 1024}; + {ok, binary_to_integer(Match)}; _ -> {error, {unexpected_output_from_command, Cmd, CmdOutput}} end; |