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

Merge pull request #3319 from emqx/master 

Change global_gc to major mode (#3317)
This commit is contained in:
turtleDeng 2020-03-17 14:30:13 +08:00 committed by GitHub
parent 531d1cf0a3 4438e0ce42
commit f184973ab2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/emqx_global_gc.erl
View File

@ -94,7 +94,7 @@ ensure_timer(State) ->
run_gc() -> lists:foreach(fun do_gc/1, processes()). run_gc() -> lists:foreach(fun do_gc/1, processes()).
do_gc(Pid) -> do_gc(Pid) ->
is_waiting(Pid) andalso garbage_collect(Pid, [{type, 'minor'}]). is_waiting(Pid) andalso garbage_collect(Pid).
-compile({inline, [is_waiting/1]}). -compile({inline, [is_waiting/1]}).
is_waiting(Pid) -> is_waiting(Pid) ->

8
test/mqtt_protocol_v5_SUITE.erl
View File

@ -365,6 +365,7 @@ t_connect_will_delay_interval(_) ->
%% [MQTT-3.1.4-3] %% [MQTT-3.1.4-3]
t_connect_duplicate_clientid(_) -> t_connect_duplicate_clientid(_) ->
process_flag(trap_exit, true),
{ok, Client1} = emqtt:start_link([ {ok, Client1} = emqtt:start_link([
{clientid, <<"t_connect_duplicate_clientid">>}, {clientid, <<"t_connect_duplicate_clientid">>},
{proto_ver, v5} {proto_ver, v5}
@ -375,7 +376,12 @@ t_connect_duplicate_clientid(_) ->
{proto_ver, v5} {proto_ver, v5}
]), ]),
{ok, _} = emqtt:connect(Client2), {ok, _} = emqtt:connect(Client2),
?assertEqual(142, receive_disconnect_reasoncode()). ?assertEqual(142, receive_disconnect_reasoncode()),
waiting_client_process_exit(Client1),
ok = emqtt:disconnect(Client2),
waiting_client_process_exit(Client2),
process_flag(trap_exit, false).
%%-------------------------------------------------------------------- %%--------------------------------------------------------------------
%% Connack %% Connack