File 0005-cpg-replace-maps-take-2-for-compatibility-... of Package cpg

Overview Repositories Revisions Requests Users Attributes Meta

File 0005-cpg-replace-maps-take-2-for-compatibility-of-Erlang-.patch of Package cpg (Revision d20799a94159ad27d341d349dd7faa72)

Currently displaying revision d20799a94159ad27d341d349dd7faa72 , Show latest

From 989a0f495c8e98e88347272a660e5b5d006a33a4 Mon Sep 17 00:00:00 2001
From: Led <ledest@gmail.com>
Date: Mon, 29 Oct 2018 14:22:25 +0200
Subject: [PATCH 05/15] cpg: replace maps:take/2 for compatibility of
 Erlang/OTP 18

---
 src/cpg.erl | 32 +++++++++++++++-----------------
 1 file changed, 15 insertions(+), 17 deletions(-)

diff --git a/src/cpg.erl b/src/cpg.erl
index fc08359..050a9fc 100644
--- a/src/cpg.erl
+++ b/src/cpg.erl
@@ -2708,15 +2708,14 @@ handle_call({join_counts, Counts, Pid} = Request, _, State0) ->
 
 handle_call({leave, Pid} = Request, _,
             #state{monitors = Monitors} = State) ->
-    case maps:take(Pid, Monitors) of
-        {#state_monitor{monitor = MonitorRef,
-                        names = GroupNameList}, NewMonitors} ->
+    case maps:find(Pid, Monitors) of
+        {ok, #state_monitor{monitor = MonitorRef, names = GroupNameList}} ->
             true = is_reference(MonitorRef),
             true = erlang:demonitor(MonitorRef, [flush]),
             abcast_hidden_nodes(Request, State),
             {reply, ok,
              leave_all_local(GroupNameList, Pid, leave_local,
-                             State#state{monitors = NewMonitors})};
+                             State#state{monitors = maps:remove(Pid, Monitors)})};
         error ->
             {reply, error, State}
     end;
@@ -2954,14 +2953,13 @@ handle_cast({join_counts, Counts, Pid}, State0) ->
 
 handle_cast({leave, Pid},
             #state{monitors = Monitors} = State) ->
-    case maps:take(Pid, Monitors) of
-        {#state_monitor{monitor = MonitorProcess,
-                        names = GroupNameList}, NewMonitors} ->
+    case maps:find(Pid, Monitors) of
+        {ok, #state_monitor{monitor = MonitorProcess, names = GroupNameList}} ->
             true = is_pid(MonitorProcess),
             ok = cpg_node_monitor:remove(MonitorProcess, Pid),
             {noreply,
              leave_all_remote(GroupNameList, Pid, leave_remote,
-                              State#state{monitors = NewMonitors})};
+                              State#state{monitors = maps:remove(Pid, Monitors)})};
         error ->
             {noreply, State}
     end;
@@ -3557,10 +3555,10 @@ merge_start(Node,
 
 member_died_local(Pid, Reason,
                   #state{monitors = Monitors} = State) ->
-    case maps:take(Pid, Monitors) of
-        {#state_monitor{names = GroupNameList}, NewMonitors} ->
+    case maps:find(Pid, Monitors) of
+        {ok, #state_monitor{names = GroupNameList}} ->
             leave_all_local(GroupNameList, Pid, Reason,
-                            State#state{monitors = NewMonitors});
+                            State#state{monitors = maps:remove(Pid, Monitors)});
         error ->
             State
     end.
@@ -3569,9 +3567,9 @@ members_died_remote([], State) ->
     State;
 members_died_remote([{Pid, Reason} | PidReasons],
                     #state{monitors = Monitors} = State) ->
-    case maps:take(Pid, Monitors) of
-        {#state_monitor{names = GroupNameList}, NewMonitors} ->
-            NewState = State#state{monitors = NewMonitors},
+    case maps:find(Pid, Monitors) of
+        {ok, #state_monitor{names = GroupNameList}} ->
+            NewState = State#state{monitors = maps:remove(Pid, Monitors)},
             members_died_remote(PidReasons,
                                 leave_all_remote(GroupNameList,
                                                  Pid, Reason, NewState));
@@ -3583,9 +3581,9 @@ node_died([], _, State) ->
     State;
 node_died([Pid | Pids], Reason,
           #state{monitors = Monitors} = State) ->
-    case maps:take(Pid, Monitors) of
-        {#state_monitor{names = GroupNameList}, NewMonitors} ->
-            NewState = State#state{monitors = NewMonitors},
+    case maps:find(Pid, Monitors) of
+        {ok, #state_monitor{names = GroupNameList}} ->
+            NewState = State#state{monitors = maps:remove(Pid, Monitors)},
             node_died(Pids, Reason,
                       leave_all_remote(GroupNameList,
                                        Pid, Reason, NewState));
-- 
2.16.4

Places

File 0005-cpg-replace-maps-take-2-for-compatibility-of-Erlang-.patch of Package cpg (Revision d20799a94159ad27d341d349dd7faa72)

Places