ports/openmpi
ports/openmpi
1
1
Форкнуть 0
Код Релизы Активность

Forgot to modify the orted end of the communication subsystem

Просмотр исходного кода 
This commit was SVN r12586.
Этот коммит содержится в:
Ralph Castain 2006-11-13 22:08:47 +00:00
родитель f95e20e2e1
Коммит 7b4261001a
1 изменённых файлов: 3 добавлений и 27 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

30
orte/tools/orted/orted.c
Просмотреть файл

@ -579,7 +579,6 @@ static void orte_daemon_recv_pls(int status, orte_process_name_t* sender,
orte_buffer_t *buffer, orte_rml_tag_t tag, orte_buffer_t *buffer, orte_rml_tag_t tag,
void* cbdata) void* cbdata)
{ {
orte_buffer_t *answer;
orte_daemon_cmd_flag_t command; orte_daemon_cmd_flag_t command;
int ret; int ret;
orte_std_cntr_t n; orte_std_cntr_t n;
@ -604,22 +603,6 @@ static void orte_daemon_recv_pls(int status, orte_process_name_t* sender,
goto CLEANUP; goto CLEANUP;
} }
/* setup the answer */
answer = OBJ_NEW(orte_buffer_t);
if (NULL == answer) {
ORTE_ERROR_LOG(ORTE_ERR_OUT_OF_RESOURCE);
goto CLEANUP;
}
/* pack the command to ensure we always have something to send back, and
* so that the caller can verify communication
*/
if (ORTE_SUCCESS != (ret = orte_dss.pack(answer, &command, 1, ORTE_DAEMON_CMD))) {
ORTE_ERROR_LOG(ret);
OBJ_RELEASE(answer);
goto CLEANUP;
}
switch(command) { switch(command) {
/**** KILL_LOCAL_PROCS ****/ /**** KILL_LOCAL_PROCS ****/
@ -635,7 +618,7 @@ static void orte_daemon_recv_pls(int status, orte_process_name_t* sender,
n = 1; n = 1;
if (ORTE_SUCCESS != (ret = orte_dss.unpack(buffer, &job, &n, ORTE_JOBID))) { if (ORTE_SUCCESS != (ret = orte_dss.unpack(buffer, &job, &n, ORTE_JOBID))) {
ORTE_ERROR_LOG(ret); ORTE_ERROR_LOG(ret);
goto DONE; goto CLEANUP;
} }
if (ORTE_SUCCESS != (ret = orte_odls.kill_local_procs(job, true))) { if (ORTE_SUCCESS != (ret = orte_odls.kill_local_procs(job, true))) {
@ -653,7 +636,7 @@ static void orte_daemon_recv_pls(int status, orte_process_name_t* sender,
n = 1; n = 1;
if (ORTE_SUCCESS != (ret = orte_dss.unpack(buffer, &signal, &n, ORTE_INT32))) { if (ORTE_SUCCESS != (ret = orte_dss.unpack(buffer, &signal, &n, ORTE_INT32))) {
ORTE_ERROR_LOG(ret); ORTE_ERROR_LOG(ret);
goto DONE; goto CLEANUP;
} }
/* see if they specified a process to signal, or if we /* see if they specified a process to signal, or if we
@ -676,7 +659,7 @@ static void orte_daemon_recv_pls(int status, orte_process_name_t* sender,
/* unpack the notify data object */ /* unpack the notify data object */
if (ORTE_SUCCESS != (ret = orte_dss.unpack(buffer, &ndat, &n, ORTE_GPR_NOTIFY_DATA))) { if (ORTE_SUCCESS != (ret = orte_dss.unpack(buffer, &ndat, &n, ORTE_GPR_NOTIFY_DATA))) {
ORTE_ERROR_LOG(ret); ORTE_ERROR_LOG(ret);
goto DONE; goto CLEANUP;
} }
/* launch the processes */ /* launch the processes */
@ -706,13 +689,6 @@ static void orte_daemon_recv_pls(int status, orte_process_name_t* sender,
break; break;
} }
DONE:
/* send the response */
if (0 > orte_rml.send_buffer(sender, answer, ORTE_RML_TAG_PLS_ORTED_ACK, 0)) {
ORTE_ERROR_LOG(ORTE_ERR_COMM_FAILURE);
}
OBJ_RELEASE(answer);
CLEANUP: CLEANUP:
OPAL_THREAD_UNLOCK(&orted_globals.mutex); OPAL_THREAD_UNLOCK(&orted_globals.mutex);