diff options
author | Stavros Aronis <aronisstav@gmail.com> | 2012-02-17 18:12:58 +0100 |
---|---|---|
committer | Henrik Nord <henrik@erlang.org> | 2012-05-21 15:31:18 +0200 |
commit | 15529b1392c3c3d452dcae3ce6786ff41fda9f13 (patch) | |
tree | 70e44de3692d7a466c3157dc4e5e3822e0a253f7 /lib/dialyzer/src | |
parent | 0448c64be671017a6ef25e9122f493f433e60811 (diff) | |
download | otp-15529b1392c3c3d452dcae3ce6786ff41fda9f13.tar.gz otp-15529b1392c3c3d452dcae3ce6786ff41fda9f13.tar.bz2 otp-15529b1392c3c3d452dcae3ce6786ff41fda9f13.zip |
Generalize coordinator and worker
Diffstat (limited to 'lib/dialyzer/src')
-rw-r--r-- | lib/dialyzer/src/Makefile | 4 | ||||
-rw-r--r-- | lib/dialyzer/src/dialyzer_coordinator.erl (renamed from lib/dialyzer/src/dialyzer_typesig_coordinator.erl) | 12 | ||||
-rw-r--r-- | lib/dialyzer/src/dialyzer_succ_typings.erl | 8 | ||||
-rw-r--r-- | lib/dialyzer/src/dialyzer_worker.erl (renamed from lib/dialyzer/src/dialyzer_typesig_worker.erl) | 8 |
4 files changed, 16 insertions, 16 deletions
diff --git a/lib/dialyzer/src/Makefile b/lib/dialyzer/src/Makefile index 2f1eaf5754..39b1b3eb3e 100644 --- a/lib/dialyzer/src/Makefile +++ b/lib/dialyzer/src/Makefile @@ -64,8 +64,8 @@ MODULES = \ dialyzer_races \ dialyzer_succ_typings \ dialyzer_typesig \ - dialyzer_typesig_coordinator \ - dialyzer_typesig_worker \ + dialyzer_coordinator \ + dialyzer_worker \ dialyzer_utils HRL_FILES= dialyzer.hrl dialyzer_gui_wx.hrl diff --git a/lib/dialyzer/src/dialyzer_typesig_coordinator.erl b/lib/dialyzer/src/dialyzer_coordinator.erl index 9475bc6895..a72d383365 100644 --- a/lib/dialyzer/src/dialyzer_typesig_coordinator.erl +++ b/lib/dialyzer/src/dialyzer_coordinator.erl @@ -19,7 +19,7 @@ %% %%%------------------------------------------------------------------- -%%% File : dialyzer_typesig_coordinator.erl +%%% File : dialyzer_coordinator.erl %%% Authors : Stavros Aronis <aronisstav@gmail.com> %%% %%% Description: @@ -32,8 +32,8 @@ %%% %%% - The original Dialyzer backend (in succ_typings module) %%% - The worker process for the typesig analysis (in typesig and -%%% typesig_worker) -%%% - A coordinator of the worker processes (in typesig_coordinator) +%%% worker) +%%% - A coordinator of the worker processes (in coordinator) %%% %%% Operation guidelines: %%% @@ -44,7 +44,7 @@ %%% %%%------------------------------------------------------------------- --module(dialyzer_typesig_coordinator). +-module(dialyzer_coordinator). -export([ all_spawned/1, @@ -98,7 +98,7 @@ scc_to_pids_request_handle(Worker, SCCs, SCCtoPID) -> Worker ! {sccs_to_pids, Pids}, ok. --spec sccs_to_pids_reply() -> [dialyzer_typesig_worker:worker()]. +-spec sccs_to_pids_reply() -> [dialyzer_worker:worker()]. sccs_to_pids_reply() -> receive {sccs_to_pids, Pids} -> Pids end. @@ -179,7 +179,7 @@ handle_cast({scc_spawn, SCC}, spawn_count = SpawnCount, scc_to_pid = SCCtoPID } = State) -> - Pid = dialyzer_typesig_worker:launch(SCC, Servers), + Pid = dialyzer_worker:launch(SCC, Servers), {noreply, State#state{spawn_count = SpawnCount + 1, scc_to_pid = store_map(SCC, Pid, SCCtoPID)} diff --git a/lib/dialyzer/src/dialyzer_succ_typings.erl b/lib/dialyzer/src/dialyzer_succ_typings.erl index 76b6d8954b..237adb36ea 100644 --- a/lib/dialyzer/src/dialyzer_succ_typings.erl +++ b/lib/dialyzer/src/dialyzer_succ_typings.erl @@ -303,18 +303,18 @@ compare_types_1([], [], _Strict, NotFixpoint) -> find_succ_typings(SCCs, #st{codeserver = Codeserver, callgraph = Callgraph, plt = Plt} = State) -> Servers = {Codeserver, dialyzer_callgraph:mini_callgraph(Callgraph), Plt}, - Coordinator = dialyzer_typesig_coordinator:start(Servers), + Coordinator = dialyzer_coordinator:start(Servers), find_succ_typings(SCCs, State, Coordinator). find_succ_typings([SCC|Rest], #st{parent = Parent} = State, Coordinator) -> Msg = io_lib:format("Typesig analysis for SCC: ~w\n", [format_scc(SCC)]), ?debug("~s", [Msg]), send_log(Parent, Msg), - dialyzer_typesig_coordinator:scc_spawn(SCC, Coordinator), + dialyzer_coordinator:scc_spawn(SCC, Coordinator), find_succ_typings(Rest, State, Coordinator); find_succ_typings([], State, Coordinator) -> - dialyzer_typesig_coordinator:all_spawned(Coordinator), - NotFixpoint = dialyzer_typesig_coordinator:receive_not_fixpoint(), + dialyzer_coordinator:all_spawned(Coordinator), + NotFixpoint = dialyzer_coordinator:receive_not_fixpoint(), ?debug("==================== Typesig done ====================\n\n", []), case NotFixpoint =:= [] of true -> {fixpoint, State}; diff --git a/lib/dialyzer/src/dialyzer_typesig_worker.erl b/lib/dialyzer/src/dialyzer_worker.erl index 3a7cd22eed..0bfdcf6bdb 100644 --- a/lib/dialyzer/src/dialyzer_typesig_worker.erl +++ b/lib/dialyzer/src/dialyzer_worker.erl @@ -18,7 +18,7 @@ %% %CopyrightEnd% %% --module(dialyzer_typesig_worker). +-module(dialyzer_worker). -export([launch/2]). @@ -112,10 +112,10 @@ ask_coordinator_for_callers(#state{scc = SCC, RequiredBy = dialyzer_succ_typings:find_required_by(SCC, Servers), WithoutSelf = RequiredBy -- [SCC], ?debug("Waiting for me~p: ~p\n",[SCC, WithoutSelf]), - dialyzer_typesig_coordinator:sccs_to_pids_request(WithoutSelf, Coordinator). + dialyzer_coordinator:sccs_to_pids_request(WithoutSelf, Coordinator). get_callers_reply_from_coordinator() -> - dialyzer_typesig_coordinator:sccs_to_pids_reply(). + dialyzer_coordinator:sccs_to_pids_reply(). broadcast_own_succ_typings(#state{scc = SCC}, Callers) -> ?debug("Sending ~p: ~p\n",[SCC, Callers]), @@ -139,4 +139,4 @@ find_succ_typings(#state{scc_data = SCCData}) -> report_to_coordinator(NotFixpoint, #state{scc = SCC, coordinator = Coordinator}) -> ?debug("Done: ~p\n",[SCC]), - dialyzer_typesig_coordinator:scc_done(SCC, NotFixpoint, Coordinator). + dialyzer_coordinator:scc_done(SCC, NotFixpoint, Coordinator). |