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

Allow the passing of NULL to orte_plm.kill_local_procs to match what we allow for the equivalent orte_odls call

Просмотр исходного кода 
This commit was SVN r23436.
Этот коммит содержится в:
Ralph Castain 2010-07-20 04:05:41 +00:00
родитель 519bbf6b6b
Коммит 72525a5850
1 изменённых файлов: 29 добавлений и 26 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

55
orte/mca/plm/base/plm_base_orted_cmds.c
Просмотреть файл

@ -254,29 +254,12 @@ int orte_plm_base_orted_kill_local_procs(opal_pointer_array_t *procs)
orte_process_name_t peer; orte_process_name_t peer;
orte_job_t *daemons; orte_job_t *daemons;
orte_proc_t *proc; orte_proc_t *proc;
int32_t num_procs; int32_t num_procs=0;
OPAL_OUTPUT_VERBOSE((5, orte_plm_globals.output, OPAL_OUTPUT_VERBOSE((5, orte_plm_globals.output,
"%s plm:base:orted_cmd sending kill_local_procs cmds", "%s plm:base:orted_cmd sending kill_local_procs cmds",
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME))); ORTE_NAME_PRINT(ORTE_PROC_MY_NAME)));
/* count the number of procs */
num_procs = 0;
for (v=0; v < procs->size; v++) {
if (NULL == opal_pointer_array_get_item(procs, v)) {
continue;
}
num_procs++;
}
/* bozo check */
if (0 == num_procs) {
OPAL_OUTPUT_VERBOSE((5, orte_plm_globals.output,
"%s plm:base:orted_cmd:kill_local_procs no procs given",
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME)));
return ORTE_SUCCESS;
}
OBJ_CONSTRUCT(&cmd, opal_buffer_t); OBJ_CONSTRUCT(&cmd, opal_buffer_t);
/* pack the command */ /* pack the command */
@ -286,6 +269,24 @@ int orte_plm_base_orted_kill_local_procs(opal_pointer_array_t *procs)
return rc; return rc;
} }
if (NULL != procs) {
/* count the number of procs */
for (v=0; v < procs->size; v++) {
if (NULL == opal_pointer_array_get_item(procs, v)) {
continue;
}
num_procs++;
}
/* bozo check */
if (0 == num_procs) {
OPAL_OUTPUT_VERBOSE((5, orte_plm_globals.output,
"%s plm:base:orted_cmd:kill_local_procs no procs given",
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME)));
return ORTE_SUCCESS;
}
}
/* pack the number of procs */ /* pack the number of procs */
if (ORTE_SUCCESS != (rc = opal_dss.pack(&cmd, &num_procs, 1, OPAL_INT32))) { if (ORTE_SUCCESS != (rc = opal_dss.pack(&cmd, &num_procs, 1, OPAL_INT32))) {
ORTE_ERROR_LOG(rc); ORTE_ERROR_LOG(rc);
@ -294,14 +295,16 @@ int orte_plm_base_orted_kill_local_procs(opal_pointer_array_t *procs)
} }
/* pack the proc names */ /* pack the proc names */
for (v=0; v < procs->size; v++) { if (NULL != procs) {
if (NULL == (proc = (orte_proc_t*)opal_pointer_array_get_item(procs, v))) { for (v=0; v < procs->size; v++) {
continue; if (NULL == (proc = (orte_proc_t*)opal_pointer_array_get_item(procs, v))) {
} continue;
if (ORTE_SUCCESS != (rc = opal_dss.pack(&cmd, &(proc->name), 1, ORTE_NAME))) { }
ORTE_ERROR_LOG(rc); if (ORTE_SUCCESS != (rc = opal_dss.pack(&cmd, &(proc->name), 1, ORTE_NAME))) {
OBJ_DESTRUCT(&cmd); ORTE_ERROR_LOG(rc);
return rc; OBJ_DESTRUCT(&cmd);
return rc;
}
} }
} }