1
1

Create the debugger attach fifo unless the user requests that we periodically poll insteaad.

This commit was SVN r25714.
Этот коммит содержится в:
Ralph Castain 2012-01-11 19:44:22 +00:00
родитель bf103de66c
Коммит ce7ddd0e10
4 изменённых файлов: 7 добавлений и 11 удалений

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

@ -11,6 +11,8 @@
* All rights reserved. * All rights reserved.
* Copyright (c) 2007-2011 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2007-2011 Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2009-2010 Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2009-2010 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2011 Los Alamos National Security, LLC. All rights
* reserved.
* $COPYRIGHT$ * $COPYRIGHT$
* *
* Additional copyrights may follow * Additional copyrights may follow
@ -94,7 +96,6 @@ orte_job_t *orte_debugger_daemon=NULL;
bool orte_debugger_dump_proctable; bool orte_debugger_dump_proctable;
char *orte_debugger_test_daemon; char *orte_debugger_test_daemon;
bool orte_debugger_test_attach; bool orte_debugger_test_attach;
bool orte_debugger_enable_fifo_attach;
int orte_debugger_check_rate; int orte_debugger_check_rate;
/* exit flags */ /* exit flags */

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

@ -11,6 +11,8 @@
* All rights reserved. * All rights reserved.
* Copyright (c) 2007-2010 Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2007-2010 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2007-2011 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2007-2011 Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2011 Los Alamos National Security, LLC. All rights
* reserved.
* $COPYRIGHT$ * $COPYRIGHT$
* *
* Additional copyrights may follow * Additional copyrights may follow
@ -560,7 +562,6 @@ ORTE_DECLSPEC extern orte_job_t *orte_debugger_daemon;
ORTE_DECLSPEC extern bool orte_debugger_dump_proctable; ORTE_DECLSPEC extern bool orte_debugger_dump_proctable;
ORTE_DECLSPEC extern char *orte_debugger_test_daemon; ORTE_DECLSPEC extern char *orte_debugger_test_daemon;
ORTE_DECLSPEC extern bool orte_debugger_test_attach; ORTE_DECLSPEC extern bool orte_debugger_test_attach;
ORTE_DECLSPEC extern bool orte_debugger_enable_fifo_attach;
ORTE_DECLSPEC extern int orte_debugger_check_rate; ORTE_DECLSPEC extern int orte_debugger_check_rate;
/* exit flags */ /* exit flags */

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

@ -145,7 +145,7 @@ int orte_register_params(void)
false, false, (int)false, &value); false, false, (int)false, &value);
orte_leave_session_attached = OPAL_INT_TO_BOOL(value); orte_leave_session_attached = OPAL_INT_TO_BOOL(value);
/* See comment in orte/tools/orterun/debuggers.c about this MCA /* See comment in orte/tools/orterun/orterun.c about this MCA
param (this param is internal) */ param (this param is internal) */
mca_base_param_reg_int_name("orte", mca_base_param_reg_int_name("orte",
"in_parallel_debugger", "in_parallel_debugger",
@ -170,12 +170,6 @@ int orte_register_params(void)
false, false, 0, &value); false, false, 0, &value);
orte_debugger_test_attach = OPAL_INT_TO_BOOL(value); orte_debugger_test_attach = OPAL_INT_TO_BOOL(value);
mca_base_param_reg_int_name("orte",
"debugger_fifo_attach",
"Create a fifo to support debugger attachment",
false, false, 0, &value);
orte_debugger_enable_fifo_attach = OPAL_INT_TO_BOOL(value);
mca_base_param_reg_int_name("orte", mca_base_param_reg_int_name("orte",
"debugger_check_rate", "debugger_check_rate",
"Set rate (in secs) for auto-detect of debugger attachment (0 => do not check)", "Set rate (in secs) for auto-detect of debugger attachment (0 => do not check)",

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

@ -2261,8 +2261,8 @@ static void orte_debugger_init_before_spawn(orte_job_t *jdata)
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(ORTE_PROC_MY_NAME),
orte_debugger_check_rate); orte_debugger_check_rate);
ORTE_TIMER_EVENT(orte_debugger_check_rate, 0, attach_debugger); ORTE_TIMER_EVENT(orte_debugger_check_rate, 0, attach_debugger);
} else if (orte_debugger_enable_fifo_attach) { } else {
/* create the attachment FIFO and put it into MPIR, setup readevent */ /* create the attachment FIFO and setup readevent */
/* create a FIFO name in the session dir */ /* create a FIFO name in the session dir */
attach_fifo = opal_os_path(false, orte_process_info.job_session_dir, "debugger_attach_fifo", NULL); attach_fifo = opal_os_path(false, orte_process_info.job_session_dir, "debugger_attach_fifo", NULL);
if ((mkfifo(attach_fifo, FILE_MODE) < 0) && errno != EEXIST) { if ((mkfifo(attach_fifo, FILE_MODE) < 0) && errno != EEXIST) {