部分代码整理

src/dynamicCompile/mmake.erl → src/dynamicCompile/utMMake.erl

@@ -4,7 +4,7 @@
 %% 其中mods也可以包含多个模块,当大于1个时,
 %% 可以启动多个process进行编译,从而提高编译速度.
 
--module(mmake).
+-module(utMMake).
 -include_lib("kernel/include/file.hrl").
 
 -export([
@@ -20,7 +20,6 @@ all(Worker) when is_integer(Worker) ->
    all(Worker, []).
 
 all(Worker, Options) when is_integer(Worker) ->
-   %% io:format("make all Options:~w", [Options]),
    {MakeOpts, CompileOpts} = sort_options(Options, [], []),
    case read_emakefile('Emakefile', CompileOpts) of
       Files when is_list(Files) ->

src/hotUpdate/h.erl

@@ -46,10 +46,10 @@ h() ->
 
 hh() ->
    StartTime = unixtime(),
-   c:l(mmake),
+   c:l(utMMake),
    io:format("----------makes----------~n", []),
    c:cd("../"),
-   Res = (catch mmake:all(8, [netload])),
+   Res = (catch utMMake:all(8, [netload])),
    c:cd("ebin"),
    EndTime = unixtime(),
    io:format("MMake result = ~p~nMMake Time : ~p s", [Res, EndTime - StartTime]),

src/measure/utProf.erl

@@ -43,3 +43,25 @@ fprof(M, F, A) ->
    fprof:profile(),
    fprof:analyse([{dest, "fprof.analysis"}, {sort, own}]),
    fprof:stop().
+
+%% ====================================================================
+%% trace 日志
+%% 会把mod 每次调用详细MFA log 下来，args 太大就不好看了
+%% trace Mod 所有方法的调用
+%% --------------------------------------------------------------------
+trace(Mod) ->
+   dbg:tracer(),
+   dbg:tpl(Mod, '_', []),
+   dbg:p(all, c).
+
+%% trace Node上指定 Mod 所有方法的调用, 结果将输出到本地shell
+trace(Node, Mod) ->
+   dbg:tracer(),
+   dbg:n(Node),
+   dbg:tpl(Mod, '_', []),
+   dbg:p(all, c).
+
+%% 停止trace
+trace_stop() ->
+   dbg:stop_clear().
+%% ====================================================================

src/srvNodeMgr/main.erl

@@ -1,149 +0,0 @@
--module(main).
-
--export([
-   server_start/0,
-   server_stop/0,
-   server_stop/1,
-   is_running/0,
-   is_running/1,
-   reload/0,
-   info/0,
-   psl/0,
-   psl/1,
-   psl/2,
-   get_info/0
-]).
-
--define(SERVER_APPS, [sasl, crypto, inets, ranch, os_mon, hot]).
-
-server_start() ->
-   ok = application:load(hot),
-   app_misc:init(),
-   ok = start_applications(?SERVER_APPS).
-
-%% 加载更新
-reload() ->
-   reloader:reload_all().
-
-%%停止游戏服务器
-server_stop() ->
-   server_stop(30).
-
-is_running() ->
-   is_running(node()).
-
-is_running(Node) ->
-   node_misc:is_process_running(Node, server).
-
-%%停止游戏服务器
-server_stop(_SleepSeconds) ->
-   app_misc:pause_accept(),
-   stop_applications(?SERVER_APPS),
-   ok.
-
-info() ->
-   io:format("abormal termination:
-        ~n   Scheduler id:                         ~p
-        ~n   Num scheduler:                        ~p
-        ~n   Process count:                        ~p
-        ~n   Process limit:                        ~p
-        ~n   Memory used by erlang processes:      ~p
-        ~n   Memory allocated by erlang processes: ~p
-        ~n   The total amount of memory allocated: ~p
-        ~n",
-      get_info()),
-   ok.
-get_info() ->
-   SchedId = erlang:system_info(scheduler_id),
-   SchedNum = erlang:system_info(schedulers),
-   ProcCount = erlang:system_info(process_count),
-   ProcLimit = erlang:system_info(process_limit),
-   ProcMemUsed = erlang:memory(processes_used),
-   ProcMemAlloc = erlang:memory(processes),
-   MemTot = erlang:memory(total),
-   [SchedId, SchedNum, ProcCount, ProcLimit,
-      ProcMemUsed, ProcMemAlloc, MemTot].
-
-psl() ->
-   psl(100).
-
-psl(Num) ->
-   lists:foldl(
-      fun(P, true) ->
-         case erlang:process_info(P, message_queue_len) of
-            {message_queue_len, Count} when Count > Num ->
-               print_process_info(P),
-               false;
-            _ ->
-               true
-         end;
-         (_, false) ->
-            false
-      end, true, erlang:processes()).
-
-psl(ProcessPid, Num) ->
-   case erlang:process_info(ProcessPid, message_queue_len) of
-      {message_queue_len, Count} when Count > Num ->
-         print_process_info(ProcessPid);
-      _ ->
-         ok
-   end.
-
-print_process_info(P) ->
-   io:format("~n~n=====process info===~n"
-   "~p~n~p~n~p~n~p~n~p~n~p~n~p~n~p~n~p~n~p~n~n~n",
-      [P,
-         erlang:process_info(P, registered_name),
-         erlang:process_info(P, current_function),
-         erlang:process_info(P, message_queue_len),
-         erlang:process_info(P, status),
-         erlang:process_info(P, suspending),
-         erlang:process_info(P, last_calls),
-         erlang:process_info(P, links),
-         erlang:process_info(P, dictionary),
-         erlang:process_info(P, current_stacktrace)
-      ]).
-
-%%############辅助调用函数##############
-manage_applications(Iterate, Do, Undo, SkipError, ErrorTag, Apps) ->
-   Iterate(fun(App, Acc) ->
-      case Do(App) of
-         ok -> [App | Acc];%合拢
-         {error, {SkipError, _}} when is_atom(SkipError) ->
-            Acc;
-         {error, {Error, Reason}} when is_list(SkipError) ->
-            case lists:member(Error, SkipError) of
-               true ->
-                  Acc;
-               false ->
-                  io:format(
-                     "App ~p, Reason ~p~n", [App, Reason]),
-                  lists:foreach(Undo, Acc),
-                  throw({error, {ErrorTag, App, Reason}})
-            end;
-         {error, Reason} ->
-            io:format("App ~p, Reason ~p~n", [App, Reason]),
-            lists:foreach(Undo, Acc),
-            throw({error, {ErrorTag, App, Reason}})
-      end
-           end, [], Apps),
-   ok.
-
-start_applications(Apps) ->
-   manage_applications(fun lists:foldl/3,
-      fun application:start/1,
-      fun application:stop/1,
-      [already_started, cannot_start_application],
-      cannot_start_application,
-      Apps).
-
-stop_applications(Apps) ->
-   io:format("stop_applications stopping.~n", []),
-   manage_applications(fun lists:foldr/3,
-      fun application:stop/1,
-      fun application:start/1,
-      not_started,
-      cannot_stop_application,
-      Apps).
-
-

src/srvNodeMgr/mmake.erl

@@ -1,350 +0,0 @@
-%% 多进程编译,修改自otp/lib/tools/src/make.erl
-%% 解析Emakefile,根据获取{mods, options}列表,
-%% 按照次序编译每项(解决编译顺序的问题)
-%% 其中mods也可以包含多个模块,当大于1个时,
-%% 可以启动多个process进行编译,从而提高编译速度.
--module(mmake).
--export([all/1, all/2, files/2, files/3]).
-
--include_lib("kernel/include/file.hrl").
-
--define(MakeOpts, [noexec, load, netload, noload]).
-
-all(Worker) when is_integer(Worker) ->
-   all(Worker, []).
-
-all(Worker, Options) when is_integer(Worker) ->
-   {MakeOpts, CompileOpts} = sort_options(Options, [], []),
-   case read_emakefile('Emakefile', CompileOpts) of
-      Files when is_list(Files) ->
-         do_make_files(Worker, Files, MakeOpts);
-      error ->
-         error
-   end.
-
-files(Worker, Fs) ->
-   files(Worker, Fs, []).
-
-files(Worker, Fs0, Options) ->
-   Fs = [filename:rootname(F, ".erl") || F <- Fs0],
-   {MakeOpts, CompileOpts} = sort_options(Options, [], []),
-   case get_opts_from_emakefile(Fs, 'Emakefile', CompileOpts) of
-      Files when is_list(Files) ->
-         do_make_files(Worker, Files, MakeOpts);
-      error -> error
-   end.
-
-do_make_files(Worker, Fs, Opts) ->
-   %io:format("worker:~p~nfs:~p~nopts:~p~n", [Worker, Fs, Opts]),
-   process(Fs, Worker, lists:member(noexec, Opts), load_opt(Opts)).
-
-sort_options([H | T], Make, Comp) ->
-   case lists:member(H, ?MakeOpts) of
-      true ->
-         sort_options(T, [H | Make], Comp);
-      false ->
-         sort_options(T, Make, [H | Comp])
-   end;
-sort_options([], Make, Comp) ->
-   {Make, lists:reverse(Comp)}.
-
-%%% Reads the given Emakefile and returns a list of tuples: {Mods,Opts}
-%%% Mods is a list of module names (strings)
-%%% Opts is a list of options to be used when compiling Mods
-%%%
-%%% Emakefile can contain elements like this:
-%%% Mod.
-%%% {Mod,Opts}.
-%%% Mod is a module name which might include '*' as wildcard
-%%% or a list of such module names
-%%%
-%%% These elements are converted to [{ModList,OptList},...]
-%%% ModList is a list of modulenames (strings)
-read_emakefile(Emakefile, Opts) ->
-   case file:consult(Emakefile) of
-      {ok, Emake} ->
-         transform(Emake, Opts, [], []);
-      {error, enoent} ->
-         %% No Emakefile found - return all modules in current
-         %% directory and the options given at command line
-         Mods = [filename:rootname(F) || F <- filelib:wildcard("*.erl")],
-         [{Mods, Opts}];
-      {error, Other} ->
-         io:format("make: Trouble reading 'Emakefile':~n~p~n", [Other]),
-         error
-   end.
-
-transform([{Mod, ModOpts} | Emake], Opts, Files, Already) ->
-   case expand(Mod, Already) of
-      [] ->
-         transform(Emake, Opts, Files, Already);
-      Mods ->
-         transform(Emake, Opts, [{Mods, ModOpts ++ Opts} | Files], Mods ++ Already)
-   end;
-transform([Mod | Emake], Opts, Files, Already) ->
-   case expand(Mod, Already) of
-      [] ->
-         transform(Emake, Opts, Files, Already);
-      Mods ->
-         transform(Emake, Opts, [{Mods, Opts} | Files], Mods ++ Already)
-   end;
-transform([], _Opts, Files, _Already) ->
-   lists:reverse(Files).
-
-expand(Mod, Already) when is_atom(Mod) ->
-   expand(atom_to_list(Mod), Already);
-expand(Mods, Already) when is_list(Mods), not is_integer(hd(Mods)) ->
-   lists:concat([expand(Mod, Already) || Mod <- Mods]);
-expand(Mod, Already) ->
-   case lists:member($*, Mod) of
-      true ->
-         Fun = fun(F, Acc) ->
-            M = filename:rootname(F),
-            case lists:member(M, Already) of
-               true -> Acc;
-               false -> [M | Acc]
-            end
-               end,
-         lists:foldl(Fun, [], filelib:wildcard(Mod ++ ".erl"));
-      false ->
-         Mod2 = filename:rootname(Mod, ".erl"),
-         case lists:member(Mod2, Already) of
-            true -> [];
-            false -> [Mod2]
-         end
-   end.
-
-%%% Reads the given Emakefile to see if there are any specific compile 
-%%% options given for the modules.
-get_opts_from_emakefile(Mods, Emakefile, Opts) ->
-   case file:consult(Emakefile) of
-      {ok, Emake} ->
-         Modsandopts = transform(Emake, Opts, [], []),
-         ModStrings = [coerce_2_list(M) || M <- Mods],
-         get_opts_from_emakefile2(Modsandopts, ModStrings, Opts, []);
-      {error, enoent} ->
-         [{Mods, Opts}];
-      {error, Other} ->
-         io:format("make: Trouble reading 'Emakefile':~n~p~n", [Other]),
-         error
-   end.
-
-get_opts_from_emakefile2([{MakefileMods, O} | Rest], Mods, Opts, Result) ->
-   case members(Mods, MakefileMods, [], Mods) of
-      {[], _} ->
-         get_opts_from_emakefile2(Rest, Mods, Opts, Result);
-      {I, RestOfMods} ->
-         get_opts_from_emakefile2(Rest, RestOfMods, Opts, [{I, O} | Result])
-   end;
-get_opts_from_emakefile2([], [], _Opts, Result) ->
-   Result;
-get_opts_from_emakefile2([], RestOfMods, Opts, Result) ->
-   [{RestOfMods, Opts} | Result].
-
-members([H | T], MakefileMods, I, Rest) ->
-   case lists:member(H, MakefileMods) of
-      true ->
-         members(T, MakefileMods, [H | I], lists:delete(H, Rest));
-      false ->
-         members(T, MakefileMods, I, Rest)
-   end;
-members([], _MakefileMods, I, Rest) ->
-   {I, Rest}.
-
-
-%% Any flags that are not recognixed as make flags are passed directly
-%% to the compiler.
-%% So for example make:all([load,debug_info]) will make everything
-%% with the debug_info flag and load it.
-load_opt(Opts) ->
-   case lists:member(netload, Opts) of
-      true ->
-         netload;
-      false ->
-         case lists:member(load, Opts) of
-            true ->
-               load;
-            _ ->
-               noload
-         end
-   end.
-
-%% 处理
-process([{[], _Opts} | Rest], Worker, NoExec, Load) ->
-   process(Rest, Worker, NoExec, Load);
-process([{L, Opts} | Rest], Worker, NoExec, Load) ->
-   Len = length(L),
-   Worker2 = erlang:min(Len, Worker),
-   case catch do_worker(L, Opts, NoExec, Load, Worker2) of
-      error ->
-         error;
-      ok ->
-         process(Rest, Worker, NoExec, Load)
-   end;
-process([], _Worker, _NoExec, _Load) ->
-   up_to_date.
-
-%% worker进行编译
-do_worker(L, Opts, NoExec, Load, Worker) ->
-   WorkerList = do_split_list(L, Worker),
-   %io:format("worker:~p worker list(~p)~n", [Worker, length(WorkerList)]),
-   % 启动进程
-   Ref = make_ref(),
-   Pids =
-      [begin
-          start_worker(E, Opts, NoExec, Load, self(), Ref)
-       end || E <- WorkerList],
-   do_wait_worker(length(Pids), Ref).
-
-%% 等待结果
-do_wait_worker(0, _Ref) ->
-   ok;
-do_wait_worker(N, Ref) ->
-   receive
-      {ack, Ref} ->
-         do_wait_worker(N - 1, Ref);
-      {error, Ref} ->
-         throw(error);
-      {'EXIT', _P, _Reason} ->
-         do_wait_worker(N, Ref);
-      _Other ->
-         io:format("receive unknown msg:~p~n", [_Other]),
-         do_wait_worker(N, Ref)
-   end.
-
-%% 将L分割成最多包含N个子列表的列表
-do_split_list(L, N) ->
-   Len = length(L),
-   % 每个列表的元素数
-   LLen = (Len + N - 1) div N,
-   do_split_list(L, LLen, []).
-
-do_split_list([], _N, Acc) ->
-   lists:reverse(Acc);
-do_split_list(L, N, Acc) ->
-   {L2, L3} = lists:split(erlang:min(length(L), N), L),
-   do_split_list(L3, N, [L2 | Acc]).
-
-%% 启动worker进程
-start_worker(L, Opts, NoExec, Load, Parent, Ref) ->
-   Fun =
-      fun() ->
-         [begin
-             case recompilep(coerce_2_list(F), NoExec, Load, Opts) of
-                error ->
-                   Parent ! {error, Ref},
-                   exit(error);
-                _ ->
-                   ok
-             end
-          end || F <- L],
-         Parent ! {ack, Ref}
-      end,
-   spawn_link(Fun).
-
-recompilep(File, NoExec, Load, Opts) ->
-   ObjName = lists:append(filename:basename(File),
-      code:objfile_extension()),
-   ObjFile = case lists:keysearch(outdir, 1, Opts) of
-                {value, {outdir, OutDir}} ->
-                   filename:join(coerce_2_list(OutDir), ObjName);
-                false ->
-                   ObjName
-             end,
-   case exists(ObjFile) of
-      true ->
-         recompilep1(File, NoExec, Load, Opts, ObjFile);
-      false ->
-         recompile(File, NoExec, Load, Opts)
-   end.
-
-recompilep1(File, NoExec, Load, Opts, ObjFile) ->
-   {ok, Erl} = file:read_file_info(lists:append(File, ".erl")),
-   {ok, Obj} = file:read_file_info(ObjFile),
-   recompilep1(Erl, Obj, File, NoExec, Load, Opts).
-
-recompilep1(#file_info{mtime = Te},
-   #file_info{mtime = To}, File, NoExec, Load, Opts) when Te > To ->
-   recompile(File, NoExec, Load, Opts);
-recompilep1(_Erl, #file_info{mtime = To}, File, NoExec, Load, Opts) ->
-   recompile2(To, File, NoExec, Load, Opts).
-
-%% recompile2(ObjMTime, File, NoExec, Load, Opts)
-%% Check if file is of a later date than include files.
-recompile2(ObjMTime, File, NoExec, Load, Opts) ->
-   IncludePath = include_opt(Opts),
-   case check_includes(lists:append(File, ".erl"), IncludePath, ObjMTime) of
-      true ->
-         recompile(File, NoExec, Load, Opts);
-      false ->
-         false
-   end.
-
-include_opt([{i, Path} | Rest]) ->
-   [Path | include_opt(Rest)];
-include_opt([_First | Rest]) ->
-   include_opt(Rest);
-include_opt([]) ->
-   [].
-
-%% recompile(File, NoExec, Load, Opts)
-%% Actually recompile and load the file, depending on the flags.
-%% Where load can be netload | load | noload
-
-recompile(File, true, _Load, _Opts) ->
-   io:format("Out of date: ~s\n", [File]);
-recompile(File, false, noload, Opts) ->
-   io:format("Recompile: ~s\n", [File]),
-   compile:file(File, [report_errors, report_warnings, error_summary | Opts]);
-recompile(File, false, load, Opts) ->
-   io:format("Recompile: ~s\n", [File]),
-   c:c(File, Opts);
-recompile(File, false, netload, Opts) ->
-   io:format("Recompile: ~s\n", [File]),
-   c:nc(File, Opts).
-
-exists(File) ->
-   case file:read_file_info(File) of
-      {ok, _} ->
-         true;
-      _ ->
-         false
-   end.
-
-coerce_2_list(X) when is_atom(X) ->
-   atom_to_list(X);
-coerce_2_list(X) ->
-   X.
-
-%%% If you an include file is found with a modification
-%%% time larger than the modification time of the object
-%%% file, return true. Otherwise return false.
-check_includes(File, IncludePath, ObjMTime) ->
-   Path = [filename:dirname(File) | IncludePath],
-   case epp:open(File, Path, []) of
-      {ok, Epp} ->
-         check_includes2(Epp, File, ObjMTime);
-      _Error ->
-         false
-   end.
-
-check_includes2(Epp, File, ObjMTime) ->
-   case epp:parse_erl_form(Epp) of
-      {ok, {attribute, 1, file, {File, 1}}} ->
-         check_includes2(Epp, File, ObjMTime);
-      {ok, {attribute, 1, file, {IncFile, 1}}} ->
-         case file:read_file_info(IncFile) of
-            {ok, #file_info{mtime = MTime}} when MTime > ObjMTime ->
-               epp:close(Epp),
-               true;
-            _ ->
-               check_includes2(Epp, File, ObjMTime)
-         end;
-      {ok, _} ->
-         check_includes2(Epp, File, ObjMTime);
-      {eof, _} ->
-         epp:close(Epp),
-         false;
-      {error, _Error} ->
-         check_includes2(Epp, File, ObjMTime)
-   end.

src/srvNodeMgr/server_control_main.erl

@@ -1,145 +0,0 @@
--module(server_control_main).
-
--export([start/0]).
-
--define(RPC_TIMEOUT, infinity).
-
-commands_desc() ->
-   [{"stop", "停止游戏服务器进程"},
-      {"stop_all", "停止游戏集群进程"},
-      {"stop_app", "关闭server application"},
-      {"start_app", "打开server application"},
-      {"cluster_status", "集群状态"}].
-opt_spec_list() ->
-   Node = case get(nodename) of
-             undefined ->
-                throw(not_nodename);
-             V ->
-                V
-          end,
-   [
-      {help, $h, "help", undefined, "显示帮助，然后退出"},
-      {node, undefined, "node", {atom, Node}, "管理节点"}
-   ].
-usage() ->
-   getopt:usage(opt_spec_list(), "server_ctl", "<command> [<args>]", commands_desc()),
-   err_misc:quit(1).
-parse_arguments(CmdLine) ->
-   case getopt:parse(opt_spec_list(), CmdLine) of
-      {ok, {Opts, [Command | Args]}} ->
-         {ok, {list_to_atom(Command), Opts, Args}};
-      {ok, {_Opts, []}} ->
-         no_command;
-      Error ->
-         io:format("Error ~p~n", [Error]),
-         no_command
-   end.
-
-start() ->
-   {ok, [[NodeStr | _] | _]} = init:get_argument(nodename),
-   put(nodename, list_to_atom(NodeStr)),
-   {Command, Opts, Args} =
-      case parse_arguments(init:get_plain_arguments()) of
-         {ok, Res} ->
-            Res;
-         no_command ->
-            usage()
-      end,
-   Node = proplists:get_value(node, Opts),
-   net_adm:ping(Node),
-   timer:sleep(1000), %% wait auto find node
-   %% The reason we don't use a try/catch here is that rpc:call turns
-   %% thrown errors into normal return values
-   % io:format("Opts ~p~n", [Opts]),
-   case catch action(Command, Node, Args, Opts) of
-      ok ->
-         io:format("done.~n", []),
-         quit(0);
-      {ok, Info} ->
-         io:format("done (~p).~n", [Info]),
-         quit(0);
-      Other ->
-         io:format("other result ~p~n", [Other]),
-         quit(2)
-   end.
-
-action(info, Node, _Args, _Opts) ->
-   io:format("System info for Node ~p~n", [Node]),
-   Res = call(Node, {main, get_info, []}),
-   io:format(" ~n   Scheduler id:                         ~p
-               ~n   Num scheduler:                        ~p
-               ~n   Process count:                        ~p
-               ~n   Process limit:                        ~p
-               ~n   Memory used by erlang processes:      ~p
-               ~n   Memory allocated by erlang processes: ~p
-               ~n   The total amount of memory allocated: ~p
-               ~n",
-      Res),
-   ok;
-action(backup, Node, _Args, _Opts) ->
-   case call(Node, {app_misc, backup, []}) of
-      {error, Msg} ->
-         io:format("~s~n", [Msg]);
-      {ok, FileName} ->
-         io:format("backup file:~s~n", [FileName]),
-         io:format("backup file to remote ......~n", []),
-         Result = os:cmd("bash copy_to_remote.sh " ++ FileName),
-         io:format("~s~n", [Result])
-   end,
-   ok;
-
-action(pause_accept, Node, _Args, _Opts) ->
-   io:format("Pause accept new client ~p~n", [Node]),
-   call(Node, {app_misc, pause_accept, []}),
-   ok;
-action(resume_accept, Node, _Args, _Opts) ->
-   io:format("Resume accept new client ~p~n", [Node]),
-   call(Node, {app_misc, resume_accept, []}),
-   ok;
-action(accept_state, Node, _Args, _Opts) ->
-   Res = call(Node, {app_misc, can_accept_new, []}),
-   io:format("Node ~p accept state:~p~n ", [Node, Res]),
-   ok;
-action(reload, Node, _Args, _Opts) ->
-   io:format("Reloading node ~p~n", [Node]),
-   call(Node, {main, reload, []});
-action(stop_all, MasterNode, _Args, _Opts) ->
-   io:format("Stopping and halting all node~n", []),
-   PidMRefs = [{spawn_monitor(fun() ->
-      call(Node, {main, stop_and_halt, [5]})
-                              end), Node}
-      || Node <- nodes() -- [MasterNode]],
-   [receive
-       {'DOWN', MRef, process, _, normal} ->
-          ok;
-       {'DOWN', MRef, process, _, Reason} ->
-          io:format("Node ~p Error, Reason ~p", [Node, Reason])
-    end || {{_Pid, MRef}, Node} <- PidMRefs],
-   call(MasterNode, {main, stop_and_halt, [5]}),
-   ok;
-action(stop, Node, _Args, _Opts) ->
-   io:format("Stopping and halting node ~p~n", [Node]),
-   call(Node, {main, stop_and_halt, [5]});
-action(Command, _Node, Args, Opts) ->
-   io:format("Command: ~p Args: ~p Opts: ~p~n", [Command, Args, Opts]),
-   invalid_command.
-
-call(Node, {Mod, Fun, Args}) ->
-   %%rpc_call(Node, Mod, Fun, lists:map(fun list_to_binary/1, Args)).
-   rpc_call(Node, Mod, Fun, Args).
-
-rpc_call(Node, Mod, Fun, Args) ->
-   rpc:call(Node, Mod, Fun, Args, ?RPC_TIMEOUT).
-
-
-quit(Status) ->
-   case os:type() of
-      {unix, _} ->
-         halt(Status);
-      {win32, _} ->
-         init:stop(Status),
-         receive
-         after infinity ->
-            ok
-         end
-   end.

src/srvNodeMgr/utVMInfo.erl

@@ -1,84 +1,100 @@
 -module(utVMInfo).
 
--compile([export_all, nowarn_export_all]).
+-export([
+	vmInfo/0							%% 打印虚拟机简略信息
+	, processInfo/1				%% 打印进程简略信息
+	, processMqlInfo/0			%% 消息队列阻塞的进程信息
+	, processMqlInfo/1			%% 消息队列阻塞的进程信息
+	, showEtsCache/0				%% 打印并排序各个表的缓存消耗
+	, processHeapSize/0			%% 进程消耗内存的信息
+	, processCnt/0					%% 当前进程数量
+	, pstack/1						%% 进程栈
+	, gcAll/0						%% 对所有process做gc 进程内存过高时，来一发，看看是内存泄露还是gc不过来
+	, gcOne/1						%% 对指定process做gc 进程内存过高时，来一发，看看是内存泄露还是gc不过来
+	, scheduler_usage/0			%% 统计下1s每个调度器CPU的实际利用率(因为有spin wait、调度工作, 可能usage 比top显示低很多)
+	, scheduler_usage/1			%% 统计下1s每个调度器CPU的实际利用率(因为有spin wait、调度工作, 可能usage 比top显示低很多)\
+	, scheduler_stat/0			%% 统计下1s内调度进程数量(含义：第一个数字执行进程数量，第二个数字迁移进程数量)
+	, scheduler_stat/1			%% 统计下1s内调度进程数量(含义：第一个数字执行进程数量，第二个数字迁移进程数量)
+]).
+
+%% 打印虚拟机简略信息
+vmInfo() ->
+	io:format("abormal termination:
+        ~n   Scheduler id:                         ~p
+        ~n   Num scheduler:                        ~p
+        ~n   Process count:                        ~p
+        ~n   Process limit:                        ~p
+        ~n   Memory used by erlang processes:      ~p
+        ~n   Memory allocated by erlang processes: ~p
+        ~n   The total amount of memory allocated: ~p
+        ~n",
+		[erlang:system_info(scheduler_id), erlang:system_info(schedulers), erlang:system_info(process_count), erlang:system_info(process_limit), erlang:memory(processes_used), erlang:memory(processes), erlang:memory(total)]),
+	ok.
+
+%% 打印进程简略信息
+processInfo(Pid) ->
+	io:format("~n~n=====process info===~n~p~n~p~n~p~n~p~n~p~n~p~n~p~n~p~n~p~n~p~n~n~n",
+		[
+			Pid,
+			erlang:process_info(Pid, registered_name),
+			erlang:process_info(Pid, current_function),
+			erlang:process_info(Pid, message_queue_len),
+			erlang:process_info(Pid, status),
+			erlang:process_info(Pid, suspending),
+			erlang:process_info(Pid, last_calls),
+			erlang:process_info(Pid, links),
+			erlang:process_info(Pid, dictionary),
+			erlang:process_info(Pid, current_stacktrace)
+		]).
+
+%% 消息队列阻塞的进程信息
+processMqlInfo() ->
+	processMqlInfo(100).
+
+processMqlInfo(Num) ->
+	[processMqlInfo(Pid, Num) ||  Pid <- erlang:processes()],
+	ok.
+
+%% 消息队列阻塞的进程信息
+processMqlInfo(Pid, Num) ->
+	case erlang:process_info(Pid, message_queue_len) of
+		{message_queue_len, Count} when Count > Num ->
+			processInfo(Pid);
+		_ ->
+			ok
+	end.
 
 %% 打印并排序各个表的缓存消耗
-show_cache() ->
+showEtsCache() ->
 	io:format("table name | memory | size~n", []),
 	lists:reverse(lists:keysort(2, [{T, ets:info(T, memory), ets:info(T, size)} || T <- ets:all()])).
 
-%% 打印进程消耗内存的信息
-show_process() ->
+%% 进程消耗内存排序的信息
+processHeapSize() ->
 	lists:reverse(lists:keysort(2, [{erlang:process_info(P, registered_name), erlang:process_info(P, heap_size)} || P <- erlang:processes()])).
 
-%% 打印当前进程数量
-show_process_count() ->
-	length(erlang:processes()).
-
-%% 反编译
-%% 确认线上运行代码是否正确，reltools没掌握好，升级偶尔出现问题
-decompile(Mod) ->
-	{ok,{_,[{abstract_code,{_,AC}}]}} = beam_lib:chunks(code:which(Mod), [abstract_code]),
-	io:format("~s~n", [erl_prettypr:format(erl_syntax:form_list(AC))]).
+%% 当前进程数量
+processCnt() ->
+	erlang:system_info(process_count).
 
-%% 进程栈
-%% 类似于jstack，发现大量进程挂起，进程数过高，运行慢，hang住等问题用到
+%% 进程栈 类似于jstack，发现大量进程挂起，进程数过高，运行慢，hang住等问题用到
 pstack(Reg) when is_atom(Reg) ->
-	case whereis(Reg) of
-		undefined -> undefined;
-		Pid -> pstack(Pid)
-	end;
-pstack(Pid) ->
-	io:format("~s~n", [element(2, process_info(Pid, backtrace))]).
-
-%% ====================================================================
-%% etop
-%% 分析内存、cpu占用进程，即使数十w进程node 也能正常使用
-%% 进程CPU占用排名
-%% --------------------------------------------------------------------
-etop() ->
-	spawn(fun() -> etop:start([{output, text}, {interval, 10}, {lines, 20}, {sort, reductions}]) end).
-
-%% 进程Mem占用排名
-etop_mem() ->
-	spawn(fun() -> etop:start([{output, text}, {interval, 10}, {lines, 20}, {sort, memory}]) end).
-
-%% 停止etop
-etop_stop() ->
-	etop:stop().
-%% ====================================================================
-
-%% 对所有process做gc
-%% 进程内存过高时，来一发，看看是内存泄露还是gc不过来
-gc_all() ->
+	case is_atom(Reg) andalso whereis(Reg) of
+		false -> io:format("~s~n", [element(2, erlang:process_info(Reg, backtrace))]);
+		undefined ->
+			undefined;
+		Pid -> io:format("~s~n", [element(2, erlang:process_info(Pid, backtrace))])
+	end.
+
+%% 对所有process做gc 进程内存过高时，来一发，看看是内存泄露还是gc不过来
+gcAll() ->
 	[erlang:garbage_collect(Pid) || Pid <- processes()],
 	ok.
 
-%% 对MFA 执行分析，会严重减缓运行，建议只对小量业务执行
-%% 结果:
-%% fprof 结果比较详细，能够输出热点调用路径
-fprof(M, F, A) ->
-	fprof:start(),
-	fprof:apply(M, F, A),
-	fprof:profile(),
-	fprof:analyse(),
-	fprof:stop().
-
-%% 对整个节点内所有进程执行eprof, eprof 对线上业务有一定影响,慎用!
-%% 建议TimeoutSec<10s，且进程数< 1000，否则可能导致节点crash
-%% 结果:
-%% 输出每个方法实际执行时间（不会累计方法内其他mod调用执行时间）
-%% 只能得到mod - Fun 执行次数 执行耗时
-eprof_all(TimeoutSec) ->
-	eprof(processes() -- [whereis(eprof)], TimeoutSec).
-
-eprof(Pids, TimeoutSec) ->
-	eprof:start(),
-	eprof:start_profiling(Pids),
-	timer:sleep(TimeoutSec),
-	eprof:stop_profiling(),
-	eprof:analyze(total),
-	eprof:stop().
+%% 对指定process做gc 进程内存过高时，来一发，看看是内存泄露还是gc不过来
+gcOne(Pid) ->
+	erlang:garbage_collect(Pid),
+	ok.
 
 %% scheduler usage
 %% 统计下1s每个调度器CPU的实际利用率(因为有spin wait、调度工作, 可能usage 比top显示低很多)
@@ -112,27 +128,7 @@ scheduler_stat(RunMs) ->
 	lists:map(fun({{_Key, In0, Out0}, {Key, In1, Out1}}) ->
 		{Key, In1 - In0, Out1 - Out0} end, lists:zip(Ts0, Ts1)).
 
-%% ====================================================================
-%% trace 日志
-%% 会把mod 每次调用详细MFA log 下来，args 太大就不好看了
-%% trace Mod 所有方法的调用
-%% --------------------------------------------------------------------
-trace(Mod) ->
-	dbg:tracer(),
-	dbg:tpl(Mod, '_', []),
-	dbg:p(all, c).
-
-%% trace Node上指定 Mod 所有方法的调用, 结果将输出到本地shell
-trace(Node, Mod) ->
-	dbg:tracer(),
-	dbg:n(Node),
-	dbg:tpl(Mod, '_', []),
-	dbg:p(all, c).
-
-%% 停止trace
-trace_stop() ->
-	dbg:stop_clear().
-%% ====================================================================
+
 
 %% 内存高OOM 排查工具
 %% etop 无法应对10w+ 进程节点, 下面代码就没问题了；找到可疑proc后通过pstack、message_queu_len 排查原因
@@ -367,19 +363,7 @@ ets_mem() ->
 			io:format("~-30w ~wKb~n", [Tab, Mem / 1024])
 		end, L1).
 
-%% @spec tcp_links() -> Info
-%% @doc 统计tcp链接
-tcp_links() ->
-	L = erlang:ports(),
-	F = fun(P) ->
-		Pinfo = erlang:port_info(P),
-		case lists:keyfind(name, 1, Pinfo) of
-			{name, "tcp_inet"} -> true;
-			_ -> false
-		end
-		 end,
-	L1 = lists:filter(F, L),
-	io:format("~n当前socket数量(包括链接数据库的socket): ~w~n", [length(L1)]).
+
 
 
 %% @doc 备份进程信息