Merge pull request open-mpi#2251 from rhc54/cmr2.0.x/libevent

Silence the libevent warning when a proc abnormally terminates by cleaning up the error registrations
ggouaillardet · Oct 19, 2016 · 2515509 · 2515509
2 parents 910f171 + ba84dc8
commit 2515509
Showing 1 changed file with 18 additions and 8 deletions.
diff --git a/opal/mca/pmix/pmix112/pmix/src/usock/usock_sendrecv.c b/opal/mca/pmix/pmix112/pmix/src/usock/usock_sendrecv.c
@@ -53,6 +53,8 @@ static void lost_connection(pmix_peer_t *peer, pmix_status_t err)
     pmix_server_trkr_t *trk;
     pmix_rank_info_t *rinfo, *rnext;
     pmix_trkr_caddy_t *tcd;
+    pmix_error_reg_info_t *errreg;
+    pmix_regevents_info_t *reginfoptr, *regnext;
 
     /* stop all events */
     if (peer->recv_ev_active) {
@@ -99,15 +101,23 @@ static void lost_connection(pmix_peer_t *peer, pmix_status_t err)
                 }
             }
         }
-         /* remove this proc from the list of ranks for this nspace */
-         pmix_list_remove_item(&(peer->info->nptr->server->ranks), &(peer->info->super));
-         PMIX_RELEASE(peer->info);
-         /* reduce the number of local procs */
-         --peer->info->nptr->server->nlocalprocs;
-         /* do some cleanup as the client has left us */
-         pmix_pointer_array_set_item(&pmix_server_globals.clients,
+        /* remove this proc from the list of ranks for this nspace */
+        pmix_list_remove_item(&(peer->info->nptr->server->ranks), &(peer->info->super));
+        PMIX_RELEASE(peer->info);
+        /* reduce the number of local procs */
+        --peer->info->nptr->server->nlocalprocs;
+        /* do some cleanup as the client has left us */
+        pmix_pointer_array_set_item(&pmix_server_globals.clients,
                                      peer->index, NULL);
-         PMIX_RELEASE(peer);
+        /* remove all registered event handlers so libevent doesn't complain */
+        PMIX_LIST_FOREACH_SAFE(reginfoptr, regnext, &pmix_server_globals.client_eventregs, pmix_regevents_info_t) {
+            if (reginfoptr->peer == peer) {
+                pmix_list_remove_item(&pmix_server_globals.client_eventregs, &reginfoptr->super);
+                PMIX_RELEASE(reginfoptr);
+                break;
+            }
+        }
+        PMIX_RELEASE(peer);
      } else {
         /* if I am a client, there is only
          * one connection we can have */