From c2f9eff8c8265bdf031e3cafa8a77977102b75b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn-Egil=20Dahlberg?= Date: Mon, 26 Jul 2010 14:49:27 +0200 Subject: Update guards to the modern interface --- lib/inviso/src/inviso.erl | 78 ++++++++++++++++----------------- lib/inviso/src/inviso_c.erl | 50 ++++++++++----------- lib/inviso/src/inviso_lfm.erl | 14 +++--- lib/inviso/src/inviso_lfm_tpfreader.erl | 12 ++--- lib/inviso/src/inviso_tool.erl | 72 +++++++++++++++--------------- lib/inviso/src/inviso_tool_lib.erl | 18 ++++---- 6 files changed, 122 insertions(+), 122 deletions(-) (limited to 'lib') diff --git a/lib/inviso/src/inviso.erl b/lib/inviso/src/inviso.erl index de42926ffe..0eda06a5c2 100644 --- a/lib/inviso/src/inviso.erl +++ b/lib/inviso/src/inviso.erl @@ -129,7 +129,7 @@ start(Options) -> add_node(Reference) -> gen_server:call(?CONTROLLER,{add_nodes,[node()],[],Reference,any_ref},?CALL_TIMEOUT). -add_node(Reference,Options) when list(Options) -> +add_node(Reference,Options) when is_list(Options) -> gen_server:call(?CONTROLLER,{add_nodes,[node()],Options,Reference,any_ref},?CALL_TIMEOUT). %% ----------------------------------------------------------------------------- @@ -142,7 +142,7 @@ add_node(Reference,Options) when list(Options) -> add_node_if_ref(Reference) -> gen_server:call(?CONTROLLER,{add_nodes,[node()],[],Reference,if_ref},?CALL_TIMEOUT). -add_node_if_ref(Reference,Options) when list(Options) -> +add_node_if_ref(Reference,Options) when is_list(Options) -> gen_server:call(?CONTROLLER,{add_nodes,[node()],Options,Reference,if_ref},?CALL_TIMEOUT). %% ----------------------------------------------------------------------------- @@ -156,10 +156,10 @@ add_node_if_ref(Reference,Options) when list(Options) -> %% system. By speicifying node() as the node where the runtime component shall %% be started. The return value will then follow the rules of non distributed %% returnvalues and not have a node indicator. -add_nodes(Nodes,Reference) when list(Nodes) -> +add_nodes(Nodes,Reference) when is_list(Nodes) -> gen_server:call(?CONTROLLER,{add_nodes,Nodes,[],Reference,any_ref},?CALL_TIMEOUT). -add_nodes(Nodes,Reference,Options) when list(Nodes),list(Options) -> +add_nodes(Nodes,Reference,Options) when is_list(Nodes),is_list(Options) -> gen_server:call(?CONTROLLER,{add_nodes,Nodes,Options,Reference,any_ref},?CALL_TIMEOUT). %% ----------------------------------------------------------------------------- @@ -168,10 +168,10 @@ add_nodes(Nodes,Reference,Options) when list(Nodes),list(Options) -> %% %% As add_nodes/2,/3 but will only connect to an already existing runtime component %% if its reference is the same as the one given as argument. -add_nodes_if_ref(Nodes,Reference) when list(Nodes) -> +add_nodes_if_ref(Nodes,Reference) when is_list(Nodes) -> gen_server:call(?CONTROLLER,{add_nodes,Nodes,[],Reference,if_ref},?CALL_TIMEOUT). -add_nodes_if_ref(Nodes,Reference,Options) when list(Nodes),list(Options) -> +add_nodes_if_ref(Nodes,Reference,Options) when is_list(Nodes),is_list(Options) -> gen_server:call(?CONTROLLER,{add_nodes,Nodes,Options,Reference,if_ref},?CALL_TIMEOUT). %% ----------------------------------------------------------------------------- @@ -182,9 +182,9 @@ add_nodes_if_ref(Nodes,Reference,Options) when list(Nodes),list(Options) -> %% %% Change options on all or specified Nodes. This may result in for instance %% reinitialization of overloadcheck. -change_options(Options) when list(Options) -> +change_options(Options) when is_list(Options) -> gen_server:call(?CONTROLLER,{change_options,all,Options},?CALL_TIMEOUT). -change_options(Nodes,Options) when list(Nodes),list(Options) -> +change_options(Nodes,Options) when is_list(Nodes),is_list(Options) -> gen_server:call(?CONTROLLER,{change_options,Nodes,Options},?CALL_TIMEOUT). %% ----------------------------------------------------------------------------- @@ -234,7 +234,7 @@ change_options(Nodes,Options) when list(Nodes),list(Options) -> init_tracing(TracerDataList) -> gen_server:call(?CONTROLLER,{init_tracing,TracerDataList},?CALL_TIMEOUT). -init_tracing(Nodes,TracerData) when list(Nodes) -> +init_tracing(Nodes,TracerData) when is_list(Nodes) -> gen_server:call(?CONTROLLER,{init_tracing,Nodes,TracerData},?CALL_TIMEOUT). %% ----------------------------------------------------------------------------- @@ -270,10 +270,10 @@ stop_tracing(Nodes) when is_list(Nodes) -> clear() -> gen_server:call(?CONTROLLER,{clear,all,[]},?CALL_TIMEOUT). -clear(Nodes) when list(Nodes) -> +clear(Nodes) when is_list(Nodes) -> gen_server:call(?CONTROLLER,{clear,Nodes,[]},?CALL_TIMEOUT). -clear(Nodes,Options) when list(Nodes),list(Options) -> +clear(Nodes,Options) when is_list(Nodes),is_list(Options) -> gen_server:call(?CONTROLLER,{clear,Nodes,Options},?CALL_TIMEOUT). %% ----------------------------------------------------------------------------- @@ -355,9 +355,9 @@ stop_all() -> tp(Nodes,Module,Function,Arity,MatchSpec,Opts) -> trace_pattern(Nodes,[{Module,Function,Arity,MatchSpec,Opts}],[global]). -tp(Nodes,Module,Function,Arity,MatchSpec) when list(Nodes) -> +tp(Nodes,Module,Function,Arity,MatchSpec) when is_list(Nodes) -> trace_pattern(Nodes,[{Module,Function,Arity,MatchSpec,[]}],[global]); -tp(Module,Function,Arity,MatchSpec,Opts) when atom(Module) -> +tp(Module,Function,Arity,MatchSpec,Opts) when is_atom(Module) -> trace_pattern(all,[{Module,Function,Arity,MatchSpec,Opts}],[global]). tp(Module,Function,Arity,MatchSpec) -> @@ -384,9 +384,9 @@ tp(PatternList) -> tpl(Nodes,Module,Function,Arity,MatchSpec,Opts) -> trace_pattern(Nodes,[{Module,Function,Arity,MatchSpec,Opts}],[local]). -tpl(Nodes,Module,Function,Arity,MatchSpec) when list(Nodes) -> +tpl(Nodes,Module,Function,Arity,MatchSpec) when is_list(Nodes) -> trace_pattern(Nodes,[{Module,Function,Arity,MatchSpec,[]}],[local]); -tpl(Module,Function,Arity,MatchSpec,Opts) when atom(Module) -> +tpl(Module,Function,Arity,MatchSpec,Opts) when is_atom(Module) -> trace_pattern(all,[{Module,Function,Arity,MatchSpec,Opts}],[local]). tpl(Module,Function,Arity,MatchSpec) -> @@ -417,12 +417,12 @@ ctp(Nodes,Module,Function,Arity) -> ctp(Module,Function,Arity) -> trace_pattern(all,[{Module,Function,Arity,false,[only_loaded]}],[global]). -ctp(Nodes,PatternList) when list(PatternList) -> +ctp(Nodes,PatternList) when is_list(PatternList) -> trace_pattern(Nodes, lists:map(fun({M,F,A})->{M,F,A,false,[only_loaded]} end,PatternList), [global]). -ctp(PatternList) when list(PatternList) -> +ctp(PatternList) when is_list(PatternList) -> trace_pattern(all, lists:map(fun({M,F,A})->{M,F,A,false,[only_loaded]} end,PatternList), [global]). @@ -445,12 +445,12 @@ ctpl(Nodes,Module,Function,Arity) -> ctpl(Module,Function,Arity) -> trace_pattern(all,[{Module,Function,Arity,false,[only_loaded]}],[local]). -ctpl(Nodes,PatternList) when list(PatternList) -> +ctpl(Nodes,PatternList) when is_list(PatternList) -> trace_pattern(Nodes, lists:map(fun({M,F,A})->{M,F,A,false,[only_loaded]} end,PatternList), [local]). -ctpl(PatternList) when list(PatternList) -> +ctpl(PatternList) when is_list(PatternList) -> trace_pattern(all, lists:map(fun({M,F,A})->{M,F,A,false,[only_loaded]} end,PatternList), [local]). @@ -485,19 +485,19 @@ trace_pattern(Nodes,Patterns,FlagList) -> %% specifying a certain pid at all nodes. Or an empty TraceConfList for all %% nodes. %% When calling several nodes, the nodes are called in parallel. -tf(Nodes,PidSpec,FlagList) when list(Nodes),list(FlagList) -> +tf(Nodes,PidSpec,FlagList) when is_list(Nodes),is_list(FlagList) -> trace_flags(Nodes,[{PidSpec, FlagList}],true). -tf(Nodes,TraceConfList) when list(Nodes),list(TraceConfList) -> +tf(Nodes,TraceConfList) when is_list(Nodes),is_list(TraceConfList) -> trace_flags(Nodes,TraceConfList,true); -tf(PidSpec,FlagList) when list(FlagList) -> +tf(PidSpec,FlagList) when is_list(FlagList) -> trace_flags(all,[{PidSpec,FlagList}],true). -tf(ArgList) when list(ArgList) -> % This one has triple functionality! +tf(ArgList) when is_list(ArgList) -> % This one has triple functionality! case ArgList of - [{_Process,Flags}|_] when list(Flags),atom(hd(Flags))-> % A call to all nodes. + [{_Process,Flags}|_] when is_list(Flags),is_atom(hd(Flags))-> % A call to all nodes. trace_flags(all,ArgList,true); - [{_Node,TraceConfList}|_] when list(TraceConfList),tuple(hd(TraceConfList)) -> + [{_Node,TraceConfList}|_] when is_list(TraceConfList),is_tuple(hd(TraceConfList)) -> trace_flags(ArgList,true); [{_Node,_TraceConfList,_How}|_] -> trace_flags(ArgList); @@ -517,15 +517,15 @@ tf(ArgList) when list(ArgList) -> % This one has triple functionality %% The functions without a Nodes argument means all nodes, in a non-distributed %% environment it means the local node. %% When calling several nodes, the nodes are called in parallel. -ctf(Nodes,PidSpec,FlagList) when list(Nodes),list(FlagList) -> +ctf(Nodes,PidSpec,FlagList) when is_list(Nodes),is_list(FlagList) -> trace_flags(Nodes,[{PidSpec,FlagList}],false). -ctf(Nodes,TraceConfList) when list(Nodes),list(TraceConfList) -> +ctf(Nodes,TraceConfList) when is_list(Nodes),is_list(TraceConfList) -> trace_flags(Nodes,TraceConfList,false); -ctf(PidSpec,FlagList) when list(FlagList) -> +ctf(PidSpec,FlagList) when is_list(FlagList) -> trace_flags(all,[{PidSpec,FlagList}],false). -ctf(TraceConfList) when list(TraceConfList) -> +ctf(TraceConfList) when is_list(TraceConfList) -> trace_flags(all,TraceConfList,false). %% ----------------------------------------------------------------------------- @@ -668,10 +668,10 @@ init_tpm(Nodes,Mod,Func,Arity,InitFunc,CallFunc,ReturnFunc,RemoveFunc) -> tpm(Mod,Func,Arity,MS) -> tpm(all,Mod,Func,Arity,MS). -tpm(Nodes,Mod,Func,Arity,MS) when integer(Arity) -> +tpm(Nodes,Mod,Func,Arity,MS) when is_integer(Arity) -> gen_server:call(?CONTROLLER, {meta_pattern,Nodes,{tpm,[Mod,Func,Arity,MS]}}); -tpm(Mod,Func,Arity,MS,CallFunc) when integer(Arity) -> +tpm(Mod,Func,Arity,MS,CallFunc) when is_integer(Arity) -> tpm(all,Mod,Func,Arity,MS,CallFunc). tpm(Nodes,Mod,Func,Arity,MS,CallFunc) -> @@ -695,11 +695,11 @@ tpm(Nodes,Mod,Func,Arity,MS,InitFunc,CallFunc,ReturnFunc,RemoveFunc) -> tpm_tracer(Mod,Func,Arity,MS) -> tpm_tracer(all,Mod,Func,Arity,MS). -tpm_tracer(Nodes,Mod,Func,Arity,MS) when integer(Arity) -> +tpm_tracer(Nodes,Mod,Func,Arity,MS) when is_integer(Arity) -> gen_server:call(?CONTROLLER, {meta_pattern,Nodes,{tpm_tracer,[Mod,Func,Arity,MS]}}, ?CALL_TIMEOUT); -tpm_tracer(Mod,Func,Arity,MS,CallFunc) when integer(Arity) -> +tpm_tracer(Mod,Func,Arity,MS,CallFunc) when is_integer(Arity) -> tpm_tracer(all,Mod,Func,Arity,MS,CallFunc). tpm_tracer(Nodes,Mod,Func,Arity,MS,CallFunc) -> @@ -878,7 +878,7 @@ cancel_suspension() -> %% Status=running|{suspended,SReason} %% %% Get Status form all or specified runtime components. -get_status(Nodes) when list(Nodes) -> +get_status(Nodes) when is_list(Nodes) -> gen_server:call(?CONTROLLER,{get_status,Nodes},?CALL_TIMEOUT). get_status() -> @@ -918,7 +918,7 @@ get_tracerdata(Nodes) when is_list(Nodes) -> list_logs() -> gen_server:call(?CONTROLLER,list_logs,?CALL_TIMEOUT). -list_logs(TracerDataOrNodesList) when list(TracerDataOrNodesList) -> +list_logs(TracerDataOrNodesList) when is_list(TracerDataOrNodesList) -> gen_server:call(?CONTROLLER,{list_logs,TracerDataOrNodesList},?CALL_TIMEOUT). %% ------------------------------------------------------------------------------ @@ -960,17 +960,17 @@ list_logs(TracerDataOrNodesList) when list(TracerDataOrNodesList) -> %% Note that the client process using this function will wait until all files %% are moved. The job can be cancelled, causing any already copied files to be %% removed, by simply terminating the waiting client process. -fetch_log(DestDir,Prefix) when list(DestDir),list(Prefix) -> +fetch_log(DestDir,Prefix) when is_list(DestDir),is_list(Prefix) -> gen_server:call(?CONTROLLER,{fetch_log,node(),all,DestDir,Prefix},infinity). -fetch_log(ToNode,DestDir,Prefix) when atom(ToNode),list(DestDir),list(Prefix) -> +fetch_log(ToNode,DestDir,Prefix) when is_atom(ToNode),is_list(DestDir),is_list(Prefix) -> gen_server:call(?CONTROLLER,{fetch_log,ToNode,all,DestDir,Prefix},infinity); -fetch_log(LogSpecList,DestDir,Prefix) when list(LogSpecList),list(DestDir),list(Prefix) -> +fetch_log(LogSpecList,DestDir,Prefix) when is_list(LogSpecList),is_list(DestDir),is_list(Prefix) -> gen_server:call(?CONTROLLER,{fetch_log,node(),LogSpecList,DestDir,Prefix},infinity). fetch_log(ToNode,LogSpecList,DestDir,Prefix) - when atom(ToNode),list(LogSpecList),list(DestDir),list(Prefix) -> + when is_atom(ToNode),is_list(LogSpecList),is_list(DestDir),is_list(Prefix) -> gen_server:call(?CONTROLLER,{fetch_log,ToNode,LogSpecList,DestDir,Prefix},infinity). %% ------------------------------------------------------------------------------ diff --git a/lib/inviso/src/inviso_c.erl b/lib/inviso/src/inviso_c.erl index ecbd5b0778..b1597a7f35 100644 --- a/lib/inviso/src/inviso_c.erl +++ b/lib/inviso/src/inviso_c.erl @@ -100,7 +100,7 @@ init({_Parent,Options}) -> end. %% ------------------------------------------------------------------------------ -handle_call({subscribe,Pid},_From,LD) when pid(Pid) -> +handle_call({subscribe,Pid},_From,LD) when is_pid(Pid) -> MRef=erlang:monitor(process,Pid), {reply,ok,LD#state{subscribers=[{Pid,MRef}|LD#state.subscribers]}}; handle_call({subscribe,Faulty},_From,LD) -> @@ -131,7 +131,7 @@ handle_call({change_options,Nodes,Opts},_From,LD) -> end; handle_call({init_tracing,TracerDataList},_From,LD) -> {reply,adapt_reply(LD,do_init_tracing(TracerDataList,LD)),LD}; -handle_call({init_tracing,Nodes,TracerData},_From,LD) when list(Nodes) -> +handle_call({init_tracing,Nodes,TracerData},_From,LD) when is_list(Nodes) -> TracerDataList= lists:map(fun(N)->{N,TracerData} end,started_trace_nodes(Nodes,LD)), {reply,adapt_reply(LD,do_init_tracing(TracerDataList,LD)),LD}; @@ -173,7 +173,7 @@ handle_call({fetch_log,ToNode,Spec,Dest,Prefix},From,LD) -> end; handle_call({delete_log,NodesOrNodeSpecs},_From,LD) -> {reply,adapt_reply(LD,do_delete_log(NodesOrNodeSpecs,LD)),LD}; -handle_call({delete_log,Nodes,Specs},_From,LD) when list(Nodes) -> +handle_call({delete_log,Nodes,Specs},_From,LD) when is_list(Nodes) -> Reply=do_delete_log(lists:map(fun(N)->{N,Specs} end,Nodes),LD), {reply,adapt_reply(LD,Reply),LD}; handle_call({delete_log,FaultyNodes,_Specs},_From,LD) -> @@ -283,7 +283,7 @@ do_change_option(Nodes,Options,LD) -> do_change_option_2([Node|Tail],Options,LD,Replies) -> case get_node_rec(Node,LD) of - Rec when record(Rec,node) -> + Rec when is_record(Rec,node) -> Answer=?RUNTIME:change_options(Rec#node.pid,Options), do_change_option_2(Tail,Options,LD,[{Node,Answer}|Replies]); Error -> @@ -333,7 +333,7 @@ do_init_tracing_2(What,_LD,_) -> %% Returns {ok,Reply} or {error,Reason}. distribute_tp(all,Patterns,FlagList,LD) -> distribute_tp(started_trace_nodes(all,LD),Patterns,FlagList,LD); -distribute_tp(Nodes,Patterns,FlagList,LD) when list(Nodes) -> +distribute_tp(Nodes,Patterns,FlagList,LD) when is_list(Nodes) -> RTpids=lists:map(fun(N)->case get_node_rec(N,LD) of #node{pid=Pid} -> {Pid,N}; @@ -354,7 +354,7 @@ distribute_tp(Faulty,_,_,_) -> %% Returns {ok,Reply} or {error,Reason}. distribute_tf(all,Args,How,LD) -> distribute_tf(started_trace_nodes(all,LD),Args,How,LD); -distribute_tf(Nodes,Args,How,LD) when list(Nodes) -> +distribute_tf(Nodes,Args,How,LD) when is_list(Nodes) -> RTpids=lists:map(fun(Node)-> case get_node_rec(Node,LD) of #node{pid=Pid} -> @@ -369,7 +369,7 @@ distribute_tf(Faulty,_,_,_) -> {error,{badarg,Faulty}}. %% As above but specific args for each node. -distribute_tf(NodeArgs,How,LD) when list(NodeArgs) -> +distribute_tf(NodeArgs,How,LD) when is_list(NodeArgs) -> RTpidArgs=lists:map(fun({Node,Args})-> case get_node_rec(Node,LD) of #node{pid=Pid} -> @@ -384,7 +384,7 @@ distribute_tf(Faulty,_,_) -> {error,{badarg,Faulty}}. %% As above but both specific args for each node and How (set or remove flag). -distribute_tf(NodeArgHows,LD) when list(NodeArgHows) -> +distribute_tf(NodeArgHows,LD) when is_list(NodeArgHows) -> RTpidArgHows= lists:map(fun({Node,Args,How}) -> case get_node_rec(Node,LD) of @@ -405,7 +405,7 @@ distribute_tf(Faulty,_) -> %% Returns {ok,Reply} or {error,Reason}. distribute_metapattern(all,Args,LD) -> distribute_metapattern(started_trace_nodes(all,LD),Args,LD); -distribute_metapattern(Nodes,Args,LD) when list(Nodes) -> +distribute_metapattern(Nodes,Args,LD) when is_list(Nodes) -> RTpids=lists:map(fun(N)->case get_node_rec(N,LD) of #node{pid=Pid} -> {Pid,N}; @@ -480,7 +480,7 @@ do_cancel_suspension_2(Faulty,_,_) -> %% Return {ok,Reply} or {error,Reason}. do_stop_tracing(all,LD) -> do_stop_tracing(started_trace_nodes(all,LD),LD); -do_stop_tracing(Nodes,LD) when list(Nodes) -> +do_stop_tracing(Nodes,LD) when is_list(Nodes) -> RTpids=lists:map(fun(N)->case get_node_rec(N,LD) of #node{pid=Pid} -> {Pid,N}; @@ -580,7 +580,7 @@ do_list_logs_2(Other,_LD,_Replies) -> %% proper strings. do_fetch_log(ToNode,all,Dest,Prefix,From,LD) -> do_fetch_log(ToNode,started_trace_nodes(all,LD),Dest,Prefix,From,LD); -do_fetch_log(ToNode,Specs,Dest,Prefix,From,LD) when list(Dest),list(Prefix) -> +do_fetch_log(ToNode,Specs,Dest,Prefix,From,LD) when is_list(Dest),is_list(Prefix) -> CollectPid=spawn_link(ToNode,?MODULE,log_rec_init,[self(),Dest,Prefix,From]), do_fetch_log_2(Specs,LD,CollectPid,[],[]); do_fetch_log(_ToNode,_Specs,Dest,Prefix,From,_LD) -> @@ -639,7 +639,7 @@ do_delete_log(NodeSpecs,LD) -> LD,[]); false -> if - list(NodeSpecs),list(hd(NodeSpecs)) -> % A list of files. + is_list(NodeSpecs),is_list(hd(NodeSpecs)) -> % A list of files. do_delete_log_2(lists:map(fun(N)->{N,NodeSpecs} end, started_trace_nodes(all,LD)), LD,[]); @@ -785,9 +785,9 @@ check_options(Options, Context) -> check_options_2([],_Context,Result) -> {ok,Result}; -check_options_2([{subscribe,Pid}|OptionsTail],start,Result) when pid(Pid) -> +check_options_2([{subscribe,Pid}|OptionsTail],start,Result) when is_pid(Pid) -> check_options_2(OptionsTail,start,[{subscribe,Pid}|Result]); -check_options_2([{unsubscribe,Pid}|OptionsTail],start,Result) when pid(Pid) -> +check_options_2([{unsubscribe,Pid}|OptionsTail],start,Result) when is_pid(Pid) -> check_options_2(OptionsTail,start,[{unsubscribe,Pid}|Result]); check_options_2([{dependency,How}|OptionsTail],Context,Result) -> check_options_2(OptionsTail,Context,[{dependency,How}|Result]); @@ -819,12 +819,12 @@ initiate_state(Options) -> LD1#state{distributed=true} end. -initiate_state_2([{subscribe,Proc}|Tail],LD) when pid(Proc);atom(Proc)-> +initiate_state_2([{subscribe,Proc}|Tail],LD) when is_pid(Proc);is_atom(Proc)-> MRef=erlang:monitor(process,Proc), initiate_state_2(Tail,LD#state{subscribers=[{Proc,MRef}|LD#state.subscribers]}); -initiate_state_2([Opt|Tail],LD) when tuple(Opt),size(Opt)>=1 -> +initiate_state_2([Opt|Tail],LD) when is_tuple(Opt),size(Opt)>=1 -> initiate_state_2(Tail,initiate_state_3(element(1,Opt),Opt,LD)); -initiate_state_2([Opt|Tail],LD) when atom(Opt) -> +initiate_state_2([Opt|Tail],LD) when is_atom(Opt) -> initiate_state_2(Tail,initiate_state_3(Opt,Opt,LD)); initiate_state_2([_|Tail],LD) -> initiate_state_2(Tail,LD); @@ -853,9 +853,9 @@ initiate_state_is_rt_option(_) -> false. %% or more values associated with the Parameter, or just an atom. merge_options([], Options) -> Options; -merge_options([T|DefaultTail],Options) when tuple(T),size(T)>=1 -> +merge_options([T|DefaultTail],Options) when is_tuple(T),size(T)>=1 -> merge_options(DefaultTail,merge_options_2(element(1,T),T,Options)); -merge_options([Param|DefaultTail],Options) when atom(Param) -> +merge_options([Param|DefaultTail],Options) when is_atom(Param) -> merge_options(DefaultTail,merge_options_2(Param,Param,Options)); merge_options([_|DefaultTail],Options) -> % Strange, bad default option! merge_options(DefaultTail,Options). @@ -868,7 +868,7 @@ merge_options_2(Param,Opt,Options) -> [Opt|Options] end. -merge_options_find(Param,[T|_]) when tuple(T),element(1,T)==Param -> +merge_options_find(Param,[T|_]) when is_tuple(T),element(1,T)==Param -> true; merge_options_find(Param,[Param|_]) -> true; @@ -883,7 +883,7 @@ merge_options_find(_,[]) -> %% It also checks the formatting of the tracerdata since runtime components %% does not accept too badly formatted tracerdata. %% Returns {ok,NewTraceData} or {error,Reason}. -check_modify_tracerdata(TracerData,LoopData) when list(TracerData) -> +check_modify_tracerdata(TracerData,LoopData) when is_list(TracerData) -> case lists:keysearch(trace,1,TracerData) of {value,{_,TraceTD}} -> % Examine the trace part. case check_modify_tracerdata(TraceTD,LoopData) of @@ -908,7 +908,7 @@ check_modify_tracerdata({relayer,Collector},LoopData) when is_atom(Collector) -> end; check_modify_tracerdata({Type,Data},_LoopData) when Type==ip;Type==file -> {ok,{Type,Data}}; -check_modify_tracerdata({Handler,Data},_LoopData) when function(Handler) -> +check_modify_tracerdata({Handler,Data},_LoopData) when is_function(Handler) -> {ok,{Handler,Data}}; check_modify_tracerdata(Data,_LoopData) -> {error,{bad_tracerdata,Data}}. @@ -999,7 +999,7 @@ set_node_rec_2(Rec,[NodeRec|Tail]) -> %% Help function finding a node record for Node in a list of #node or in loopdata. %% Returns the #node in question or {error,not_an_added_node}. -get_node_rec(Node,NodeList) when list(NodeList) -> +get_node_rec(Node,NodeList) when is_list(NodeList) -> get_node_rec_2(Node,NodeList); get_node_rec(Node,#state{nodes=NodeList}) -> get_node_rec_2(Node,NodeList). @@ -1016,7 +1016,7 @@ get_node_rec_2(Node,[_NodeRec|Tail]) -> %% structure. Returns a new list of #node or a new loopdata structure. delete_node_rec(Node,LD=#state{nodes=NodeList}) -> LD#state{nodes=delete_node_rec_2(Node,NodeList)}; -delete_node_rec(Node,NodeList) when list(NodeList) -> +delete_node_rec(Node,NodeList) when is_list(NodeList) -> delete_node_rec_2(Node,NodeList). delete_node_rec_2(_,[]) -> @@ -1059,7 +1059,7 @@ log_rec_init(Parent,Dest,Prefix,From={ClientPid,_}) -> Fetchers), CMRef=erlang:monitor(process,ClientPid), % Monitor the client. case log_rec_loop(Dest,Prefix,RTs,InitialReplies,CMRef) of - Reply when list(Reply) -> % It is an ok value. + Reply when is_list(Reply) -> % It is an ok value. gen_server:reply(From,{ok,Reply}); {error,Reason} -> gen_server:reply(From,{error,Reason}); diff --git a/lib/inviso/src/inviso_lfm.erl b/lib/inviso/src/inviso_lfm.erl index 362176c776..085048518c 100644 --- a/lib/inviso/src/inviso_lfm.erl +++ b/lib/inviso/src/inviso_lfm.erl @@ -87,13 +87,13 @@ %% close the outfile. %% %% Using merge/2 assumes you want to use default handlers writing to a file. -merge(Files,OutputFile) when list(OutputFile) -> +merge(Files,OutputFile) when is_list(OutputFile) -> merge(Files,fun outfile_opener/1,fun outfile_writer/4,fun outfile_closer/1,OutputFile,off). -merge(Files,WorkHandlerFun,HandlerData) when function(WorkHandlerFun) -> +merge(Files,WorkHandlerFun,HandlerData) when is_function(WorkHandlerFun) -> merge(Files,void,WorkHandlerFun,void,HandlerData,off); -merge(Files,OutputFile,Dbg) when list(OutputFile) -> +merge(Files,OutputFile,Dbg) when is_list(OutputFile) -> merge(Files,fun outfile_opener/1,fun outfile_writer/4,fun outfile_closer/1,OutputFile,Dbg). -merge(Files,WorkHandlerFun,HandlerData,Dbg) when function(WorkHandlerFun) -> +merge(Files,WorkHandlerFun,HandlerData,Dbg) when is_function(WorkHandlerFun) -> merge(Files,void,WorkHandlerFun,void,HandlerData,Dbg). merge(Files,BeginHandlerFun,WorkHandlerFun,EndHandlerFun,HandlerData) -> merge(Files,BeginHandlerFun,WorkHandlerFun,EndHandlerFun,HandlerData,off). @@ -123,7 +123,7 @@ init_receiver(From,Files,BeginHandlerFun,WorkHandlerFun,EndHandlerFun,HandlerDat {ok,Readers} -> process_flag(trap_exit,true), if - function(BeginHandlerFun) -> + is_function(BeginHandlerFun) -> case catch BeginHandlerFun(HandlerData) of {ok,NewHandlerData} -> init_receiver_2(From,WorkHandlerFun,EndHandlerFun, @@ -145,7 +145,7 @@ init_receiver_2(From,WorkHandlerFun,EndHandlerFun,HandlerData,Dbg,Readers) -> {Reply,NewHandlerData}= loop(From,WorkHandlerFun,HandlerData,NewReaders,EntryStruct,Dbg,0), if - function(EndHandlerFun) -> + is_function(EndHandlerFun) -> case EndHandlerFun(NewHandlerData) of ok -> From ! {reply,self(),Reply}; @@ -207,7 +207,7 @@ find_oldest_entry(EntryStruct) -> case list_all_entries(EntryStruct) of [] -> % The we are done! done; - EntryList when list(EntryList) -> % Find smallest timestamp in here then. + EntryList when is_list(EntryList) -> % Find smallest timestamp in here then. {Pid,Node,PidMappings,_TS,Term}= lists:foldl(fun({P,N,PMap,TS1,T},{_P,_N,_PMap,TS0,_T}) when TS1 {P,N,PMap,TS1,T}; diff --git a/lib/inviso/src/inviso_lfm_tpfreader.erl b/lib/inviso/src/inviso_lfm_tpfreader.erl index d0db4b6d02..6de4d11fe0 100644 --- a/lib/inviso/src/inviso_lfm_tpfreader.erl +++ b/lib/inviso/src/inviso_lfm_tpfreader.erl @@ -60,9 +60,9 @@ %% File=string() %% Spawn on this function to start a reader process for trace-port generated %% logfiles, possibly with inviso-generated ti-files. -init(RecPid,LogFiles=[Tuple|_]) when tuple(Tuple) -> % Only one LogFiles. +init(RecPid,LogFiles=[Tuple|_]) when is_tuple(Tuple) -> % Only one LogFiles. init(RecPid,[LogFiles]); -init(RecPid,FileStruct) when list(FileStruct) -> +init(RecPid,FileStruct) when is_list(FileStruct) -> logfiles_loop(RecPid,FileStruct). %% ----------------------------------------------------------------------------- @@ -135,7 +135,7 @@ read_traceport_file(FileName,FD) -> case file:read(FD,5) of % Trace-port file entries start with 5 bytes. {ok,<<0,Size:32>>} -> % Each entry in a traceport file begins. case file:read(FD,Size) of - {ok,Bin} when binary(Bin),size(Bin)=:=Size -> + {ok,Bin} when is_binary(Bin),size(Bin)=:=Size -> try binary_to_term(Bin) of Term -> % Bin was a properly formatted term! {ok,Term} @@ -244,7 +244,7 @@ find_timestamp_in_term(_) -> % Don't know if there is a timestamp %% (1) plain straight raw binary files. handle_ti_file(FileStruct) -> case lists:keysearch(ti_log,1,FileStruct) of - {value,{_,[FileName]}} when list(FileName) -> % There is one ti-file in this set. + {value,{_,[FileName]}} when is_list(FileName) -> % There is one ti-file in this set. case file:open(FileName,[read,raw,binary]) of {ok,FD} -> TIdAlias=ets:new(list_to_atom("inviso_ti_atab_"++pid_to_list(self())), @@ -308,9 +308,9 @@ handle_ti_file_2(FD,TIdAlias,TIdUnalias) -> handle_logfiles(FileStruct) -> handle_logfiles_2(lists:keysearch(trace_log,1,FileStruct)). -handle_logfiles_2({value,{_,[FileName]}}) when list(FileName)-> % One single plain file. +handle_logfiles_2({value,{_,[FileName]}}) when is_list(FileName)-> % One single plain file. [FileName]; -handle_logfiles_2({value,{_,Files}}) when list(Files) -> % A wrap-set. +handle_logfiles_2({value,{_,Files}}) when is_list(Files) -> % A wrap-set. handle_logfile_sort_wrapset(Files); handle_logfiles_2(_) -> []. % Pretend there were no files otherwise. diff --git a/lib/inviso/src/inviso_tool.erl b/lib/inviso/src/inviso_tool.erl index 7126ba4387..05158f58fe 100644 --- a/lib/inviso/src/inviso_tool.erl +++ b/lib/inviso/src/inviso_tool.erl @@ -267,9 +267,9 @@ stop(UntouchedNodes) -> %% tracing. reconnect_nodes() -> gen_server:call(?MODULE,{reconnect_nodes,local_runtime},?CALL_TIMEOUT). -reconnect_nodes(Node) when atom(Node) -> +reconnect_nodes(Node) when is_atom(Node) -> reconnect_nodes([Node]); -reconnect_nodes(Nodes) when list(Nodes) -> +reconnect_nodes(Nodes) when is_list(Nodes) -> gen_server:call(?MODULE,{reconnect_nodes,Nodes},?CALL_TIMEOUT). %% ----------------------------------------------------------------------------- @@ -572,7 +572,7 @@ reactivator_reply(TPid,Counter) -> init(Config) -> case fetch_configuration(Config) of % From conf-file and Config. - {ok,LD} when record(LD,ld) -> + {ok,LD} when is_record(LD,ld) -> case start_inviso_at_c_node(LD) of {ok,CPid} -> LD2=start_runtime_components(LD), @@ -650,7 +650,7 @@ start_runtime_components_2([],_,LD) -> start_runtime_components_mk_opts(Node,{M,F,Args}) -> case catch apply(M,F,[Node|Args]) of - {ok,Opts} when list(Opts) -> + {ok,Opts} when is_list(Opts) -> start_runtime_component_mk_opts_add_dependency(Opts); _ -> [?DEFAULT_DEPENDENCY] @@ -698,7 +698,7 @@ handle_call({reconnect_nodes,Nodes},_From,LD) -> {reply, build_reconnect_nodes_reply(Nodes,Nodes2,NodesErr,NewLD#ld.nodes), NewLD}; - list(Nodes) -> + is_list(Nodes) -> {reply, {ok,build_reconnect_nodes_reply(Nodes,Nodes2,NodesErr,NewLD#ld.nodes)}, NewLD} @@ -711,7 +711,7 @@ handle_call({start_session,MoreTDGargs},_From,LD=#ld{session_state=SState}) -> case is_tracing(SState) of false -> % No session running. if - list(MoreTDGargs) -> + is_list(MoreTDGargs) -> DateTime=calendar:universal_time(), {M,F,Args}=LD#ld.tdg, TDGargs=inviso_tool_lib:mk_tdg_args(DateTime,MoreTDGargs++Args), @@ -757,15 +757,15 @@ handle_call({reinitiate_session,Nodes},_From,LD=#ld{session_state=SState}) -> end; handle_call({restore_session,{FileName,MoreTDGargs}},_From,LD=#ld{chl=OldCHL}) - when list(MoreTDGargs) -> + when is_list(MoreTDGargs) -> case is_tracing(LD#ld.session_state) of false -> case catch make_absolute_path(FileName,LD#ld.dir) of - AbsFileName when list(AbsFileName) -> + AbsFileName when is_list(AbsFileName) -> case file:read_file(AbsFileName) of {ok,Bin} -> if - list(MoreTDGargs) -> + is_list(MoreTDGargs) -> case catch replace_history_chl(OldCHL, binary_to_term(Bin)) of {ok,CHL} -> % The file was well formatted. @@ -803,7 +803,7 @@ handle_call({restore_session,MoreTDGargs},_From,LD=#ld{chl=CHL}) -> case history_exists_chl(CHL) of true -> % There is a history to redo. if - list(MoreTDGargs) -> + is_list(MoreTDGargs) -> case h_restore_session(MoreTDGargs,LD) of {ok,{SessionNr,ReturnVal,NewLD}} -> {reply, @@ -879,7 +879,7 @@ handle_call({sync_atc,{TC,Id,Vars,TimeOut}},_From,LD=#ld{session_state=SState}) case is_tracing(SState) of true -> if - integer(TimeOut);TimeOut==infinity -> + is_integer(TimeOut);TimeOut==infinity -> case h_sync_atc(TC,Id,Vars,TimeOut,LD) of {ok,NewLD,Result} -> {reply,Result,NewLD}; @@ -897,7 +897,7 @@ handle_call({sync_rtc,{TC,Vars,TimeOut}},_From,LD=#ld{session_state=SState}) -> case is_tracing(SState) of true -> if - integer(TimeOut);TimeOut==infinity -> + is_integer(TimeOut);TimeOut==infinity -> case h_sync_rtc(TC,Vars,TimeOut,LD) of {ok,NewLD,Result} -> {reply,Result,NewLD}; @@ -929,7 +929,7 @@ handle_call({sync_dtc,{TC,Id,TimeOut}},_From,LD=#ld{session_state=SState}) -> case is_tracing(SState) of % Check that we are tracing now. true -> if - integer(TimeOut);TimeOut==infinity -> + is_integer(TimeOut);TimeOut==infinity -> case h_sync_dtc(TC,Id,TimeOut,LD) of {ok,NewLD,Result} -> {reply,Result,NewLD}; @@ -947,7 +947,7 @@ handle_call({inviso,{Cmd,Args}},_From,LD=#ld{session_state=SState}) -> case is_tracing(SState) of true -> if - list(Args) -> + is_list(Args) -> case h_inviso(Cmd,Args,LD) of {ok,{Reply,NewLD}} -> {reply,Reply,NewLD}; @@ -1156,7 +1156,7 @@ h_reconnect_nodes(local_runtime,LD=#ld{nodes=NodesD}) -> % Non-distributed. _ -> % Allready connected! {ok,{[],{error,already_connected},LD}} end; -h_reconnect_nodes(Nodes,LD=#ld{nodes=NodesD}) when list(Nodes) -> +h_reconnect_nodes(Nodes,LD=#ld{nodes=NodesD}) when is_list(Nodes) -> {Nodes2,NodesErr}= lists:foldl(fun(N,{Nodes2,NodesErr})-> case get_state_nodes(N,NodesD) of @@ -1246,7 +1246,7 @@ h_start_session_ctp_all_2([],Errors,Nodes) -> %% Help function doing the actual init_tracing. h_start_session_2(undefined,TracerData,_Errors) -> % Non distributed case. case inviso:init_tracing(TracerData) of - {ok,LogResult} when list(LogResult) -> + {ok,LogResult} when is_list(LogResult) -> {ok,{ok,LogResult}}; {error,already_initated} -> % Perhaps adopted!? {ok,{error,already_initiated}}; % Not necessarily wrong. @@ -1360,7 +1360,7 @@ h_reinitiate_session_2(local_runtime,NodesD,undefined) -> % Non distributed case _ -> {ok,{[],{error,already_in_session}}} end; -h_reinitiate_session_2(Nodes,NodesD,CNode) when list(Nodes) -> +h_reinitiate_session_2(Nodes,NodesD,CNode) when is_list(Nodes) -> {ok,lists:foldl(fun(N,{Nodes2,NodesErr})-> case get_state_nodes(N,NodesD) of {inactive,running} -> % Only ok case. @@ -1515,7 +1515,7 @@ h_atc(TC,Id,Vars,LD=#ld{c_node=CNode,tc_dict=TCdict,chl=CHL},Nodes) -> case check_bindings(Vars,TraceCase) of {ok,Bindings} -> % Necessary vars exists in Vars. if - list(Nodes) -> % Nodes predefined. + is_list(Nodes) -> % Nodes predefined. h_atc_2(TC,Id,CNode,CHL,LD,TraceCase,Bindings,Nodes); true -> % Use all tracing and running nodes. Nodes1=get_nodenames_running_nodes(LD#ld.nodes), @@ -1769,13 +1769,13 @@ h_reactivate(Node,CNode) -> h_save_history(HDir,Dir,FileName,SortedLog) -> Dir0= if - list(HDir) -> % There is a history dir specified. + is_list(HDir) -> % There is a history dir specified. HDir; % Use it then. true -> Dir % Else use the tool dir. end, case catch make_absolute_path(FileName,Dir0) of - AbsFileName when list(AbsFileName) -> + AbsFileName when is_list(AbsFileName) -> Log2=build_saved_history_data(SortedLog), % Remove stopped tracecases. case file:write_file(AbsFileName,term_to_binary(Log2)) of ok -> @@ -1801,7 +1801,7 @@ h_get_autostart_data(local_runtime,_,Dependency,ASD,M,F,TDGargs,OptsG) -> Opts=[Dependency|lists:keydelete(dependency,1,Opts0)], {ok,{ASD,{ok,{Opts,{tdg,{M,F,CompleteTDGargs}}}}}}; -h_get_autostart_data(Nodes,CNode,Dependency,ASD,M,F,TDGargs,OptsG) when list(Nodes) -> +h_get_autostart_data(Nodes,CNode,Dependency,ASD,M,F,TDGargs,OptsG) when is_list(Nodes) -> {ok,{ASD,h_get_autostart_data_2(Nodes,CNode,Dependency,M,F,TDGargs,OptsG)}}; h_get_autostart_data(Nodes,_CNode,_Dependency,_ASD,_M,_F,_TDGargs,_OptsG) -> {error,{badarg,Nodes}}. @@ -2144,14 +2144,14 @@ expand_module_regexps(Args,_RegExpNode,_Nodes,false) -> {ok,Args}; expand_module_regexps([PatternList],RegExpNode,Nodes,{tp,1,1}) -> case catch expand_module_regexps_tp(PatternList,RegExpNode,Nodes) of - NewPatternList when list(NewPatternList) -> + NewPatternList when is_list(NewPatternList) -> {ok,[NewPatternList]}; {error,Reason} -> {error,Reason} end; expand_module_regexps([PatternList],RegExpNode,Nodes,{ctp,1,1}) -> case catch expand_module_regexps_ctp(PatternList,RegExpNode,Nodes) of - NewPatternList when list(NewPatternList) -> + NewPatternList when is_list(NewPatternList) -> {ok,[NewPatternList]}; {error,Reason} -> {error,Reason} @@ -2164,9 +2164,9 @@ expand_module_regexps([M,F,Arity],RegExpNode,Nodes,{ctp,3,1}) -> expand_module_regexps([[{M,F,Arity}]],RegExpNode,Nodes,{ctp,1,1}). -expand_module_regexps_tp([E={M,_,_,_,_}|Rest],RegExpNode,Nodes) when atom(M) -> +expand_module_regexps_tp([E={M,_,_,_,_}|Rest],RegExpNode,Nodes) when is_atom(M) -> [E|expand_module_regexps_tp(Rest,RegExpNode,Nodes)]; -expand_module_regexps_tp([{M,F,Arity,MS,Opts}|Rest],RegExpNode,Nodes) when list(M);tuple(M) -> +expand_module_regexps_tp([{M,F,Arity,MS,Opts}|Rest],RegExpNode,Nodes) when is_list(M);is_tuple(M) -> case inviso_tool_lib:expand_module_names([RegExpNode], M, [{expand_only_at,RegExpNode}]) of @@ -2193,9 +2193,9 @@ expand_module_regexps_tp_2([M|MRest],F,Arity,MS,Opts,Rest,RegExpNode,Nodes) -> expand_module_regexps_tp_2([],_,_,_,_,Rest,RegExpNode,Nodes) -> expand_module_regexps_tp(Rest,RegExpNode,Nodes). -expand_module_regexps_ctp([E={M,_,_}|Rest],RegExpNode,Nodes) when atom(M) -> +expand_module_regexps_ctp([E={M,_,_}|Rest],RegExpNode,Nodes) when is_atom(M) -> [E|expand_module_regexps_ctp(Rest,RegExpNode,Nodes)]; -expand_module_regexps_ctp([{M,F,Arity}|Rest],RegExpNode,Nodes) when list(M);tuple(M) -> +expand_module_regexps_ctp([{M,F,Arity}|Rest],RegExpNode,Nodes) when is_list(M);is_tuple(M) -> case inviso_tool_lib:expand_module_names([RegExpNode], M, [{expand_only_at,RegExpNode}]) of @@ -2450,7 +2450,7 @@ fetch_configuration(Config) -> %% Returns {ok,FileName} or 'false'. The latter if no name could be determined. fetch_config_filename(Config) -> case catch lists:keysearch(config_file,1,Config) of - {value,{_,FName}} when list(FName) -> + {value,{_,FName}} when is_list(FName) -> {ok,FName}; _ -> % No filename in the start argument. fetch_config_filename_2() @@ -2458,7 +2458,7 @@ fetch_config_filename(Config) -> fetch_config_filename_2() -> case application:get_env(inviso_tool_config_file) of - {ok,FName} when list(FName) -> + {ok,FName} when is_list(FName) -> {ok,FName}; _ -> % Application parameter not specified. false % Means no config file will be used. @@ -2499,14 +2499,14 @@ read_config_list_2(LD,Terms,Tag) -> %% Function updating a named field in a record. Returns a new record. Note that %% this function must be maintained due the fact that field names are removed %% at compile time. -update_ld_record(LD,nodes,Value) when record(LD,ld) -> +update_ld_record(LD,nodes,Value) when is_record(LD,ld) -> case mk_nodes(Value) of {ok,NodesD} -> LD#ld{nodes=NodesD}; error -> LD end; -update_ld_record(LD,Tag,Value) when record(LD,ld) -> +update_ld_record(LD,Tag,Value) when is_record(LD,ld) -> Index= case Tag of c_node -> % atom() @@ -2546,7 +2546,7 @@ update_ld_record(LD,Tag,Value) when record(LD,ld) -> %% ActivationFileName=DeactivationFileName=string() read_trace_case_definitions(LD) -> case LD#ld.tc_def_file of - TCfileName when list(TCfileName) -> + TCfileName when is_list(TCfileName) -> case catch file:consult(TCfileName) of {ok,Terms} -> Dir=LD#ld.dir, % The working directory of the tool. @@ -2636,8 +2636,8 @@ get_status(CNode,Nodes) -> %% We can end up here if a session is stopped with this node suspended. %% Returns a nodes database structure filled with the nodes Nodes. -mk_nodes(Nodes) when list(Nodes) -> - {ok,lists:map(fun(N) when atom(N)->{N,down} end,Nodes)}; +mk_nodes(Nodes) when is_list(Nodes) -> + {ok,lists:map(fun(N) when is_atom(N)->{N,down} end,Nodes)}; mk_nodes(local_runtime) -> % The non-distributed case. down; mk_nodes(_Nodes) -> @@ -2783,7 +2783,7 @@ set_suspended_nodes(_,{up,{State,_}}) -> %% This function is called when reactivation is completed. Hence it moves the %% node to no longer suspended. Note this can mean that the node is either %% tracing or inactive. Reactivation is not allowed for a node have trace_failure. -set_running_nodes(Node,NodesD) when list(NodesD) -> +set_running_nodes(Node,NodesD) when is_list(NodesD) -> case lists:keysearch(Node,1,NodesD) of {value,{_,AvailableStatus}} -> lists:keyreplace(Node,1,NodesD,{Node,set_running_nodes_2(AvailableStatus)}); @@ -2902,7 +2902,7 @@ get_available_nodes([]) -> %% suspended or not. %% Returns {State,Status} | reactivating | down %% where -get_state_nodes(Node,NodesD) when list(NodesD) -> +get_state_nodes(Node,NodesD) when is_list(NodesD) -> case lists:keysearch(Node,1,NodesD) of {value,{_,AvailableStatus}} -> get_state_nodes_2(AvailableStatus); diff --git a/lib/inviso/src/inviso_tool_lib.erl b/lib/inviso/src/inviso_tool_lib.erl index 20a8b509ae..7953acedd6 100644 --- a/lib/inviso/src/inviso_tool_lib.erl +++ b/lib/inviso/src/inviso_tool_lib.erl @@ -83,7 +83,7 @@ inviso_cmd(NodeName,Func,Args) -> %% In the non-distributed case the singlenode_expansion will be returned. expand_module_names(_Nodes,Mod={_,'_'},_) -> {error,{faulty_regexp_combination,Mod}}; -expand_module_names(Nodes,{DirStr,ModStr},Opts) when list(DirStr), list(ModStr) -> +expand_module_names(Nodes,{DirStr,ModStr},Opts) when is_list(DirStr), is_list(ModStr) -> case expand_module_names_special_regexp(DirStr) of {ok,NewDirStr} -> case expand_module_names_special_regexp(ModStr) of @@ -97,11 +97,11 @@ expand_module_names(Nodes,{DirStr,ModStr},Opts) when list(DirStr), list(ModStr) end; expand_module_names(_,'_',_Opts) -> % If we want to trace all modules wildcard; % we shall not expand it. -expand_module_names(_Nodes,Mod,_Opts) when atom(Mod) -> +expand_module_names(_Nodes,Mod,_Opts) when is_atom(Mod) -> module; % If it is an atom, no expansion. expand_module_names(Nodes,"*",Opts) -> % Treat this as a reg.exp. expand_module_names(Nodes,".*",Opts); -expand_module_names(Nodes,ModStr,Opts) when list(ModStr) -> +expand_module_names(Nodes,ModStr,Opts) when is_list(ModStr) -> case expand_module_names_special_regexp(ModStr) of {ok,NewModStr} -> expand_module_names_2(Nodes,NewModStr,Opts); @@ -115,7 +115,7 @@ expand_module_names_2(Nodes,ModStr,Opts) -> case get_expand_regexp_at_opts(Opts) of {ok,Node} -> % Expansion only at this node. case inviso_rt_lib:expand_regexp([Node],ModStr,Opts) of - [{Node,Modules}] when list(Modules) -> + [{Node,Modules}] when is_list(Modules) -> {singlenode_expansion,Modules}; [{Node,_}] -> % Most likely badrpc. {error,{faulty_node,Node}} @@ -130,7 +130,7 @@ expand_module_names_2(Nodes,DirStr,ModStr,Opts) -> case get_expand_regexp_at_opts(Opts) of {ok,Node} -> % Expansion only at this node. case inviso_rt_lib:expand_regexp([Node],DirStr,ModStr,Opts) of - [{Node,Modules}] when list(Modules) -> + [{Node,Modules}] when is_list(Modules) -> {singlenode_expansion,Modules}; [{Node,_}] -> % Most likely badrpc. {error,{faulty_node,Node}} @@ -186,12 +186,12 @@ make_patterns(Catches,Opts,Dbg,NodeModsOrMods,F,A,MS) -> make_patterns_2(Catches,OwnArg,Dbg,NodeModsOrMods,F,A,MS) end. -make_patterns_2(Catches,OwnArg,Dbg,[{Node,Mods}|Rest],F,A,MS) when list(Mods) -> +make_patterns_2(Catches,OwnArg,Dbg,[{Node,Mods}|Rest],F,A,MS) when is_list(Mods) -> TPs=make_patterns_3(Catches,OwnArg,Dbg,Mods,F,A,MS,[]), [{Node,join_patterns(TPs)}|make_patterns_2(Catches,OwnArg,Dbg,Rest,F,A,MS)]; make_patterns_2(Catches,OwnArg,Dbg,[{_Node,_}|Rest],F,A,MS) -> % badrpc!? make_patterns_2(Catches,OwnArg,Dbg,Rest,F,A,MS); -make_patterns_2(Catches,OwnArg,Dbg,Modules,F,A,MS) when list(Modules) -> +make_patterns_2(Catches,OwnArg,Dbg,Modules,F,A,MS) when is_list(Modules) -> TPs=make_patterns_3(Catches,OwnArg,Dbg,Modules,F,A,MS,[]), join_patterns(TPs); make_patterns_2(_,_,_,[],_,_,_) -> @@ -330,7 +330,7 @@ get_datetime_from_tdg_args([DateTime|_]) -> %% Returns a list. get_ownarg_opts(Opts) -> case lists:keysearch(arg,1,Opts) of - {value,{_,OwnArg}} when list(OwnArg) -> + {value,{_,OwnArg}} when is_list(OwnArg) -> OwnArg; {value,{_,OwnArg}} -> [OwnArg]; @@ -350,7 +350,7 @@ get_disable_safety_opts(Opts) -> get_expand_regexp_at_opts(Opts) -> case lists:keysearch(expand_only_at,1,Opts) of - {value,{_,Node}} when atom(Node) -> + {value,{_,Node}} when is_atom(Node) -> {ok,Node}; _ -> false -- cgit v1.2.3