yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix gen_server2 issue, https://github.com/rabbitmq/rabbitmq-server/issues/268

This commit is contained in:
Feng Lee 2015-08-16 22:01:04 +08:00
parent 11298a9581
commit f9eeab89a2
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/emqttd_retained.erl
View File

@ -122,5 +122,5 @@ dispatch(Topic, CPid) when is_binary(Topic) ->
end,
mnesia:async_dirty(fun mnesia:foldl/3, [Fun, [], retained])
end,
[CPid ! {dispatch, Msg} || Msg <- Msgs].
lists:foreach(fun(Msg) -> CPid ! {dispatch, Msg} end, lists:reverse(Msgs)).

1
src/emqttd_session.erl
View File

@ -268,6 +268,7 @@ prioritise_info(Msg, _Len, _State) ->
session_expired -> 10;
{timeout, _, _} -> 5;
collect_info -> 2;
{dispatch, _} -> 1;
_ -> 0
end.

9
src/gen_server2.erl
View File

@ -633,8 +633,13 @@ extend_backoff({backoff, InitialTimeout, MinimumTimeout, DesiredHibPeriod}) ->
%%% The MAIN loop.
%%% ---------------------------------------------------
loop(GS2State = #gs2_state { time = hibernate,
timeout_state = undefined }) ->
pre_hibernate(GS2State);
timeout_state = undefined,
queue = Queue }) ->
case priority_queue:is_empty(Queue) of
true -> pre_hibernate(GS2State);
false -> process_next_msg(GS2State)
end;
loop(GS2State) ->
process_next_msg(drain(GS2State)).