From af1444b6e16c673435ac7e5afe7c67665b1118b7 Mon Sep 17 00:00:00 2001 From: Ralph Castain Date: Tue, 8 Mar 2016 18:27:55 -0800 Subject: [PATCH] Cleanup a debug statement. Plug a memory leak --- opal/mca/pmix/pmix120/pmix/src/server/pmix_server.c | 5 +++++ opal/mca/pmix/pmix120/pmix/src/usock/usock_sendrecv.c | 9 +++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/opal/mca/pmix/pmix120/pmix/src/server/pmix_server.c b/opal/mca/pmix/pmix120/pmix/src/server/pmix_server.c index 1bb911db87..922ac765a6 100644 --- a/opal/mca/pmix/pmix120/pmix/src/server/pmix_server.c +++ b/opal/mca/pmix/pmix120/pmix/src/server/pmix_server.c @@ -2298,6 +2298,11 @@ static pmix_status_t server_switchyard(pmix_peer_t *peer, uint32_t tag, event_del(&peer->recv_event); peer->recv_ev_active = false; } + /* remove this peer from the nspace ranks */ + pmix_list_remove_item(&peer->info->nptr->server->ranks, &peer->info->super); + PMIX_RELEASE(peer->info); + pmix_pointer_array_set_item(&pmix_server_globals.clients, peer->index, NULL); + PMIX_RELEASE(peer); return rc; } diff --git a/opal/mca/pmix/pmix120/pmix/src/usock/usock_sendrecv.c b/opal/mca/pmix/pmix120/pmix/src/usock/usock_sendrecv.c index 1c7fa48206..0e4cd2e512 100644 --- a/opal/mca/pmix/pmix120/pmix/src/usock/usock_sendrecv.c +++ b/opal/mca/pmix/pmix120/pmix/src/usock/usock_sendrecv.c @@ -101,9 +101,10 @@ static pmix_status_t send_bytes(int sd, char **buf, size_t *remain) goto exit; } /* we hit an error and cannot progress this message */ - pmix_output(0, "pmix_usock_msg_send_bytes: write failed: %s (%d) [sd = %d]", - strerror(pmix_socket_errno), - pmix_socket_errno, sd); + pmix_output_verbose(10, pmix_globals.debug_output, + "pmix_usock_msg_send_bytes: write failed: %s (%d) [sd = %d]", + strerror(pmix_socket_errno), + pmix_socket_errno, sd); ret = PMIX_ERR_COMM_FAILURE; goto exit; } @@ -147,7 +148,7 @@ static int read_bytes(int sd, char **buf, size_t *remain) * the error back to the RML and let the caller know * to abort this message */ - pmix_output_verbose(2, pmix_globals.debug_output, + pmix_output_verbose(10, pmix_globals.debug_output, "pmix_usock_msg_recv: readv failed: %s (%d)", strerror(pmix_socket_errno), pmix_socket_errno);