diff --git a/src/comMisc/utPid.erl b/src/comMisc/utPid.erl index 1cf947a..91c41cd 100644 --- a/src/comMisc/utPid.erl +++ b/src/comMisc/utPid.erl @@ -36,7 +36,7 @@ is_process_alive(Pid) -> Node = node(), Result = case node(Pid) of Node -> erlang:is_process_alive(Pid); - Node1 -> rpc:call(Node1, erlang, is_process_alive, [Pid]) + Node1 -> erpc:call(Node1, erlang, is_process_alive, [Pid]) end, case Result of {badrpc, _Reason} -> false; diff --git a/src/hotUpdate/h.erl b/src/hotUpdate/h.erl index 63df0b4..129b81c 100644 --- a/src/hotUpdate/h.erl +++ b/src/hotUpdate/h.erl @@ -67,7 +67,7 @@ kf_load_beam(Files) -> Modules = [list_to_atom(filename:basename(File, ".erl")) || File <- Files], case nodes(connected) of [Node | _] -> - rpc:cast(Node, ?MODULE, kf_load_beam_all_server_in_local_node, [Modules]); + erpc:cast(Node, ?MODULE, kf_load_beam_all_server_in_local_node, [Modules]); _ -> skip end, @@ -91,7 +91,7 @@ nodes_load(Modules) -> catch load(Modules), % 连接的其他节点加载代码 ContenctedNodes = nodes(connected), - [rpc:cast(Node, ?MODULE, load, [Modules]) || Node <- ContenctedNodes]. + [erpc:cast(Node, ?MODULE, load, [Modules]) || Node <- ContenctedNodes]. load(Modules) -> [c:nl(M) || M <- Modules]. diff --git a/src/hotUpdate/hot_swap.erl b/src/hotUpdate/hot_swap.erl index 947aa81..9c05d00 100644 --- a/src/hotUpdate/hot_swap.erl +++ b/src/hotUpdate/hot_swap.erl @@ -19,7 +19,7 @@ load(ModList) -> %% @param ModList 模块列表(原子列表) network_load(ModList) -> lists:foreach(fun(Module) -> - [begin rpc:call(Node, code, purge, [Module]), rpc:call(Node, code, load_file, [Module]) end || Node <- (nodes() ++ [node()])] + [begin erpc:call(Node, code, purge, [Module]), erpc:call(Node, code, load_file, [Module]) end || Node <- (nodes() ++ [node()])] end, ModList). %% 指定单节点热更: @@ -28,8 +28,8 @@ network_load(ModList) -> network_load(NodeList, ModList) -> lists:foreach(fun(Node) -> lists:foreach(fun(Module) -> - rpc:call(Node, code, purge, [Module]), - rpc:call(Node, code, load_file, [Module]) + erpc:call(Node, code, purge, [Module]), + erpc:call(Node, code, load_file, [Module]) end, ModList) end, NodeList). diff --git a/src/hotUpdate/u.erl b/src/hotUpdate/u.erl index 680ac55..af0a0a1 100644 --- a/src/hotUpdate/u.erl +++ b/src/hotUpdate/u.erl @@ -116,7 +116,7 @@ info(V, P) -> loads([], _Files) -> ok; loads([H | T], Files) -> info("[~w]", [H#server.node]), - rpc:cast(H#server.node, u, load, [Files]), + erpc:cast(H#server.node, u, load, [Files]), loads(T, Files). get_new_file(Files, S) -> diff --git a/src/hotUpdate/u1.erl b/src/hotUpdate/u1.erl index ac00d7c..c1f0801 100644 --- a/src/hotUpdate/u1.erl +++ b/src/hotUpdate/u1.erl @@ -98,7 +98,7 @@ info(V, P) -> %% loads([], _Files) -> ok; %% loads([H | T], Files) -> %% info("[~w]", [H#t_server_node.node]), -%% rpc:cast(H#t_server_node.node, u, load, [Files]), +%% erpc:cast(H#t_server_node.node, u, load, [Files]), %% loads(T, Files). get_new_file(Files, S) -> @@ -155,7 +155,7 @@ a() -> hotswap(NodeArg) -> Node = util_data:to_atom(hd(NodeArg)), net_adm:ping(Node), - rpc:call(Node, ?MODULE, do_hotswap, []). + erpc:call(Node, ?MODULE, do_hotswap, []). do_hotswap() -> CommandFile = "../../hotswap/hotswap_command.txt", diff --git a/src/hotUpdate/u2.erl b/src/hotUpdate/u2.erl index 7068f1b..7d77f80 100644 --- a/src/hotUpdate/u2.erl +++ b/src/hotUpdate/u2.erl @@ -99,7 +99,7 @@ info(V, P) -> loads([], _Files) -> ok; loads([H | T], Files) -> info("[~w]", [H]), - rpc:cast(H, u, load, [Files]), + erpc:cast(H, u, load, [Files]), loads(T, Files). get_new_file(Files, S) -> diff --git a/src/recon-2.5.1/src/recon.erl b/src/recon-2.5.1/src/recon.erl index c085cb0..6870718 100644 --- a/src/recon-2.5.1/src/recon.erl +++ b/src/recon-2.5.1/src/recon.erl @@ -491,7 +491,7 @@ remote_load(Mod) -> remote_load(nodes(), Mod). Nodes :: [node(),...] | node(). remote_load(Nodes=[_|_], Mod) when is_atom(Mod) -> {Mod, Bin, File} = code:get_object_code(Mod), - rpc:multicall(Nodes, code, load_binary, [Mod, File, Bin]); + erpc:multicall(Nodes, code, load_binary, [Mod, File, Bin]); remote_load(Nodes=[_|_], Modules) when is_list(Modules) -> [remote_load(Nodes, Mod) || Mod <- Modules]; remote_load(Node, Mod) -> @@ -689,7 +689,7 @@ rpc(Nodes, Fun) -> %% @doc Runs an arbitrary fun (of arity 0) over one or more nodes. -spec rpc(node()|[node(),...], fun(() -> term()), timeout()) -> {[Success::_],[Fail::_]}. rpc(Nodes=[_|_], Fun, Timeout) when is_function(Fun,0) -> - rpc:multicall(Nodes, erlang, apply, [Fun,[]], Timeout); + erpc:multicall(Nodes, erlang, apply, [Fun,[]], Timeout); rpc(Node, Fun, Timeout) when is_atom(Node) -> rpc([Node], Fun, Timeout). @@ -707,7 +707,7 @@ named_rpc(Nodes, Fun) -> %% name of the node that computed a given result along with it, in a tuple. -spec named_rpc(node()|[node(),...], fun(() -> term()), timeout()) -> {[Success::_],[Fail::_]}. named_rpc(Nodes=[_|_], Fun, Timeout) when is_function(Fun,0) -> - rpc:multicall(Nodes, erlang, apply, [fun() -> {node(),Fun()} end,[]], Timeout); + erpc:multicall(Nodes, erlang, apply, [fun() -> {node(),Fun()} end,[]], Timeout); named_rpc(Node, Fun, Timeout) when is_atom(Node) -> named_rpc([Node], Fun, Timeout). diff --git a/src/srvNodeMgr/node_misc.erl b/src/srvNodeMgr/node_misc.erl index b3f0728..1c4e25a 100644 --- a/src/srvNodeMgr/node_misc.erl +++ b/src/srvNodeMgr/node_misc.erl @@ -41,7 +41,7 @@ cookie_hash() -> base64:encode_to_string(erlang:md5(atom_to_list(erlang:get_cookie()))). is_running(Node, Application) -> - case rpc:call(Node, app_utils, which_applications, []) of + case erpc:call(Node, app_utils, which_applications, []) of {badrpc, _} -> false; Apps -> @@ -49,7 +49,7 @@ is_running(Node, Application) -> end. is_process_running(Node, Process) -> - case rpc:call(Node, erlang, whereis, [Process]) of + case erpc:call(Node, erlang, whereis, [Process]) of {badrpc, _} -> false; undefined -> diff --git a/src/srvNodeMgr/utStopSrv1.escript b/src/srvNodeMgr/utStopSrv1.escript index abe95ce..9c86ccd 100644 --- a/src/srvNodeMgr/utStopSrv1.escript +++ b/src/srvNodeMgr/utStopSrv1.escript @@ -12,7 +12,7 @@ main(_Arge) -> pong -> io:format("the aims server:~p is online~n", [?AIM_NODE]), io:format("to close it~n"), - rpc:call(?AIM_NODE, init, stop, []), + erpc:call(?AIM_NODE, init, stop, []), halt(0); _ -> io:format("the aims server:~p is not online~n", [?AIM_NODE]), diff --git a/src/srvNodeMgr/utStopSrv2.escript b/src/srvNodeMgr/utStopSrv2.escript index e9f91da..983a92c 100644 --- a/src/srvNodeMgr/utStopSrv2.escript +++ b/src/srvNodeMgr/utStopSrv2.escript @@ -11,7 +11,7 @@ main(_Args) -> io:format("the aims server:~p is online~n", [?AIM_NODE]), io:format("to close it~n"), timer:sleep(10000), - rpc:call(?AIM_NODE, init, stop, []), + erpc:call(?AIM_NODE, init, stop, []), halt(0); _ -> io:format("the aims server:~p is online~n", [?AIM_NODE]),