From 3f07fdc48606b7c9c22fadda29ef44c41ab9a693 Mon Sep 17 00:00:00 2001 From: Dimitri Sokolyuk Date: Sat, 31 Oct 2015 12:36:59 +0100 Subject: User generic macro as pid --- src/akk.erl | 6 +++--- src/counter.erl | 8 ++++---- src/pbx_app.erl | 6 ++++-- src/pbx_sup.erl | 6 ++++-- src/tda.erl | 14 +++++++------- 5 files changed, 22 insertions(+), 18 deletions(-) diff --git a/src/akk.erl b/src/akk.erl index a5989f2..902249f 100644 --- a/src/akk.erl +++ b/src/akk.erl @@ -3,13 +3,13 @@ -export([new/0, add/1, flush/0, collect/1]). new() -> - register(akkPid, spawn(?MODULE, collect, [[]])). + register(?MODULE, spawn(?MODULE, collect, [[]])). add(E) -> - akkPid ! {add, E}. + ?MODULE ! {add, E}. flush() -> - akkPid ! {flush, self()}, + ?MODULE ! {flush, self()}, receive L -> L end. diff --git a/src/counter.erl b/src/counter.erl index b8db3e1..e566d6c 100644 --- a/src/counter.erl +++ b/src/counter.erl @@ -5,7 +5,7 @@ -define(MAXCOUNT, 32767). start() -> - register(counterPid, spawn_link(?MODULE, counter, [])). + register(?MODULE, spawn_link(?MODULE, counter, [])). counter() -> process_flag(trap_exit, true), @@ -29,13 +29,13 @@ count(N) -> end. set({present, N}) -> - counterPid ! {set, N+1}. + ?MODULE ! {set, N+1}. next() -> - counterPid ! {next, self()}, + ?MODULE ! {next, self()}, receive {next, N} -> {present, N} end. stop() -> - counterPid ! {stop}. + ?MODULE ! {stop}. diff --git a/src/pbx_app.erl b/src/pbx_app.erl index 5750323..57ba990 100644 --- a/src/pbx_app.erl +++ b/src/pbx_app.erl @@ -10,7 +10,9 @@ %% =================================================================== start(_StartType, _StartArgs) -> - pbx_sup:start_link(). + io:format("start: ~p ~p~n", [_StartType, _StartArgs]), + pbx_sup:start_link(). stop(_State) -> - ok. + io:format("stop: ~p~n", [_State]), + ok. diff --git a/src/pbx_sup.erl b/src/pbx_sup.erl index a28b5c0..504866c 100644 --- a/src/pbx_sup.erl +++ b/src/pbx_sup.erl @@ -16,12 +16,14 @@ %% =================================================================== start_link() -> - supervisor:start_link({local, ?MODULE}, ?MODULE, []). + io:format("start_link~n", []), + supervisor:start_link({local, ?MODULE}, ?MODULE, []). %% =================================================================== %% Supervisor callbacks %% =================================================================== init([]) -> - {ok, { {one_for_one, 5, 10}, []} }. + io:format("init~n", []), + {ok, { {one_for_one, 5, 10}, []} }. diff --git a/src/tda.erl b/src/tda.erl index c151df7..db4db5c 100644 --- a/src/tda.erl +++ b/src/tda.erl @@ -7,23 +7,23 @@ -include("opcodes.hrl"). start() -> - register(tdaPid, spawn(?MODULE, client, [{dial, ?HOST, ?PORT}])). + register(?MODULE, spawn(?MODULE, client, [{dial, ?HOST, ?PORT}])). stop() -> counter:stop(), - tdaPid ! acse:release(). + ?MODULE ! acse:release(). ext() -> - tdaPid ! rose:invoke(?ESCAPE, escape:lines(ext)). + ?MODULE ! rose:invoke(?ESCAPE, escape:lines(ext)). co() -> - tdaPid ! rose:invoke(?ESCAPE, escape:lines(co)). + ?MODULE ! rose:invoke(?ESCAPE, escape:lines(co)). send(Reply) -> - tdaPid ! Reply. + ?MODULE ! Reply. snapshot(Device) -> - tdaPid ! rose:invoke(?SNAPSHOT, snapshot:encode(Device)). + ?MODULE ! rose:invoke(?SNAPSHOT, snapshot:encode(Device)). client({dial, Host, Port}) -> io:format("Dial ~p:~p~n", [Host, Port]), @@ -33,7 +33,7 @@ client({dial, Host, Port}) -> client({ok, Sock}) -> io:format("Connected~n", []), - tdaPid ! acse:associate(), + ?MODULE ! acse:associate(), loop(Sock); client({error, Reason}) -> -- cgit v1.2.3