Merge pull request #2321 from rhc54/cmrv2.x/libevent

Ensure all event registrations are removed when a peer dies.

Author: jsquyres

opal/mca/pmix/pmix112/pmix/src/usock/usock_sendrecv.c

@@ -53,6 +53,7 @@ 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_regevents_info_t *reginfoptr, *regnext;
 
     /* stop all events */
     if (peer->recv_ev_active) {
@@ -107,7 +108,15 @@ static void lost_connection(pmix_peer_t *peer, pmix_status_t err)
          /* 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 */