diff --git a/orte/mca/odls/odls_types.h b/orte/mca/odls/odls_types.h index 0dcf2fc876..e2d9c74f89 100644 --- a/orte/mca/odls/odls_types.h +++ b/orte/mca/odls/odls_types.h @@ -40,22 +40,19 @@ typedef uint8_t orte_daemon_cmd_flag_t; #define ORTE_DAEMON_EXIT_CMD (orte_daemon_cmd_flag_t) 6 #define ORTE_DAEMON_PROCESS_AND_RELAY_CMD (orte_daemon_cmd_flag_t) 7 #define ORTE_DAEMON_MESSAGE_LOCAL_PROCS (orte_daemon_cmd_flag_t) 8 -#define ORTE_DAEMON_ROUTE_NONE (orte_daemon_cmd_flag_t) 9 -#define ORTE_DAEMON_ROUTE_BINOMIAL (orte_daemon_cmd_flag_t) 10 -#define ORTE_DAEMON_WARMUP_LOCAL_CONN (orte_daemon_cmd_flag_t) 11 -#define ORTE_DAEMON_NULL_CMD (orte_daemon_cmd_flag_t) 12 -#define ORTE_DAEMON_SYNC_BY_PROC (orte_daemon_cmd_flag_t) 13 +#define ORTE_DAEMON_NULL_CMD (orte_daemon_cmd_flag_t) 9 +#define ORTE_DAEMON_SYNC_BY_PROC (orte_daemon_cmd_flag_t) 10 /* commands for use by tools */ -#define ORTE_DAEMON_REPORT_JOB_INFO_CMD (orte_daemon_cmd_flag_t) 14 -#define ORTE_DAEMON_REPORT_NODE_INFO_CMD (orte_daemon_cmd_flag_t) 15 -#define ORTE_DAEMON_REPORT_PROC_INFO_CMD (orte_daemon_cmd_flag_t) 16 -#define ORTE_DAEMON_ATTACH_STDOUT_CMD (orte_daemon_cmd_flag_t) 17 -#define ORTE_DAEMON_ATTACH_STDERR_CMD (orte_daemon_cmd_flag_t) 18 -#define ORTE_DAEMON_DETACH_STDOUT_CMD (orte_daemon_cmd_flag_t) 19 -#define ORTE_DAEMON_DETACH_STDERR_CMD (orte_daemon_cmd_flag_t) 20 -#define ORTE_DAEMON_SPAWN_JOB_CMD (orte_daemon_cmd_flag_t) 21 -#define ORTE_DAEMON_TERMINATE_JOB_CMD (orte_daemon_cmd_flag_t) 22 +#define ORTE_DAEMON_REPORT_JOB_INFO_CMD (orte_daemon_cmd_flag_t) 11 +#define ORTE_DAEMON_REPORT_NODE_INFO_CMD (orte_daemon_cmd_flag_t) 12 +#define ORTE_DAEMON_REPORT_PROC_INFO_CMD (orte_daemon_cmd_flag_t) 13 +#define ORTE_DAEMON_ATTACH_STDOUT_CMD (orte_daemon_cmd_flag_t) 14 +#define ORTE_DAEMON_ATTACH_STDERR_CMD (orte_daemon_cmd_flag_t) 15 +#define ORTE_DAEMON_DETACH_STDOUT_CMD (orte_daemon_cmd_flag_t) 16 +#define ORTE_DAEMON_DETACH_STDERR_CMD (orte_daemon_cmd_flag_t) 17 +#define ORTE_DAEMON_SPAWN_JOB_CMD (orte_daemon_cmd_flag_t) 18 +#define ORTE_DAEMON_TERMINATE_JOB_CMD (orte_daemon_cmd_flag_t) 19 END_C_DECLS diff --git a/orte/mca/oob/base/base.h b/orte/mca/oob/base/base.h index c94b26c334..270d1a37a7 100644 --- a/orte/mca/oob/base/base.h +++ b/orte/mca/oob/base/base.h @@ -46,7 +46,6 @@ BEGIN_C_DECLS * global flag for use in timing tests */ ORTE_DECLSPEC extern int mca_oob_base_output; -ORTE_DECLSPEC extern orte_std_cntr_t orte_oob_xcast_num_active; /* * Flag indicating if this framework has been opened diff --git a/orte/mca/oob/base/oob_base_open.c b/orte/mca/oob/base/oob_base_open.c index 13ed3ad13f..10666b11f5 100644 --- a/orte/mca/oob/base/oob_base_open.c +++ b/orte/mca/oob/base/oob_base_open.c @@ -44,7 +44,6 @@ mca_oob_t mca_oob; int mca_oob_base_output = -1; opal_list_t mca_oob_base_components; opal_list_t mca_oob_base_modules; -orte_std_cntr_t orte_oob_xcast_num_active; bool orte_oob_base_already_opened = false; diff --git a/orte/orted/orted_comm.c b/orte/orted/orted_comm.c index 1ff4796d5d..c5edf2985b 100644 --- a/orte/orted/orted_comm.c +++ b/orte/orted/orted_comm.c @@ -823,24 +823,14 @@ SEND_ANSWER: } } #endif -break; - + break; + /**** HEARTBEAT COMMAND ****/ case ORTE_DAEMON_HEARTBEAT_CMD: ORTE_ERROR_LOG(ORTE_ERR_NOT_IMPLEMENTED); ret = ORTE_ERR_NOT_IMPLEMENTED; break; - /**** WARMUP CONNECTION TO LOCAL PROC ****/ - case ORTE_DAEMON_WARMUP_LOCAL_CONN: - /* nothing to do here - just ignore it */ - if (orte_debug_daemons_flag) { - opal_output(0, "%s orted_recv: received connection from local proc", - ORTE_NAME_PRINT(ORTE_PROC_MY_NAME)); - } - ret = ORTE_SUCCESS; - break; - /**** SYNC FROM LOCAL PROC ****/ case ORTE_DAEMON_SYNC_BY_PROC: if (orte_debug_daemons_flag) { diff --git a/orte/runtime/orte_wait.c b/orte/runtime/orte_wait.c index 2b05792b3e..9515b38520 100644 --- a/orte/runtime/orte_wait.c +++ b/orte/runtime/orte_wait.c @@ -75,6 +75,9 @@ static opal_list_t registered_cb; static void message_event_destructor(orte_message_event_t *ev) { OBJ_RELEASE(ev->buffer); +#if OMPI_ENABLE_DEBUG + ev->file = NULL; +#endif } static void message_event_constructor(orte_message_event_t *ev) diff --git a/orte/runtime/orte_wait.h b/orte/runtime/orte_wait.h index 0d9143559a..048fcae0d5 100644 --- a/orte/runtime/orte_wait.h +++ b/orte/runtime/orte_wait.h @@ -152,9 +152,36 @@ typedef struct { orte_process_name_t sender; opal_buffer_t *buffer; orte_rml_tag_t tag; + char *file; + int line; } orte_message_event_t; ORTE_DECLSPEC OBJ_CLASS_DECLARATION(orte_message_event_t); +#if OMPI_ENABLE_DEBUG + +#define ORTE_MESSAGE_EVENT(sndr, buf, tg, cbfunc) \ + do { \ + orte_message_event_t *mev; \ + struct timeval now; \ + opal_event_t *tmp; \ + OPAL_OUTPUT_VERBOSE((1, orte_debug_output, \ + "defining message event: %s %d", \ + __FILE__, __LINE__)); \ + tmp = (opal_event_t*)malloc(sizeof(opal_event_t)); \ + mev = OBJ_NEW(orte_message_event_t); \ + mev->sender.jobid = (sndr)->jobid; \ + mev->sender.vpid = (sndr)->vpid; \ + opal_dss.copy_payload(mev->buffer, (buf)); \ + mev->tag = (tg); \ + mev->file = strdup((buf)->parent.cls_init_file_name); \ + mev->line = (buf)->parent.cls_init_lineno; \ + opal_evtimer_set(tmp, (cbfunc), mev); \ + now.tv_sec = 0; \ + now.tv_usec = 0; \ + opal_evtimer_add(tmp, &now); \ + } while(0); +#else + #define ORTE_MESSAGE_EVENT(sndr, buf, tg, cbfunc) \ do { \ orte_message_event_t *mev; \ @@ -174,6 +201,8 @@ ORTE_DECLSPEC OBJ_CLASS_DECLARATION(orte_message_event_t); now.tv_usec = 0; \ opal_evtimer_add(tmp, &now); \ } while(0); + +#endif /**