Skip to content

Commit c0c5dd8

Browse files
committed
orte: plug a memory leak in orte_rml.recv_cancel
do not invoke orte_rml.recv_cancel after the orte progress thread has gone Signed-off-by: Gilles Gouaillardet <[email protected]>
1 parent 17fac4b commit c0c5dd8

File tree

6 files changed

+7
-17
lines changed

6 files changed

+7
-17
lines changed

orte/mca/filem/raw/filem_raw_module.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* All rights reserved
44
* Copyright (c) 2013 Cisco Systems, Inc. All rights reserved.
55
* Copyright (c) 2014-2016 Intel, Inc. All rights reserved.
6-
* Copyright (c) 2015 Research Organization for Information Science
6+
* Copyright (c) 2015-2017 Research Organization for Information Science
77
* and Technology (RIST). All rights reserved.
88
* $COPYRIGHT$
99
*
@@ -145,7 +145,6 @@ static int raw_finalize(void)
145145
{
146146
opal_list_item_t *item;
147147

148-
orte_rml.recv_cancel(ORTE_NAME_WILDCARD, ORTE_RML_TAG_FILEM_BASE);
149148
while (NULL != (item = opal_list_remove_first(&incoming_files))) {
150149
OBJ_RELEASE(item);
151150
}
@@ -160,7 +159,6 @@ static int raw_finalize(void)
160159
OBJ_RELEASE(item);
161160
}
162161
OBJ_DESTRUCT(&positioned_files);
163-
orte_rml.recv_cancel(ORTE_NAME_WILDCARD, ORTE_RML_TAG_FILEM_BASE_RESP);
164162
}
165163

166164
return ORTE_SUCCESS;

orte/mca/grpcomm/direct/grpcomm_direct.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* Copyright (c) 2011-2013 Los Alamos National Security, LLC. All
77
* rights reserved.
88
* Copyright (c) 2014-2016 Intel, Inc. All rights reserved.
9-
* Copyright (c) 2014 Research Organization for Information Science
9+
* Copyright (c) 2014-2017 Research Organization for Information Science
1010
* and Technology (RIST). All rights reserved.
1111
* $COPYRIGHT$
1212
*
@@ -98,9 +98,6 @@ static int init(void)
9898
*/
9999
static void finalize(void)
100100
{
101-
/* cancel the recv */
102-
orte_rml.recv_cancel(ORTE_NAME_WILDCARD, ORTE_RML_TAG_XCAST);
103-
104101
OPAL_LIST_DESTRUCT(&tracker);
105102
return;
106103
}

orte/mca/iof/hnp/iof_hnp.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* Copyright (c) 2007 Cisco Systems, Inc. All rights reserved.
1414
* Copyright (c) 2011-2013 Los Alamos National Security, LLC. All rights
1515
* reserved.
16-
* Copyright (c) 2014 Research Organization for Information Science
16+
* Copyright (c) 2014-2017 Research Organization for Information Science
1717
* and Technology (RIST). All rights reserved.
1818
* Copyright (c) 2016-2017 Intel, Inc. All rights reserved.
1919
* $COPYRIGHT$
@@ -480,7 +480,6 @@ static int finalize(void)
480480
OBJ_RELEASE(proct);
481481
}
482482
OBJ_DESTRUCT(&mca_iof_hnp_component.procs);
483-
orte_rml.recv_cancel(ORTE_NAME_WILDCARD, ORTE_RML_TAG_IOF_HNP);
484483

485484
return ORTE_SUCCESS;
486485
}

orte/mca/plm/base/plm_base_receive.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
* Copyright (c) 2011 Los Alamos National Security, LLC.
1414
* All rights reserved.
1515
* Copyright (c) 2014-2016 Intel, Inc. All rights reserved.
16+
* Copyright (c) 2017 Research Organization for Information Science
17+
* and Technology (RIST). All rights reserved.
1618
* $COPYRIGHT$
1719
*
1820
* Additional copyrights may follow
@@ -101,10 +103,6 @@ int orte_plm_base_comm_stop(void)
101103
"%s plm:base:receive stop comm",
102104
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME)));
103105

104-
orte_rml.recv_cancel(ORTE_NAME_WILDCARD, ORTE_RML_TAG_PLM);
105-
if (ORTE_PROC_IS_HNP) {
106-
orte_rml.recv_cancel(ORTE_NAME_WILDCARD, ORTE_RML_TAG_ORTED_CALLBACK);
107-
}
108106
recv_issued = false;
109107

110108
return ORTE_SUCCESS;

orte/orted/orted_submit.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -590,8 +590,6 @@ void orte_submit_finalize(void)
590590
trackr_t *trk;
591591
int i;
592592

593-
orte_rml.recv_cancel(ORTE_NAME_WILDCARD, ORTE_RML_TAG_LAUNCH_RESP);
594-
orte_rml.recv_cancel(ORTE_NAME_WILDCARD, ORTE_RML_TAG_NOTIFY_COMPLETE);
595593
for (i=0; i < tool_jobs.size; i++) {
596594
if (NULL != (trk = (trackr_t*)opal_pointer_array_get_item(&tool_jobs, i))) {
597595
OBJ_RELEASE(trk);

orte/runtime/orte_data_server.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
* Copyright (c) 2012-2016 Los Alamos National Security, LLC.
1414
* All rights reserved
1515
* Copyright (c) 2015-2016 Intel, Inc. All rights reserved.
16+
* Copyright (c) 2017 Research Organization for Information Science
17+
* and Technology (RIST). All rights reserved.
1618
* $COPYRIGHT$
1719
*
1820
* Additional copyrights may follow
@@ -149,8 +151,6 @@ void orte_data_server_finalize(void)
149151
}
150152
initialized = false;
151153

152-
orte_rml.recv_cancel(ORTE_NAME_WILDCARD, ORTE_RML_TAG_DATA_SERVER);
153-
154154
for (i=0; i < orte_data_server_store.size; i++) {
155155
if (NULL != (data = (orte_data_object_t*)opal_pointer_array_get_item(&orte_data_server_store, i))) {
156156
OBJ_RELEASE(data);

0 commit comments

Comments
 (0)