1
1

Always release the buffer (this imply the buffer has to be created

outside the special case).

This commit was SVN r15533.
Этот коммит содержится в:
George Bosilca 2007-07-20 04:06:39 +00:00
родитель 172a4fa543
Коммит d1424689ce

Просмотреть файл

@ -391,8 +391,8 @@ int orte_daemon(int argc, char *argv[])
} }
/* if we are not a seed, prep a return buffer to say we started okay */ /* if we are not a seed, prep a return buffer to say we started okay */
buffer = OBJ_NEW(orte_buffer_t);
if (!orte_process_info.seed) { if (!orte_process_info.seed) {
buffer = OBJ_NEW(orte_buffer_t);
if (ORTE_SUCCESS != (ret = orte_dss.pack(buffer, &zero, 1, ORTE_INT))) { if (ORTE_SUCCESS != (ret = orte_dss.pack(buffer, &zero, 1, ORTE_INT))) {
ORTE_ERROR_LOG(ret); ORTE_ERROR_LOG(ret);
OBJ_RELEASE(buffer); OBJ_RELEASE(buffer);
@ -459,6 +459,7 @@ int orte_daemon(int argc, char *argv[])
if (ORTE_SUCCESS != (ret = orte_ns.get_jobid_string(&jobidstring, if (ORTE_SUCCESS != (ret = orte_ns.get_jobid_string(&jobidstring,
orte_process_info.my_name))) { orte_process_info.my_name))) {
ORTE_ERROR_LOG(ret); ORTE_ERROR_LOG(ret);
OBJ_RELEASE(buffer);
return ret; return ret;
} }
@ -509,6 +510,7 @@ int orte_daemon(int argc, char *argv[])
ORTE_RML_NON_PERSISTENT, orte_daemon_recv_gate, NULL); ORTE_RML_NON_PERSISTENT, orte_daemon_recv_gate, NULL);
if (ret != ORTE_SUCCESS && ret != ORTE_ERR_NOT_IMPLEMENTED) { if (ret != ORTE_SUCCESS && ret != ORTE_ERR_NOT_IMPLEMENTED) {
ORTE_ERROR_LOG(ret); ORTE_ERROR_LOG(ret);
OBJ_RELEASE(buffer);
return ret; return ret;
} }
@ -547,8 +549,8 @@ int orte_daemon(int argc, char *argv[])
OBJ_RELEASE(buffer); OBJ_RELEASE(buffer);
return ret; return ret;
} }
OBJ_RELEASE(buffer); /* done with this */
} }
OBJ_RELEASE(buffer); /* done with this */
if (orte_debug_daemons_flag) { if (orte_debug_daemons_flag) {
opal_output(0, "%s orted: up and running - waiting for commands!", ORTE_NAME_PRINT(orte_process_info.my_name)); opal_output(0, "%s orted: up and running - waiting for commands!", ORTE_NAME_PRINT(orte_process_info.my_name));