1
1
This commit was SVN r24722.
Этот коммит содержится в:
Ralph Castain 2011-05-21 21:09:47 +00:00
родитель ca5af216b6
Коммит b2331113a5

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

@ -2983,9 +2983,17 @@ int orte_odls_base_default_kill_local_procs(opal_pointer_array_t *procs,
If it is in a stopped state and we do not first change it to
running, then SIGTERM will not get delivered. Ignore return
value. */
OPAL_OUTPUT_VERBOSE((5, orte_odls_base.output,
"%s SENDING SIGCONT TO %s",
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME),
ORTE_NAME_PRINT(child->name)));
kill_local(child->pid, SIGCONT);
/* Send a sigterm to the process before sigkill to be nice */
OPAL_OUTPUT_VERBOSE((5, orte_odls_base.output,
"%s SENDING SIGTERM TO %s",
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME),
ORTE_NAME_PRINT(child->name)));
kill_local(child->pid, SIGTERM);
/* check to see if it died - the child_died function will continue
@ -2993,6 +3001,10 @@ int orte_odls_base_default_kill_local_procs(opal_pointer_array_t *procs,
*/
if (!child_died(child)) {
/* if it still isn't dead, try killing it one more time */
OPAL_OUTPUT_VERBOSE((5, orte_odls_base.output,
"%s SENDING SIGKILL TO %s",
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME),
ORTE_NAME_PRINT(child->name)));
kill_local(child->pid, SIGKILL);
/* Double check that it actually died this time */
if (!child_died(child)) {
@ -3008,6 +3020,10 @@ int orte_odls_base_default_kill_local_procs(opal_pointer_array_t *procs,
* It does this to avoid a race condition, per documentation
* in odls_default_module.c.
*/
OPAL_OUTPUT_VERBOSE((5, orte_odls_globals.output,
"%s SENDING FORCE SIGKILL TO %s",
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME),
ORTE_NAME_PRINT(child->name)));
kill_local(child->pid, SIGKILL);
/* Double check that it actually died this time */
if (!child_died(child)) {