diff --git a/orte/mca/grpcomm/base/base.h b/orte/mca/grpcomm/base/base.h index 237f82eaed..4ff630128e 100644 --- a/orte/mca/grpcomm/base/base.h +++ b/orte/mca/grpcomm/base/base.h @@ -55,7 +55,6 @@ ORTE_DECLSPEC int orte_grpcomm_base_select(void); * globals that might be needed */ typedef struct { - int output; orte_grpcomm_coll_id_t coll_id; opal_list_t active_colls; #if OPAL_HAVE_HWLOC @@ -73,7 +72,7 @@ OBJ_CLASS_DECLARATION(orte_grpcomm_caddy_t); #define ORTE_GRPCOMM_ACTIVATE(o, cb) \ do { \ orte_grpcomm_caddy_t *caddy; \ - OPAL_OUTPUT_VERBOSE((5, orte_grpcomm_base.output, \ + OPAL_OUTPUT_VERBOSE((5, orte_grpcomm_base_framework.framework_output, \ "%s ACTIVATING GRCPCOMM OP %d at %s:%d", \ ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), \ (o)->id, __FILE__, __LINE__)); \ diff --git a/orte/mca/grpcomm/base/grpcomm_base_frame.c b/orte/mca/grpcomm/base/grpcomm_base_frame.c index 5e097acba6..ead18c35b3 100644 --- a/orte/mca/grpcomm/base/grpcomm_base_frame.c +++ b/orte/mca/grpcomm/base/grpcomm_base_frame.c @@ -66,10 +66,6 @@ static int orte_grpcomm_base_close(void) */ static int orte_grpcomm_base_open(mca_base_open_flag_t flags) { - /* Debugging / verbose output. Always have stream open, with - verbose set by the mca open system... */ - orte_grpcomm_base.output = opal_output_open(NULL); - /* init globals */ OBJ_CONSTRUCT(&orte_grpcomm_base.active_colls, opal_list_t); orte_grpcomm_base.coll_id = 0; diff --git a/orte/mca/grpcomm/base/grpcomm_base_modex.c b/orte/mca/grpcomm/base/grpcomm_base_modex.c index e9f826fd95..5ec6300619 100644 --- a/orte/mca/grpcomm/base/grpcomm_base_modex.c +++ b/orte/mca/grpcomm/base/grpcomm_base_modex.c @@ -72,7 +72,7 @@ void orte_grpcomm_base_modex(int fd, short args, void *cbdata) bool found; orte_grpcomm_collective_t *cptr; - OPAL_OUTPUT_VERBOSE((1, orte_grpcomm_base.output, + OPAL_OUTPUT_VERBOSE((1, orte_grpcomm_base_framework.framework_output, "%s grpcomm:base:modex: performing modex", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME))); @@ -107,7 +107,7 @@ void orte_grpcomm_base_modex(int fd, short args, void *cbdata) item != opal_list_get_end(&orte_grpcomm_base.active_colls); item = opal_list_get_next(item)) { cptr = (orte_grpcomm_collective_t*)item; - OPAL_OUTPUT_VERBOSE((5, orte_grpcomm_base.output, + OPAL_OUTPUT_VERBOSE((5, orte_grpcomm_base_framework.framework_output, "%s CHECKING COLL id %d", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), cptr->id)); @@ -197,7 +197,7 @@ void orte_grpcomm_base_modex(int fd, short args, void *cbdata) goto cleanup; } - OPAL_OUTPUT_VERBOSE((2, orte_grpcomm_base.output, + OPAL_OUTPUT_VERBOSE((2, orte_grpcomm_base_framework.framework_output, "%s grpcomm:base:full:modex: executing allgather", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME))); @@ -207,7 +207,7 @@ void orte_grpcomm_base_modex(int fd, short args, void *cbdata) goto cleanup; } - OPAL_OUTPUT_VERBOSE((2, orte_grpcomm_base.output, + OPAL_OUTPUT_VERBOSE((2, orte_grpcomm_base_framework.framework_output, "%s grpcomm:base:modex: modex posted", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME))); @@ -228,7 +228,7 @@ void orte_grpcomm_base_store_peer_modex(opal_buffer_t *rbuf, void *cbdata) orte_grpcomm_collective_t *modex = (orte_grpcomm_collective_t*)cbdata; opal_hwloc_locality_t locality; - OPAL_OUTPUT_VERBOSE((2, orte_grpcomm_base.output, + OPAL_OUTPUT_VERBOSE((2, orte_grpcomm_base_framework.framework_output, "%s STORING PEER MODEX DATA", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME))); @@ -294,21 +294,21 @@ void orte_grpcomm_base_store_peer_modex(opal_buffer_t *rbuf, void *cbdata) ORTE_ERROR_LOG(rc); goto cleanup; } - OPAL_OUTPUT_VERBOSE((2, orte_grpcomm_base.output, + OPAL_OUTPUT_VERBOSE((2, orte_grpcomm_base_framework.framework_output, "%s store:peer:modex setting proc %s cpuset %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(&pname), cpuset)); if (OPAL_EQUAL == orte_util_compare_name_fields(ORTE_NS_CMP_ALL, &pname, ORTE_PROC_MY_NAME)) { /* if this data is from myself, then set locality to all */ - OPAL_OUTPUT_VERBOSE((5, orte_grpcomm_base.output, + OPAL_OUTPUT_VERBOSE((5, orte_grpcomm_base_framework.framework_output, "%s store:peer:modex setting proc %s locale ALL", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(&pname))); locality = OPAL_PROC_ALL_LOCAL; } else if (daemon != ORTE_PROC_MY_DAEMON->vpid) { /* this is on a different node, then mark as non-local */ - OPAL_OUTPUT_VERBOSE((5, orte_grpcomm_base.output, + OPAL_OUTPUT_VERBOSE((5, orte_grpcomm_base_framework.framework_output, "%s store:peer:modex setting proc %s locale NONLOCAL", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(&pname))); @@ -323,7 +323,7 @@ void orte_grpcomm_base_store_peer_modex(opal_buffer_t *rbuf, void *cbdata) locality = opal_hwloc_base_get_relative_locality(opal_hwloc_topology, orte_process_info.cpuset, cpuset); - OPAL_OUTPUT_VERBOSE((5, orte_grpcomm_base.output, + OPAL_OUTPUT_VERBOSE((5, orte_grpcomm_base_framework.framework_output, "%s store:peer:modex setting proc %s locale %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(&pname), @@ -333,14 +333,14 @@ void orte_grpcomm_base_store_peer_modex(opal_buffer_t *rbuf, void *cbdata) #else if (OPAL_EQUAL == orte_util_compare_name_fields(ORTE_NS_CMP_ALL, &pname, ORTE_PROC_MY_NAME)) { /* if this data is from myself, then set locality to all */ - OPAL_OUTPUT_VERBOSE((5, orte_grpcomm_base.output, + OPAL_OUTPUT_VERBOSE((5, orte_grpcomm_base_framework.framework_output, "%s grpcomm:base:modex setting proc %s locale ALL", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(&pname))); locality = OPAL_PROC_ALL_LOCAL; } else if (daemon != ORTE_PROC_MY_DAEMON->vpid) { /* this is on a different node, then mark as non-local */ - OPAL_OUTPUT_VERBOSE((5, orte_grpcomm_base.output, + OPAL_OUTPUT_VERBOSE((5, orte_grpcomm_base_framework.framework_output, "%s store:peer:modex setting proc %s locale NONLOCAL", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(&pname))); @@ -355,7 +355,7 @@ void orte_grpcomm_base_store_peer_modex(opal_buffer_t *rbuf, void *cbdata) goto cleanup; } - OPAL_OUTPUT_VERBOSE((5, orte_grpcomm_base.output, + OPAL_OUTPUT_VERBOSE((5, orte_grpcomm_base_framework.framework_output, "%s store:peer:modex: adding modex entry for proc %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(&pname))); @@ -365,7 +365,7 @@ void orte_grpcomm_base_store_peer_modex(opal_buffer_t *rbuf, void *cbdata) ORTE_ERROR_LOG(rc); goto cleanup; } - OPAL_OUTPUT_VERBOSE((5, orte_grpcomm_base.output, + OPAL_OUTPUT_VERBOSE((5, orte_grpcomm_base_framework.framework_output, "%s store:peer:modex: completed modex entry for proc %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(&pname))); @@ -380,12 +380,12 @@ void orte_grpcomm_base_store_peer_modex(opal_buffer_t *rbuf, void *cbdata) opal_list_remove_item(&orte_grpcomm_base.active_colls, &modex->super); /* notify that the modex is complete */ if (NULL != modex->cbfunc) { - OPAL_OUTPUT_VERBOSE((2, orte_grpcomm_base.output, + OPAL_OUTPUT_VERBOSE((2, orte_grpcomm_base_framework.framework_output, "%s CALLING MODEX RELEASE", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME))); modex->cbfunc(NULL, modex->cbdata); } else { - OPAL_OUTPUT_VERBOSE((2, orte_grpcomm_base.output, + OPAL_OUTPUT_VERBOSE((2, orte_grpcomm_base_framework.framework_output, "%s store:peer:modex NO MODEX RELEASE CBFUNC", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME))); } @@ -398,7 +398,7 @@ void orte_grpcomm_base_store_modex(opal_buffer_t *rbuf, void *cbdata) int rc=ORTE_SUCCESS; orte_grpcomm_collective_t *modex = (orte_grpcomm_collective_t*)cbdata; - OPAL_OUTPUT_VERBOSE((2, orte_grpcomm_base.output, + OPAL_OUTPUT_VERBOSE((2, orte_grpcomm_base_framework.framework_output, "%s STORING MODEX DATA", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME))); @@ -406,7 +406,7 @@ void orte_grpcomm_base_store_modex(opal_buffer_t *rbuf, void *cbdata) cnt=1; while (ORTE_SUCCESS == (rc = opal_dss.unpack(rbuf, &proc_name, &cnt, ORTE_NAME))) { - OPAL_OUTPUT_VERBOSE((5, orte_grpcomm_base.output, + OPAL_OUTPUT_VERBOSE((5, orte_grpcomm_base_framework.framework_output, "%s grpcomm:base:store_modex adding modex entry for proc %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(&proc_name))); @@ -428,7 +428,7 @@ void orte_grpcomm_base_store_modex(opal_buffer_t *rbuf, void *cbdata) opal_list_remove_item(&orte_grpcomm_base.active_colls, &modex->super); /* execute user callback, if requested */ if (NULL != modex->cbfunc) { - OPAL_OUTPUT_VERBOSE((2, orte_grpcomm_base.output, + OPAL_OUTPUT_VERBOSE((2, orte_grpcomm_base_framework.framework_output, "%s CALLING MODEX RELEASE", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME))); modex->cbfunc(NULL, modex->cbdata); @@ -452,7 +452,7 @@ int orte_grpcomm_base_update_modex_entries(orte_process_name_t *proc_name, goto cleanup; } - OPAL_OUTPUT_VERBOSE((5, orte_grpcomm_base.output, + OPAL_OUTPUT_VERBOSE((5, orte_grpcomm_base_framework.framework_output, "%s grpcomm:base:update_modex_entries: adding %d entries for proc %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), num_recvd_entries, ORTE_NAME_PRINT(proc_name))); @@ -519,7 +519,7 @@ int orte_grpcomm_base_pack_modex_entries(opal_buffer_t *buf) item = next; } - OPAL_OUTPUT_VERBOSE((5, orte_grpcomm_base.output, + OPAL_OUTPUT_VERBOSE((5, orte_grpcomm_base_framework.framework_output, "%s grpcomm:base:pack_modex: reporting %d entries", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), num_entries)); diff --git a/orte/mca/grpcomm/base/grpcomm_base_receive.c b/orte/mca/grpcomm/base/grpcomm_base_receive.c index 2df1e9a8ef..14e5776f54 100644 --- a/orte/mca/grpcomm/base/grpcomm_base_receive.c +++ b/orte/mca/grpcomm/base/grpcomm_base_receive.c @@ -62,7 +62,7 @@ int orte_grpcomm_base_comm_start(void) { int rc; - OPAL_OUTPUT_VERBOSE((5, orte_grpcomm_base.output, + OPAL_OUTPUT_VERBOSE((5, orte_grpcomm_base_framework.framework_output, "%s grpcomm:base:receive start comm", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME))); @@ -132,7 +132,7 @@ int orte_grpcomm_base_comm_start(void) void orte_grpcomm_base_comm_stop(void) { - OPAL_OUTPUT_VERBOSE((5, orte_grpcomm_base.output, + OPAL_OUTPUT_VERBOSE((5, orte_grpcomm_base_framework.framework_output, "%s grpcomm:base:receive stop comm", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME))); if (recv_issued) { @@ -157,7 +157,7 @@ static void coll_id_req(int status, orte_process_name_t* sender, int rc; id = orte_grpcomm_base_get_coll_id(); - OPAL_OUTPUT_VERBOSE((5, orte_grpcomm_base.output, + OPAL_OUTPUT_VERBOSE((5, orte_grpcomm_base_framework.framework_output, "%s grpcomm:base:receive proc %s requested coll id - returned id %d", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(sender), id)); @@ -194,7 +194,7 @@ static void app_recv(int status, orte_process_name_t* sender, return; } - OPAL_OUTPUT_VERBOSE((5, orte_grpcomm_base.output, + OPAL_OUTPUT_VERBOSE((5, orte_grpcomm_base_framework.framework_output, "%s grpcomm:base:receive processing collective return for id %d recvd from %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), id, ORTE_NAME_PRINT(sender))); @@ -208,7 +208,7 @@ static void app_recv(int status, orte_process_name_t* sender, item != opal_list_get_end(&orte_grpcomm_base.active_colls); item = opal_list_get_next(item)) { coll = (orte_grpcomm_collective_t*)item; - OPAL_OUTPUT_VERBOSE((5, orte_grpcomm_base.output, + OPAL_OUTPUT_VERBOSE((5, orte_grpcomm_base_framework.framework_output, "%s CHECKING COLL id %d", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), coll->id)); @@ -226,7 +226,7 @@ static void app_recv(int status, orte_process_name_t* sender, opal_list_remove_item(&orte_grpcomm_base.active_colls, item); /* callback the specified function */ if (NULL != coll->cbfunc) { - OPAL_OUTPUT_VERBOSE((5, orte_grpcomm_base.output, + OPAL_OUTPUT_VERBOSE((5, orte_grpcomm_base_framework.framework_output, "%s grpcomm:base:receive executing callback", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME))); @@ -253,7 +253,7 @@ static void app_recv(int status, orte_process_name_t* sender, item != opal_list_get_end(&orte_grpcomm_base.active_colls); item = opal_list_get_next(item)) { cptr = (orte_grpcomm_collective_t*)item; - OPAL_OUTPUT_VERBOSE((5, orte_grpcomm_base.output, + OPAL_OUTPUT_VERBOSE((5, orte_grpcomm_base_framework.framework_output, "%s CHECKING COLL id %d", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), cptr->id)); @@ -307,7 +307,7 @@ static void app_recv(int status, orte_process_name_t* sender, opal_list_remove_item(&orte_grpcomm_base.active_colls, item); /* callback the specified function */ if (NULL != coll->cbfunc) { - OPAL_OUTPUT_VERBOSE((5, orte_grpcomm_base.output, + OPAL_OUTPUT_VERBOSE((5, orte_grpcomm_base_framework.framework_output, "%s grpcomm:base:receive executing callback", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME))); @@ -329,7 +329,7 @@ static void daemon_local_recv(int status, orte_process_name_t* sender, orte_grpcomm_collective_t *coll; orte_grpcomm_coll_id_t id; - OPAL_OUTPUT_VERBOSE((5, orte_grpcomm_base.output, + OPAL_OUTPUT_VERBOSE((5, orte_grpcomm_base_framework.framework_output, "%s COLLECTIVE RECVD FROM %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(sender))); @@ -341,7 +341,7 @@ static void daemon_local_recv(int status, orte_process_name_t* sender, return; } - OPAL_OUTPUT_VERBOSE((5, orte_grpcomm_base.output, + OPAL_OUTPUT_VERBOSE((5, orte_grpcomm_base_framework.framework_output, "%s WORKING COLLECTIVE %d", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), id)); @@ -354,7 +354,7 @@ static void daemon_local_recv(int status, orte_process_name_t* sender, coll->num_local_recvd++; opal_dss.copy_payload(&coll->local_bucket, buffer); - OPAL_OUTPUT_VERBOSE((5, orte_grpcomm_base.output, + OPAL_OUTPUT_VERBOSE((5, orte_grpcomm_base_framework.framework_output, "%s PROGRESSING COLLECTIVE %d", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), id)); orte_grpcomm_base_progress_collectives(); @@ -402,13 +402,13 @@ void orte_grpcomm_base_progress_collectives(void) item = opal_list_get_first(&orte_grpcomm_base.active_colls); while (item != opal_list_get_end(&orte_grpcomm_base.active_colls)) { coll = (orte_grpcomm_collective_t*)item; - OPAL_OUTPUT_VERBOSE((5, orte_grpcomm_base.output, + OPAL_OUTPUT_VERBOSE((5, orte_grpcomm_base_framework.framework_output, "%s PROGRESSING COLL id %d", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), coll->id)); /* if this collective is already locally complete, then ignore it */ if (coll->locally_complete) { - OPAL_OUTPUT_VERBOSE((5, orte_grpcomm_base.output, + OPAL_OUTPUT_VERBOSE((5, orte_grpcomm_base_framework.framework_output, "%s COLL %d IS LOCALLY COMPLETE", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), coll->id)); @@ -424,21 +424,21 @@ void orte_grpcomm_base_progress_collectives(void) /* if the job object isn't found, then we can't progress * this collective */ - OPAL_OUTPUT_VERBOSE((5, orte_grpcomm_base.output, + OPAL_OUTPUT_VERBOSE((5, orte_grpcomm_base_framework.framework_output, "%s COLL %d JOBID %s NOT FOUND", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), coll->id, ORTE_JOBID_PRINT(nm->name.jobid))); goto next_coll; } /* all local procs from this job are required to participate */ - OPAL_OUTPUT_VERBOSE((5, orte_grpcomm_base.output, + OPAL_OUTPUT_VERBOSE((5, orte_grpcomm_base_framework.framework_output, "%s ALL LOCAL PROCS FOR JOB %s CONTRIBUTE %d", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_JOBID_PRINT(jdata->jobid), (int)jdata->num_local_procs)); /* see if all reqd participants are done */ if (jdata->num_local_procs == coll->num_local_recvd) { - OPAL_OUTPUT_VERBOSE((5, orte_grpcomm_base.output, + OPAL_OUTPUT_VERBOSE((5, orte_grpcomm_base_framework.framework_output, "%s COLLECTIVE %d LOCALLY COMPLETE - SENDING TO GLOBAL COLLECTIVE", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), coll->id)); /* mark it as locally complete */ @@ -477,7 +477,7 @@ static void daemon_coll_recv(int status, orte_process_name_t* sender, opal_buffer_t *relay; orte_jobid_t jobid; - OPAL_OUTPUT_VERBOSE((5, orte_grpcomm_base.output, + OPAL_OUTPUT_VERBOSE((5, orte_grpcomm_base_framework.framework_output, "%s grpcomm:base:daemon_coll: daemon collective recvd from %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(sender))); @@ -489,7 +489,7 @@ static void daemon_coll_recv(int status, orte_process_name_t* sender, return; } - OPAL_OUTPUT_VERBOSE((5, orte_grpcomm_base.output, + OPAL_OUTPUT_VERBOSE((5, orte_grpcomm_base_framework.framework_output, "%s grpcomm:base:daemon_coll: WORKING COLLECTIVE %d", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), id)); @@ -528,7 +528,7 @@ static void daemon_coll_recv(int status, orte_process_name_t* sender, ORTE_ERROR_LOG(rc); return; } - OPAL_OUTPUT_VERBOSE((5, orte_grpcomm_base.output, + OPAL_OUTPUT_VERBOSE((5, orte_grpcomm_base_framework.framework_output, "%s grpcomm:base:daemon_coll: NUM CONTRIBS: %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_VPID_PRINT(np))); @@ -543,7 +543,7 @@ static void daemon_coll_recv(int status, orte_process_name_t* sender, /* can't continue - missing at least one launch msg * or not locally complete */ - OPAL_OUTPUT_VERBOSE((5, orte_grpcomm_base.output, + OPAL_OUTPUT_VERBOSE((5, orte_grpcomm_base_framework.framework_output, "%s grpcomm:base:daemon_coll: CANNOT PROGRESS", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME))); return; @@ -576,7 +576,7 @@ static void daemon_coll_recv(int status, orte_process_name_t* sender, orte_routed.get_routing_list(ORTE_GRPCOMM_COLL_RELAY, coll); while (NULL != (nm = (orte_namelist_t*)opal_list_remove_first(&coll->targets))) { - OPAL_OUTPUT_VERBOSE((5, orte_grpcomm_base.output, + OPAL_OUTPUT_VERBOSE((5, orte_grpcomm_base_framework.framework_output, "%s grpcomm:base:daemon_coll: RELAYING COLLECTIVE TO %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(&nm->name))); @@ -629,7 +629,7 @@ static void daemon_coll_recv(int status, orte_process_name_t* sender, /* are we done? */ if (np != coll->num_global_recvd) { - OPAL_OUTPUT_VERBOSE((5, orte_grpcomm_base.output, + OPAL_OUTPUT_VERBOSE((5, orte_grpcomm_base_framework.framework_output, "%s grpcomm:base:daemon_coll: MISSING CONTRIBUTORS: np %s ngr %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_VPID_PRINT(np), diff --git a/orte/mca/grpcomm/base/grpcomm_base_rollup.c b/orte/mca/grpcomm/base/grpcomm_base_rollup.c index 77d9e31136..565afb1ac4 100644 --- a/orte/mca/grpcomm/base/grpcomm_base_rollup.c +++ b/orte/mca/grpcomm/base/grpcomm_base_rollup.c @@ -70,7 +70,7 @@ void orte_grpcomm_base_rollup_recv(int status, orte_process_name_t* sender, bool done = false; opal_buffer_t *relay; - OPAL_OUTPUT_VERBOSE((1, orte_grpcomm_base.output, + OPAL_OUTPUT_VERBOSE((1, orte_grpcomm_base_framework.framework_output, "%s grpcomm:rollup:recv from sender %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(sender))); @@ -103,7 +103,7 @@ void orte_grpcomm_base_rollup_recv(int status, orte_process_name_t* sender, if (done) { /* send the message to my parent */ - OPAL_OUTPUT_VERBOSE((5, orte_grpcomm_base.output, + OPAL_OUTPUT_VERBOSE((5, orte_grpcomm_base_framework.framework_output, "%s grpcomm:rollup: sending rollup msg to %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(ORTE_PROC_MY_PARENT))); diff --git a/orte/mca/grpcomm/base/grpcomm_base_xcast.c b/orte/mca/grpcomm/base/grpcomm_base_xcast.c index c3b5f75808..08722b1e9a 100644 --- a/orte/mca/grpcomm/base/grpcomm_base_xcast.c +++ b/orte/mca/grpcomm/base/grpcomm_base_xcast.c @@ -60,7 +60,7 @@ void orte_grpcomm_base_xcast_recv(int status, orte_process_name_t* sender, orte_job_t *jdata; orte_proc_t *rec; - OPAL_OUTPUT_VERBOSE((1, orte_grpcomm_base.output, + OPAL_OUTPUT_VERBOSE((1, orte_grpcomm_base_framework.framework_output, "%s grpcomm:xcast:recv:send_relay", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME))); @@ -94,7 +94,7 @@ void orte_grpcomm_base_xcast_recv(int status, orte_process_name_t* sender, free(bo->bytes); } } else { - OPAL_OUTPUT_VERBOSE((5, orte_grpcomm_base.output, + OPAL_OUTPUT_VERBOSE((5, orte_grpcomm_base_framework.framework_output, "%s grpcomm:base:xcast updating daemon nidmap", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME))); @@ -148,7 +148,7 @@ void orte_grpcomm_base_xcast_recv(int status, orte_process_name_t* sender, /* if list is empty, no relay is required */ if (opal_list_is_empty(&coll.targets)) { - OPAL_OUTPUT_VERBOSE((5, orte_grpcomm_base.output, + OPAL_OUTPUT_VERBOSE((5, orte_grpcomm_base_framework.framework_output, "%s orte:daemon:send_relay - recipient list is empty!", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME))); goto CLEANUP; @@ -158,7 +158,7 @@ void orte_grpcomm_base_xcast_recv(int status, orte_process_name_t* sender, while (NULL != (item = opal_list_remove_first(&coll.targets))) { nm = (orte_namelist_t*)item; - OPAL_OUTPUT_VERBOSE((5, orte_grpcomm_base.output, + OPAL_OUTPUT_VERBOSE((5, orte_grpcomm_base_framework.framework_output, "%s orte:daemon:send_relay sending relay msg to %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(&nm->name)));