aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorErlang/OTP <[email protected]>2017-10-09 15:00:08 +0200
committerErlang/OTP <[email protected]>2017-10-09 15:00:08 +0200
commit760b3cde56740bd5d4aa5186b59a9b3600f6f7b1 (patch)
tree1dfafab61ac62749f4bb6a48ae9d382a4db5647b /lib
parent69292a11cd4b31fd3ff73b44f28d527f2d16f555 (diff)
parent36e4e948af8c7478dbaf5b2bdd85794f09275d3f (diff)
downloadotp-760b3cde56740bd5d4aa5186b59a9b3600f6f7b1.tar.gz
otp-760b3cde56740bd5d4aa5186b59a9b3600f6f7b1.tar.bz2
otp-760b3cde56740bd5d4aa5186b59a9b3600f6f7b1.zip
Merge branch 'anders/diameter/reg_monitor/ERIERL-83' into maint-20
* anders/diameter/reg_monitor/ERIERL-83: Fix missing monitor in diameter_reg
Diffstat (limited to 'lib')
-rw-r--r--lib/diameter/src/base/diameter_reg.erl6
-rw-r--r--lib/diameter/test/diameter_reg_SUITE.erl11
2 files changed, 15 insertions, 2 deletions
diff --git a/lib/diameter/src/base/diameter_reg.erl b/lib/diameter/src/base/diameter_reg.erl
index bd5db54a5c..e0c41a2834 100644
--- a/lib/diameter/src/base/diameter_reg.erl
+++ b/lib/diameter/src/base/diameter_reg.erl
@@ -238,7 +238,11 @@ handle_call({add, Uniq, Key}, {Pid, _}, S) ->
Rec = {Key, Pid},
NS = flush(Uniq, Rec, S), %% before insert
{Res, New} = insert(Uniq, Rec),
- {reply, Res, notify(add, New andalso Rec, NS)};
+ {reply, Res, notify(add, New andalso Rec, if New ->
+ add_monitor(Pid, NS);
+ true ->
+ NS
+ end)};
handle_call({remove, Key}, {Pid, _}, S) ->
Rec = {Key, Pid},
diff --git a/lib/diameter/test/diameter_reg_SUITE.erl b/lib/diameter/test/diameter_reg_SUITE.erl
index e2a1ca00c3..cd9242faa8 100644
--- a/lib/diameter/test/diameter_reg_SUITE.erl
+++ b/lib/diameter/test/diameter_reg_SUITE.erl
@@ -1,7 +1,7 @@
%%
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 2010-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2010-2017. All Rights Reserved.
%%
%% Licensed under the Apache License, Version 2.0 (the "License");
%% you may not use this file except in compliance with the License.
@@ -34,6 +34,7 @@
-export([add/1,
add_new/1,
remove/1,
+ down/1,
terms/1,
pids/1]).
@@ -56,6 +57,7 @@ tc() ->
[add,
add_new,
remove,
+ down,
terms,
pids].
@@ -88,6 +90,13 @@ remove(_) ->
[{Ref, Pid}] = ?reg:match(Ref),
Pid = self().
+down(_) ->
+ Ref = make_ref(),
+ {_, MRef} = spawn_monitor(fun() -> ?reg:add_new(Ref), timer:sleep(1000) end),
+ receive {'DOWN', MRef, process, _, _} -> ok end,
+ timer:sleep(1000),
+ [] = ?reg:match(Ref).
+
terms(_) ->
Ref = make_ref(),
true = ?reg:add_new(Ref),