Skip to content

Commit 3f664b4

Browse files
committed
rename process_forward to deliver (which is a much better description of the function)
Signed-off-by: Alejandro M. Ramallo <[email protected]>
1 parent 0db206a commit 3f664b4

13 files changed

+33
-33
lines changed

protocols/bernstein_ctp.erl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ handle_info({decision, FromNode, Id, Decision}, State) ->
224224
end, Uncertain0),
225225

226226
%% Forward to process.
227-
partisan_peer_service_manager:process_forward(ServerRef, Message),
227+
partisan_peer_service_manager:deliver(ServerRef, Message),
228228

229229
ok
230230
end
@@ -420,7 +420,7 @@ handle_info({commit, #transaction{id=Id, coordinator=Coordinator, server_ref=Ser
420420
true = ets:insert(?PARTICIPATING_TRANSACTIONS, {Id, Transaction#transaction{participant_status=commit}}),
421421

422422
%% Forward to process.
423-
partisan_peer_service_manager:process_forward(ServerRef, Message),
423+
partisan_peer_service_manager:deliver(ServerRef, Message),
424424

425425
%% Repond to coordinator that we are now committed.
426426
MyNode = partisan:node(),

protocols/demers_anti_entropy.erl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ handle_cast({broadcast, ServerRef, Message}, #state{next_id=NextId}=State) ->
9898
Id = {MyNode, NextId},
9999

100100
%% Forward to process.
101-
partisan_peer_service_manager:process_forward(ServerRef, Message),
101+
partisan_peer_service_manager:deliver(ServerRef, Message),
102102

103103
%% Store outgoing message.
104104
true = ets:insert(?MODULE, {Id, {ServerRef, Message}}),
@@ -148,7 +148,7 @@ handle_info({push, FromNode, TheirMessages}, State) ->
148148
case ets:lookup(?MODULE, Id) of
149149
[] ->
150150
%% Forward to process.
151-
partisan_peer_service_manager:process_forward(ServerRef, Message),
151+
partisan_peer_service_manager:deliver(ServerRef, Message),
152152

153153
%% Store.
154154
true = ets:insert(?MODULE, {Id, {ServerRef, Message}}),
@@ -181,7 +181,7 @@ handle_info({pull, _FromNode, Messages}, State) ->
181181
case ets:lookup(?MODULE, Id) of
182182
[] ->
183183
%% Forward to process.
184-
partisan_peer_service_manager:process_forward(ServerRef, Message),
184+
partisan_peer_service_manager:deliver(ServerRef, Message),
185185

186186
%% Store.
187187
true = ets:insert(?MODULE, {Id, {ServerRef, Message}}),

protocols/demers_direct_mail.erl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ handle_cast({broadcast, ServerRef, Message}, #state{next_id=NextId, membership=M
9494
Id = {MyNode, NextId},
9595

9696
%% Forward to process.
97-
partisan_peer_service_manager:process_forward(ServerRef, Message),
97+
partisan_peer_service_manager:deliver(ServerRef, Message),
9898

9999
%% Store outgoing message.
100100
true = ets:insert(?MODULE, {Id, Message}),
@@ -136,7 +136,7 @@ handle_info({broadcast, Id, ServerRef, Message}, State) ->
136136
case ets:lookup(?MODULE, Id) of
137137
[] ->
138138
%% Forward to process.
139-
partisan_peer_service_manager:process_forward(ServerRef, Message),
139+
partisan_peer_service_manager:deliver(ServerRef, Message),
140140

141141
%% Store.
142142
true = ets:insert(?MODULE, {Id, Message}),

protocols/demers_direct_mail_acked.erl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ handle_cast({broadcast, ServerRef, Message}, #state{next_id=NextId, membership=M
9393
Id = {MyNode, NextId},
9494

9595
%% Forward to process.
96-
partisan_peer_service_manager:process_forward(ServerRef, Message),
96+
partisan_peer_service_manager:deliver(ServerRef, Message),
9797

9898
%% Store outgoing message.
9999
true = ets:insert(?MODULE, {Id, Message}),
@@ -125,7 +125,7 @@ handle_info({broadcast, Id, ServerRef, Message}, State) ->
125125
case ets:lookup(?MODULE, Id) of
126126
[] ->
127127
%% Forward to process.
128-
partisan_peer_service_manager:process_forward(ServerRef, Message),
128+
partisan_peer_service_manager:deliver(ServerRef, Message),
129129

130130
%% Store.
131131
true = ets:insert(?MODULE, {Id, Message}),

protocols/demers_rumor_mongering.erl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ handle_cast({broadcast, ServerRef, Message}, #state{next_id=NextId, membership=M
9595
Id = {MyNode, NextId},
9696

9797
%% Forward to process.
98-
partisan_peer_service_manager:process_forward(ServerRef, Message),
98+
partisan_peer_service_manager:deliver(ServerRef, Message),
9999

100100
%% Store outgoing message.
101101
true = ets:insert(?MODULE, {Id, Message}),
@@ -130,7 +130,7 @@ handle_info({broadcast, Id, ServerRef, Message, FromNode}, #state{membership=Mem
130130
case ets:lookup(?MODULE, Id) of
131131
[] ->
132132
%% Forward to process.
133-
partisan_peer_service_manager:process_forward(ServerRef, Message),
133+
partisan_peer_service_manager:deliver(ServerRef, Message),
134134

135135
%% Store.
136136
true = ets:insert(?MODULE, {Id, Message}),

protocols/lampson_2pc.erl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -314,7 +314,7 @@ handle_info({commit, #transaction{id=Id, coordinator=Coordinator, server_ref=Ser
314314
true = ets:insert(?PARTICIPATING_TRANSACTIONS, {Id, Transaction#transaction{participant_status=commit}}),
315315

316316
%% Forward to process.
317-
partisan_peer_service_manager:process_forward(ServerRef, Message),
317+
partisan_peer_service_manager:deliver(ServerRef, Message),
318318

319319
%% Repond to coordinator that we are now committed.
320320
MyNode = partisan:node(),

protocols/skeen_3pc.erl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ handle_info({participant_timeout, Id}, State) ->
191191
true = ets:insert(?PARTICIPATING_TRANSACTIONS, {Id, Transaction#transaction{participant_status=commit}}),
192192

193193
%% Forward to process.
194-
partisan_peer_service_manager:process_forward(ServerRef, Message);
194+
partisan_peer_service_manager:deliver(ServerRef, Message);
195195
commit ->
196196
?LOG_INFO("Participant: ~p already committed.", [node()]),
197197
ok
@@ -374,7 +374,7 @@ handle_info({commit, #transaction{id=Id, coordinator=Coordinator, server_ref=Ser
374374
true = ets:insert(?PARTICIPATING_TRANSACTIONS, {Id, Transaction#transaction{participant_status=commit}}),
375375

376376
%% Forward to process.
377-
partisan_peer_service_manager:process_forward(ServerRef, Message),
377+
partisan_peer_service_manager:deliver(ServerRef, Message),
378378

379379
%% Repond to coordinator that we are now committed.
380380
MyNode = partisan:node(),

src/partisan_causality_backend.erl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ deliver(#state{my_node=MyNode, local_clock=LocalClock, order_buffer=OrderBuffer,
280280
case DeliveryFun of
281281
undefined ->
282282
try
283-
partisan_peer_service_manager:process_forward(ServerRef, Message)
283+
partisan_peer_service_manager:deliver(ServerRef, Message)
284284
catch
285285
_:Reason ->
286286
?LOG_DEBUG(#{

src/partisan_client_server_peer_service_manager.erl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -866,7 +866,7 @@ kill_connections(Nodes, State) ->
866866

867867
%% @private
868868
handle_message({forward_message, ServerRef, Message}, _Channel, State) ->
869-
partisan_peer_service_manager:process_forward(ServerRef, Message),
869+
partisan_peer_service_manager:deliver(ServerRef, Message),
870870
{reply, ok, State}.
871871

872872

src/partisan_hyparview_peer_service_manager.erl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -570,7 +570,7 @@ receive_message(Peer, Channel, {forward_message, ServerRef, Msg} = Cmd) ->
570570
?MODULE, {receive_message, Peer, Channel, Cmd}, infinity
571571
);
572572
false ->
573-
partisan_peer_service_manager:process_forward(ServerRef, Msg)
573+
partisan_peer_service_manager:deliver(ServerRef, Msg)
574574
end;
575575

576576
receive_message(Peer, Channel, Msg) ->
@@ -1802,7 +1802,7 @@ handle_message({relay_message, NodeSpec, Message, TTL}, Channel, #state{} = Stat
18021802
{noreply, State};
18031803

18041804
handle_message({forward_message, ServerRef, Message}, _Channel, State) ->
1805-
partisan_peer_service_manager:process_forward(ServerRef, Message),
1805+
partisan_peer_service_manager:deliver(ServerRef, Message),
18061806
{noreply, State};
18071807

18081808
handle_message(

src/partisan_peer_service_manager.erl

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@
7878
-export([disconnect/2]).
7979
-export([mynode/0]).
8080
-export([myself/0]).
81-
-export([process_forward/2]).
81+
-export([deliver/2]).
8282
-export([send_message/2]).
8383
-export([supports_capability/2]).
8484

@@ -304,11 +304,11 @@ send_message(Node, Message) ->
304304
%% succeed.
305305
%% @end
306306
%% -----------------------------------------------------------------------------
307-
-spec process_forward(ServerRef :: server_ref(), Msg :: any()) -> ok.
307+
-spec deliver(ServerRef :: server_ref(), Msg :: any()) -> ok.
308308

309-
process_forward(ServerRef, Msg) ->
309+
deliver(ServerRef, Msg) ->
310310
try
311-
do_process_forward(ServerRef, Msg)
311+
do_deliver(ServerRef, Msg)
312312
catch
313313
Class:Reason:Stacktrace ->
314314
?LOG_DEBUG(#{
@@ -593,17 +593,17 @@ get_opt(parallelism, #{}) ->
593593

594594

595595
%% @private
596-
do_process_forward({global, Name}, Message) ->
596+
do_deliver({global, Name}, Message) ->
597597
Pid = global:whereis_name(Name),
598598
Pid ! Message,
599599
ok;
600600

601-
do_process_forward({via, Module, Name}, Message) ->
601+
do_deliver({via, Module, Name}, Message) ->
602602
Pid = Module:whereis_name(Name),
603603
Pid ! Message,
604604
ok;
605605

606-
do_process_forward(Pid, Message) when is_pid(Pid) ->
606+
do_deliver(Pid, Message) when is_pid(Pid) ->
607607
Pid ! Message,
608608

609609
?LOG_TRACE_IF(
@@ -614,7 +614,7 @@ do_process_forward(Pid, Message) when is_pid(Pid) ->
614614

615615
ok;
616616

617-
do_process_forward(Name, Message) when is_atom(Name) ->
617+
do_deliver(Name, Message) when is_atom(Name) ->
618618
Name ! Message,
619619

620620
Pid = whereis(Name),
@@ -628,7 +628,7 @@ do_process_forward(Name, Message) when is_atom(Name) ->
628628

629629
ok;
630630

631-
do_process_forward(ServerRef, Message) ->
631+
do_deliver(ServerRef, Message) ->
632632
?LOG_DEBUG(
633633
"node ~p received message ~p for ~p",
634634
[partisan:node(), Message, ServerRef]

src/partisan_pluggable_peer_service_manager.erl

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -396,7 +396,7 @@ forward_message(Node, ServerRef, Message, Opts) when is_map(Opts) ->
396396

397397
case Bypass of
398398
true ->
399-
partisan_peer_service_manager:process_forward(ServerRef, Message);
399+
partisan_peer_service_manager:deliver(ServerRef, Message);
400400
false ->
401401
%% Get forwarding options and combine with message
402402
%% specific options.
@@ -498,7 +498,7 @@ receive_message(Node, Channel, {forward_message, ServerRef, Msg} = Cmd) ->
498498
);
499499
false ->
500500
%% Concurrent execution
501-
partisan_peer_service_manager:process_forward(ServerRef, Msg)
501+
partisan_peer_service_manager:deliver(ServerRef, Msg)
502502
end;
503503

504504
receive_message(Node, Channel, Msg) ->
@@ -1774,7 +1774,7 @@ handle_message(
17741774
partisan_causality_backend:receive_message(Label, Msg);
17751775
false ->
17761776
%% Attempt message delivery.
1777-
partisan_peer_service_manager:process_forward(ServerRef, Msg)
1777+
partisan_peer_service_manager:deliver(ServerRef, Msg)
17781778
end,
17791779

17801780
maybe_reply(From, ok),
@@ -1809,7 +1809,7 @@ handle_message(
18091809
partisan_causality_backend:receive_message(Label, Msg);
18101810
false ->
18111811
%% Attempt message delivery.
1812-
partisan_peer_service_manager:process_forward(ServerRef, Msg)
1812+
partisan_peer_service_manager:deliver(ServerRef, Msg)
18131813
end,
18141814

18151815
maybe_reply(From, ok),
@@ -1822,7 +1822,7 @@ handle_message({forward_message, ServerRef, Msg},
18221822
From,
18231823
_Channel,
18241824
State) ->
1825-
partisan_peer_service_manager:process_forward(ServerRef, Msg),
1825+
partisan_peer_service_manager:deliver(ServerRef, Msg),
18261826
maybe_reply(From, ok),
18271827
{noreply, State};
18281828

src/partisan_static_peer_service_manager.erl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -448,7 +448,7 @@ establish_connections(Pending, Membership) ->
448448

449449

450450
handle_message({forward_message, ServerRef, Message}, _Channel, State) ->
451-
partisan_peer_service_manager:process_forward(ServerRef, Message),
451+
partisan_peer_service_manager:deliver(ServerRef, Message),
452452
{reply, ok, State}.
453453

454454

0 commit comments

Comments
 (0)