diff options
| author | Alexandru Scvortov <alexandru@rabbitmq.com> | 2010-08-24 14:24:01 +0100 |
|---|---|---|
| committer | Alexandru Scvortov <alexandru@rabbitmq.com> | 2010-08-24 14:24:01 +0100 |
| commit | 5cde9a434c0afe2ae0c3ac91ae47521adc47336c (patch) | |
| tree | a6b12bc11794b31fc0d74b32ed3b723f38eddc4b | |
| parent | 80975016a35d4752651cc6922d1360fa3e71c430 (diff) | |
| download | rabbitmq-server-5cde9a434c0afe2ae0c3ac91ae47521adc47336c.tar.gz | |
prioritize -> prioritise
| -rw-r--r-- | src/gen_server2.erl | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/gen_server2.erl b/src/gen_server2.erl index a7600150..5a7559ce 100644 --- a/src/gen_server2.erl +++ b/src/gen_server2.erl @@ -181,8 +181,8 @@ %% State record -record(gs2_state, {parent, name, state, mod, time, - timeout_state, queue, debug, prioritize_call, - prioritize_cast, prioritize_info}). + timeout_state, queue, debug, prioritise_call, + prioritise_cast, prioritise_info}). %%%========================================================================= %%% Specs. These exist only to shut up dialyzer's warnings @@ -410,7 +410,7 @@ init_it(Starter, Parent, Name0, Mod, Args, Options) -> Name = name(Name0), Debug = debug_options(Name, Options), Queue = priority_queue:new(), - GS2State = find_prioritizers( + GS2State = find_prioritisers( #gs2_state { parent = Parent, name = Name, mod = Mod, @@ -615,13 +615,13 @@ in({'$gen_pcast', {Priority, Msg}}, Queue, _GS2State) -> priority_queue:in({'$gen_cast', Msg}, Priority, Queue); in({'$gen_pcall', From, {Priority, Msg}}, Queue, _GS2State) -> priority_queue:in({'$gen_call', From, Msg}, Priority, Queue); -in({'$gen_cast', Msg}, Queue, #gs2_state { prioritize_cast = PC, +in({'$gen_cast', Msg}, Queue, #gs2_state { prioritise_cast = PC, state = State }) -> priority_queue:in({'$gen_cast', Msg}, PC(Msg, State), Queue); -in({'$gan_call', From, Msg}, Queue, #gs2_state { prioritize_call = PC, +in({'$gan_call', From, Msg}, Queue, #gs2_state { prioritise_call = PC, state = State }) -> priority_queue:in({'$gen_call', Msg}, PC(Msg, From, State), Queue); -in(Input, Queue, #gs2_state { prioritize_info = PI, +in(Input, Queue, #gs2_state { prioritise_info = PI, state = State }) -> priority_queue:in(Input, PI(Input, State), Queue). @@ -991,7 +991,7 @@ system_code_change(GS2State = #gs2_state { mod = Mod, _Module, OldVsn, Extra) -> case catch Mod:code_change(OldVsn, State, Extra) of {ok, NewState} -> - NewGS2State = find_prioritizers( + NewGS2State = find_prioritisers( GS2State #gs2_state { state = NewState }), {ok, [NewGS2State]}; Else -> @@ -1159,17 +1159,17 @@ name_to_pid(Name) -> Pid end. -find_prioritizers(GS2State = #gs2_state { mod = Mod }) -> +find_prioritisers(GS2State = #gs2_state { mod = Mod }) -> PrioriCall = function_exported_or_default( - Mod, 'prioritize_call', 3, + Mod, 'prioritise_call', 3, fun (_Msg, _From, _State) -> 0 end), - PrioriCast = function_exported_or_default(Mod, 'prioritize_cast', 2, + PrioriCast = function_exported_or_default(Mod, 'prioritise_cast', 2, fun (_Msg, _State) -> 0 end), - PrioriInfo = function_exported_or_default(Mod, 'prioritize_info', 2, + PrioriInfo = function_exported_or_default(Mod, 'prioritise_info', 2, fun (_Msg, _State) -> 0 end), - GS2State #gs2_state { prioritize_call = PrioriCall, - prioritize_cast = PrioriCast, - prioritize_info = PrioriInfo }. + GS2State #gs2_state { prioritise_call = PrioriCall, + prioritise_cast = PrioriCast, + prioritise_info = PrioriInfo }. function_exported_or_default(Mod, Fun, Ar, Default) -> case erlang:function_exported(Mod, Fun, Ar) of |