From 578fe4178822f670674058261881dd50e436350a Mon Sep 17 00:00:00 2001 From: Gilles Gouaillardet Date: Tue, 25 Nov 2014 17:50:44 +0900 Subject: [PATCH] fix hangs introduced by previous commit a6744b81777ab8247908350bd15cca49bedf5208 --- opal/mca/pmix/native/pmix_native.c | 1 - orte/mca/grpcomm/base/grpcomm_base_stubs.c | 13 +------------ 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/opal/mca/pmix/native/pmix_native.c b/opal/mca/pmix/native/pmix_native.c index b8e65c412a..ce1a458037 100644 --- a/opal/mca/pmix/native/pmix_native.c +++ b/opal/mca/pmix/native/pmix_native.c @@ -163,7 +163,6 @@ static int pmix_sm_attach(uint32_t jid, char *seg_info) rc = opal_dstore.update(opal_dstore_modex, &attrs); opal_list_remove_item(&attrs, &attr->super); - free(attr->connection_info); OBJ_RELEASE(attr); OPAL_LIST_DESTRUCT(&attrs); return rc; diff --git a/orte/mca/grpcomm/base/grpcomm_base_stubs.c b/orte/mca/grpcomm/base/grpcomm_base_stubs.c index 9a1f42d5ce..8be8f46652 100644 --- a/orte/mca/grpcomm/base/grpcomm_base_stubs.c +++ b/orte/mca/grpcomm/base/grpcomm_base_stubs.c @@ -12,8 +12,6 @@ * All rights reserved. * Copyright (c) 2011-2012 Los Alamos National Security, LLC. * All rights reserved. - * Copyright (c) 2014 Research Organization for Information Science - * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -70,18 +68,9 @@ static void gccon(orte_grpcomm_caddy_t *p) p->cbfunc = NULL; p->cbdata = NULL; } -static void gcdes(orte_grpcomm_caddy_t *p) -{ - if (NULL != p->sig) { - OBJ_RELEASE(p->sig); - } - p->buf = NULL; - p->cbfunc = NULL; - p->cbdata = NULL; -} static OBJ_CLASS_INSTANCE(orte_grpcomm_caddy_t, opal_object_t, - gccon, gcdes); + gccon, NULL); int orte_grpcomm_API_xcast(orte_grpcomm_signature_t *sig, orte_rml_tag_t tag,