Skip to content

Only start os_mon application on win32 #14435

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Only start os_mon application on win32 #14435

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion deps/rabbit/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ define PROJECT_ENV
]
endef

LOCAL_DEPS = sasl os_mon inets compiler public_key crypto ssl syntax_tools xmerl
LOCAL_DEPS = sasl inets compiler public_key crypto ssl syntax_tools xmerl

BUILD_DEPS = rabbitmq_cli
DEPS = ranch cowlib rabbit_common amqp10_common rabbitmq_prelaunch ra sysmon_handler stdout_formatter recon redbug observer_cli osiris syslog systemd seshat horus khepri khepri_mnesia_migration cuttlefish gen_batch_server
Expand Down
4 changes: 4 additions & 0 deletions deps/rabbit/src/rabbit_disk_monitor.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,10 @@ init([Limit]) ->
{unix, _} ->
start_portprogram();
{win32, _OSname} ->
%% Note: os_mon is not automatically started as it is only
%% used on win32 for the time being. Rather than start it
%% on all systems, we start it here.
ok = rabbit_misc:ensure_os_mon(),
not_used
end,
State3 = State2#state{port=Port, os=OS},
Expand Down
6 changes: 6 additions & 0 deletions deps/rabbit/src/vm_memory_monitor.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,6 +275,12 @@ init_state_by_os(State0 = #state{os_type = {unix, linux}, os_pid = OsPid}) ->
PageSize = get_linux_pagesize(),
ProcFile = io_lib:format("/proc/~ts/statm", [OsPid]),
State0#state{page_size = PageSize, proc_file = ProcFile};
init_state_by_os(State = #state{os_type = {win32, _}}) ->
%% Note: os_mon is not automatically started as it is only
%% used on win32 for the time being. Rather than start it
%% on all systems, we start it here.
ok = rabbit_misc:ensure_os_mon(),
State;
init_state_by_os(State) ->
State.

Expand Down
10 changes: 10 additions & 0 deletions deps/rabbit_common/src/rabbit_misc.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,8 @@
-export([remote_sup_child/2]).
-export([for_each_while_ok/2, fold_while_ok/3]).

-export([ensure_os_mon/0]).

%% Horrible macro to use in guards
-define(IS_BENIGN_EXIT(R),
R =:= noproc; R =:= noconnection; R =:= nodedown; R =:= normal;
Expand Down Expand Up @@ -1615,3 +1617,11 @@ fold_while_ok(Fun, Acc0, [Elem | Rest]) ->
end;
fold_while_ok(_Fun, Acc, []) ->
{ok, Acc}.

ensure_os_mon() ->
ensure_os_mon(os:type()).

ensure_os_mon({win32, _}) ->
ok = application:ensure_started(os_mon);
ensure_os_mon(_) ->
ok.
Loading