From e7ecd56bd22a72193d11e85794b02d6ca769ec17 Mon Sep 17 00:00:00 2001 From: Jeff Squyres Date: Tue, 13 May 2008 20:00:55 +0000 Subject: [PATCH] This commit represents a bunch of work on a Mercurial side branch. As such, the commit message back to the master SVN repository is fairly long. = ORTE Job-Level Output Messages = Add two new interfaces that should be used for all new code throughout the ORTE and OMPI layers (we already make the search-and-replace on the existing ORTE / OMPI layers): * orte_output(): (and corresponding friends ORTE_OUTPUT, orte_output_verbose, etc.) This function sends the output directly to the HNP for processing as part of a job-specific output channel. It supports all the same outputs as opal_output() (syslog, file, stdout, stderr), but for stdout/stderr, the output is sent to the HNP for processing and output. More on this below. * orte_show_help(): This function is a drop-in-replacement for opal_show_help(), with two differences in functionality: 1. the rendered text help message output is sent to the HNP for display (rather than outputting directly into the process' stderr stream) 1. the HNP detects duplicate help messages and does not display them (so that you don't see the same error message N times, once from each of your N MPI processes); instead, it counts "new" instances of the help message and displays a message every ~5 seconds when there are new ones ("I got X new copies of the help message...") opal_show_help and opal_output still exist, but they only output in the current process. The intent for the new orte_* functions is that they can apply job-level intelligence to the output. As such, we recommend that all new ORTE and OMPI code use the new orte_* functions, not thei opal_* functions. === New code === For ORTE and OMPI programmers, here's what you need to do differently in new code: * Do not include opal/util/show_help.h or opal/util/output.h. Instead, include orte/util/output.h (this one header file has declarations for both the orte_output() series of functions and orte_show_help()). * Effectively s/opal_output/orte_output/gi throughout your code. Note that orte_output_open() takes a slightly different argument list (as a way to pass data to the filtering stream -- see below), so you if explicitly call opal_output_open(), you'll need to slightly adapt to the new signature of orte_output_open(). * Literally s/opal_show_help/orte_show_help/. The function signature is identical. === Notes === * orte_output'ing to stream 0 will do similar to what opal_output'ing did, so leaving a hard-coded "0" as the first argument is safe. * For systems that do not use ORTE's RML or the HNP, the effect of orte_output_* and orte_show_help will be identical to their opal counterparts (the additional information passed to orte_output_open() will be lost!). Indeed, the orte_* functions simply become trivial wrappers to their opal_* counterparts. Note that we have not tested this; the code is simple but it is quite possible that we mucked something up. = Filter Framework = Messages sent view the new orte_* functions described above and messages output via the IOF on the HNP will now optionally be passed through a new "filter" framework before being output to stdout/stderr. The "filter" OPAL MCA framework is intended to allow preprocessing to messages before they are sent to their final destinations. The first component that was written in the filter framework was to create an XML stream, segregating all the messages into different XML tags, etc. This will allow 3rd party tools to read the stdout/stderr from the HNP and be able to know exactly what each text message is (e.g., a help message, another OMPI infrastructure message, stdout from the user process, stderr from the user process, etc.). Filtering is not active by default. Filter components must be specifically requested, such as: {{{ $ mpirun --mca filter xml ... }}} There can only be one filter component active. = New MCA Parameters = The new functionality described above introduces two new MCA parameters: * '''orte_base_help_aggregate''': Defaults to 1 (true), meaning that help messages will be aggregated, as described above. If set to 0, all help messages will be displayed, even if they are duplicates (i.e., the original behavior). * '''orte_base_show_output_recursions''': An MCA parameter to help debug one of the known issues, described below. It is likely that this MCA parameter will disappear before v1.3 final. = Known Issues = * The XML filter component is not complete. The current output from this component is preliminary and not real XML. A bit more work needs to be done to configure.m4 search for an appropriate XML library/link it in/use it at run time. * There are possible recursion loops in the orte_output() and orte_show_help() functions -- e.g., if RML send calls orte_output() or orte_show_help(). We have some ideas how to fix these, but figured that it was ok to commit before feature freeze with known issues. The code currently contains sub-optimal workarounds so that this will not be a problem, but it would be good to actually solve the problem rather than have hackish workarounds before v1.3 final. This commit was SVN r18434. --- ompi/class/ompi_free_list.c | 4 +- ompi/class/ompi_seq_tracker.c | 2 +- ompi/communicator/comm.c | 22 +- ompi/communicator/comm_init.c | 2 +- ompi/communicator/communicator.h | 2 +- ompi/datatype/convertor.c | 14 +- ompi/datatype/copy_functions_heterogeneous.c | 2 +- ompi/datatype/datatype_internal.h | 10 +- ompi/datatype/datatype_pack.c | 10 +- ompi/datatype/datatype_pack.h | 6 +- ompi/datatype/datatype_unpack.c | 26 +- ompi/datatype/datatype_unpack.h | 6 +- ompi/datatype/dt_add.c | 2 +- ompi/datatype/dt_copy.c | 16 +- ompi/datatype/dt_module.c | 4 +- ompi/datatype/fake_stack.c | 2 +- ompi/datatype/position.c | 16 +- ompi/errhandler/errhandler_predefined.c | 6 +- ompi/file/file.c | 4 +- ompi/group/group.h | 4 +- ompi/info/info.c | 8 +- ompi/mca/allocator/basic/allocator_basic.c | 2 +- ompi/mca/bml/base/bml_base_btl.c | 4 +- ompi/mca/bml/base/bml_base_btl.h | 2 +- ompi/mca/bml/base/bml_base_endpoint.h | 2 +- ompi/mca/bml/base/bml_base_init.c | 2 +- ompi/mca/bml/bml.h | 6 +- ompi/mca/bml/r2/bml_r2.c | 12 +- ompi/mca/bml/r2/bml_r2_ft.c | 18 +- ompi/mca/bml/r2/bml_r2_ft.h | 2 +- ompi/mca/btl/base/btl_base_error.c | 4 +- ompi/mca/btl/base/btl_base_error.h | 3 +- ompi/mca/btl/base/btl_base_mca.c | 7 +- ompi/mca/btl/base/btl_base_open.c | 9 +- ompi/mca/btl/base/btl_base_select.c | 15 +- ompi/mca/btl/elan/btl_elan.c | 8 +- ompi/mca/btl/elan/btl_elan.h | 2 +- ompi/mca/btl/elan/btl_elan_component.c | 6 +- ompi/mca/btl/gm/btl_gm.c | 8 +- ompi/mca/btl/gm/btl_gm.h | 2 +- ompi/mca/btl/gm/btl_gm_component.c | 26 +- ompi/mca/btl/gm/btl_gm_proc.c | 10 +- ompi/mca/btl/mx/btl_mx.c | 18 +- ompi/mca/btl/mx/btl_mx.h | 2 +- ompi/mca/btl/mx/btl_mx_component.c | 44 +- ompi/mca/btl/mx/btl_mx_proc.c | 6 +- ompi/mca/btl/ofud/btl_ofud.c | 4 +- ompi/mca/btl/ofud/btl_ofud.h | 4 +- ompi/mca/btl/ofud/btl_ofud_component.c | 2 +- ompi/mca/btl/ofud/btl_ofud_endpoint.c | 2 +- ompi/mca/btl/ofud/btl_ofud_proc.c | 4 +- ompi/mca/btl/openib/btl_openib.c | 9 +- ompi/mca/btl/openib/btl_openib.h | 4 +- ompi/mca/btl/openib/btl_openib_async.c | 7 +- ompi/mca/btl/openib/btl_openib_component.c | 51 +- ompi/mca/btl/openib/btl_openib_endpoint.c | 2 +- ompi/mca/btl/openib/btl_openib_fd.c | 18 +- ompi/mca/btl/openib/btl_openib_ini.c | 9 +- ompi/mca/btl/openib/btl_openib_mca.c | 63 +- ompi/mca/btl/openib/btl_openib_proc.c | 16 +- ompi/mca/btl/openib/btl_openib_xrc.c | 2 +- .../openib/connect/btl_openib_connect_base.c | 24 +- .../openib/connect/btl_openib_connect_ibcm.c | 235 +++-- .../openib/connect/btl_openib_connect_oob.c | 10 +- .../connect/btl_openib_connect_rdmacm.c | 34 +- .../openib/connect/btl_openib_connect_xoob.c | 10 +- ompi/mca/btl/portals/btl_portals.c | 36 +- ompi/mca/btl/portals/btl_portals_component.c | 65 +- ompi/mca/btl/portals/btl_portals_rdma.c | 10 +- ompi/mca/btl/portals/btl_portals_recv.c | 8 +- ompi/mca/btl/portals/btl_portals_send.c | 12 +- ompi/mca/btl/portals/btl_portals_send.h | 2 +- ompi/mca/btl/sctp/btl_sctp.c | 2 +- ompi/mca/btl/sctp/btl_sctp.h | 2 +- ompi/mca/btl/sctp/btl_sctp_component.c | 2 +- ompi/mca/btl/sctp/btl_sctp_frag.c | 8 +- ompi/mca/btl/sctp/btl_sctp_recv_handler.c | 2 +- ompi/mca/btl/self/btl_self.c | 2 +- ompi/mca/btl/self/btl_self_component.c | 2 +- ompi/mca/btl/sm/btl_sm.c | 6 +- ompi/mca/btl/sm/btl_sm.h | 2 +- ompi/mca/btl/sm/btl_sm_component.c | 10 +- ompi/mca/btl/tcp/btl_tcp.c | 2 +- ompi/mca/btl/tcp/btl_tcp.h | 2 +- ompi/mca/btl/tcp/btl_tcp_component.c | 10 +- ompi/mca/btl/tcp/btl_tcp_ft.h | 2 +- ompi/mca/btl/tcp/btl_tcp_proc.c | 6 +- ompi/mca/btl/template/btl_template.c | 2 +- ompi/mca/btl/template/btl_template.h | 2 +- .../mca/btl/template/btl_template_component.c | 2 +- ompi/mca/btl/udapl/btl_udapl.c | 4 +- ompi/mca/btl/udapl/btl_udapl.h | 4 +- ompi/mca/btl/udapl/btl_udapl_component.c | 6 +- ompi/mca/btl/udapl/btl_udapl_endpoint.c | 2 +- ompi/mca/btl/udapl/btl_udapl_mca.c | 2 +- ompi/mca/btl/udapl/btl_udapl_proc.c | 2 +- ompi/mca/coll/base/base.h | 4 +- ompi/mca/coll/base/coll_base_comm_select.c | 14 +- ompi/mca/coll/base/coll_base_comm_unselect.c | 2 +- ompi/mca/coll/base/coll_base_find_available.c | 15 +- ompi/mca/coll/base/coll_base_open.c | 7 +- ompi/mca/coll/demo/coll_demo_allgather.c | 6 +- ompi/mca/coll/demo/coll_demo_allgatherv.c | 6 +- ompi/mca/coll/demo/coll_demo_allreduce.c | 6 +- ompi/mca/coll/demo/coll_demo_alltoall.c | 6 +- ompi/mca/coll/demo/coll_demo_alltoallv.c | 6 +- ompi/mca/coll/demo/coll_demo_alltoallw.c | 6 +- ompi/mca/coll/demo/coll_demo_barrier.c | 6 +- ompi/mca/coll/demo/coll_demo_bcast.c | 6 +- ompi/mca/coll/demo/coll_demo_exscan.c | 4 +- ompi/mca/coll/demo/coll_demo_gather.c | 6 +- ompi/mca/coll/demo/coll_demo_gatherv.c | 6 +- ompi/mca/coll/demo/coll_demo_reduce.c | 6 +- ompi/mca/coll/demo/coll_demo_reduce_scatter.c | 6 +- ompi/mca/coll/demo/coll_demo_scan.c | 4 +- ompi/mca/coll/demo/coll_demo_scatter.c | 6 +- ompi/mca/coll/demo/coll_demo_scatterv.c | 6 +- .../coll/hierarch/coll_hierarch_allreduce.c | 2 +- .../mca/coll/hierarch/coll_hierarch_barrier.c | 2 +- ompi/mca/coll/hierarch/coll_hierarch_bcast.c | 2 +- ompi/mca/coll/hierarch/coll_hierarch_reduce.c | 2 +- ompi/mca/coll/inter/coll_inter_bcast.c | 2 +- ompi/mca/coll/sm/coll_sm_component.c | 6 +- ompi/mca/coll/sm2/coll_sm2_component.c | 2 +- ompi/mca/coll/sm2/coll_sm2_module.c | 26 +- ompi/mca/coll/sm2/coll_sm2_service.c | 2 +- ompi/mca/coll/tuned/coll_tuned_allgather.c | 34 +- ompi/mca/coll/tuned/coll_tuned_allgatherv.c | 30 +- ompi/mca/coll/tuned/coll_tuned_allreduce.c | 30 +- ompi/mca/coll/tuned/coll_tuned_alltoall.c | 30 +- ompi/mca/coll/tuned/coll_tuned_alltoallv.c | 16 +- ompi/mca/coll/tuned/coll_tuned_barrier.c | 24 +- ompi/mca/coll/tuned/coll_tuned_bcast.c | 26 +- ompi/mca/coll/tuned/coll_tuned_component.c | 12 +- .../coll/tuned/coll_tuned_decision_dynamic.c | 22 +- .../coll/tuned/coll_tuned_decision_fixed.c | 20 +- ompi/mca/coll/tuned/coll_tuned_dynamic_file.c | 64 +- .../mca/coll/tuned/coll_tuned_dynamic_rules.c | 50 +- ompi/mca/coll/tuned/coll_tuned_gather.c | 24 +- ompi/mca/coll/tuned/coll_tuned_module.c | 22 +- ompi/mca/coll/tuned/coll_tuned_reduce.c | 28 +- .../coll/tuned/coll_tuned_reduce_scatter.c | 18 +- ompi/mca/coll/tuned/coll_tuned_scatter.c | 14 +- ompi/mca/coll/tuned/coll_tuned_topo.c | 36 +- ompi/mca/coll/tuned/coll_tuned_util.c | 4 +- ompi/mca/coll/tuned/coll_tuned_util.h | 2 +- ompi/mca/common/mx/common_mx.c | 6 +- .../portals/common_portals_cray_xt_modex.c | 12 +- .../common/portals/common_portals_crayxt3.c | 10 +- ompi/mca/common/portals/common_portals_utcp.c | 22 +- ompi/mca/common/sm/common_sm_mmap.c | 18 +- ompi/mca/crcp/base/crcp_base_close.c | 2 +- ompi/mca/crcp/base/crcp_base_fns.c | 2 +- ompi/mca/crcp/base/crcp_base_open.c | 17 +- ompi/mca/crcp/base/crcp_base_select.c | 6 +- ompi/mca/crcp/coord/crcp_coord_btl.c | 4 +- ompi/mca/crcp/coord/crcp_coord_component.c | 16 +- ompi/mca/crcp/coord/crcp_coord_module.c | 12 +- ompi/mca/crcp/coord/crcp_coord_pml.c | 332 +++--- ompi/mca/crcp/crcp.h | 2 +- ompi/mca/dpm/base/dpm_base_close.c | 2 +- ompi/mca/dpm/base/dpm_base_open.c | 6 +- ompi/mca/dpm/base/dpm_base_select.c | 2 +- ompi/mca/dpm/orte/dpm_orte.c | 26 +- ompi/mca/io/base/base.h | 4 +- ompi/mca/io/base/io_base_delete.c | 14 +- ompi/mca/io/base/io_base_file_select.c | 16 +- ompi/mca/io/base/io_base_find_available.c | 10 +- ompi/mca/io/base/io_base_open.c | 7 +- ompi/mca/mpool/base/mpool_base_init.c | 2 +- ompi/mca/mpool/base/mpool_base_mem_cb.c | 4 +- ompi/mca/mpool/base/mpool_base_tree.c | 6 +- ompi/mca/mpool/rdma/mpool_rdma_component.c | 2 +- ompi/mca/mpool/rdma/mpool_rdma_module.c | 4 +- ompi/mca/mpool/sm/mpool_sm_component.c | 35 +- ompi/mca/mpool/sm/mpool_sm_module.c | 2 +- ompi/mca/mtl/base/mtl_base_component.c | 19 +- ompi/mca/mtl/mx/mtl_mx.c | 14 +- ompi/mca/mtl/mx/mtl_mx_component.c | 2 +- ompi/mca/mtl/mx/mtl_mx_endpoint.c | 4 +- ompi/mca/mtl/mx/mtl_mx_probe.c | 2 +- ompi/mca/mtl/mx/mtl_mx_recv.c | 4 +- ompi/mca/mtl/mx/mtl_mx_send.c | 12 +- ompi/mca/mtl/portals/mtl_portals.c | 6 +- ompi/mca/mtl/portals/mtl_portals_recv.c | 38 +- ompi/mca/mtl/portals/mtl_portals_recv_short.c | 2 +- ompi/mca/mtl/portals/mtl_portals_send.c | 18 +- ompi/mca/mtl/portals/mtl_portals_send_short.c | 2 +- ompi/mca/mtl/psm/mtl_psm.c | 28 +- ompi/mca/mtl/psm/mtl_psm_component.c | 6 +- ompi/mca/mtl/psm/mtl_psm_endpoint.c | 2 +- ompi/mca/mtl/psm/mtl_psm_recv.c | 2 +- ompi/mca/osc/base/osc_base_open.c | 5 +- ompi/mca/osc/pt2pt/osc_pt2pt.c | 2 +- ompi/mca/osc/pt2pt/osc_pt2pt_component.c | 8 +- ompi/mca/osc/pt2pt/osc_pt2pt_data_move.c | 18 +- ompi/mca/osc/pt2pt/osc_pt2pt_sync.c | 32 +- ompi/mca/osc/rdma/osc_rdma.c | 2 +- ompi/mca/osc/rdma/osc_rdma_comm.c | 2 +- ompi/mca/osc/rdma/osc_rdma_component.c | 14 +- ompi/mca/osc/rdma/osc_rdma_data_move.c | 26 +- ompi/mca/osc/rdma/osc_rdma_obj_convert.h | 2 +- ompi/mca/osc/rdma/osc_rdma_sync.c | 18 +- ompi/mca/pml/base/pml_base_ft.c | 4 +- ompi/mca/pml/base/pml_base_open.c | 9 +- ompi/mca/pml/base/pml_base_select.c | 29 +- ompi/mca/pml/cm/pml_cm_component.c | 2 +- ompi/mca/pml/cm/pml_cm_recvreq.h | 2 +- ompi/mca/pml/crcpw/pml_crcpw_component.c | 25 +- ompi/mca/pml/dr/pml_dr.c | 2 +- ompi/mca/pml/dr/pml_dr.h | 2 +- ompi/mca/pml/dr/pml_dr_recvfrag.c | 6 +- ompi/mca/pml/dr/pml_dr_vfrag.c | 12 +- ompi/mca/pml/ob1/pml_ob1.c | 14 +- ompi/mca/pml/ob1/pml_ob1_component.c | 10 +- ompi/mca/pml/ob1/pml_ob1_endpoint.h | 2 +- ompi/mca/pml/ob1/pml_ob1_recvfrag.c | 2 +- ompi/mca/pml/ob1/pml_ob1_recvreq.c | 2 +- ompi/mca/pml/ob1/pml_ob1_sendreq.c | 8 +- .../example/vprotocol_example_component.c | 2 +- .../pessimist/vprotocol_pessimist_component.c | 2 +- ompi/mca/pml/v/pml_v_output.c | 6 +- ompi/mca/pml/v/pml_v_output.h | 16 +- ompi/mca/pubsub/base/pubsub_base_close.c | 2 +- ompi/mca/pubsub/base/pubsub_base_open.c | 6 +- ompi/mca/pubsub/base/pubsub_base_select.c | 2 +- ompi/mca/pubsub/orte/pubsub_orte.c | 28 +- ompi/mca/rcache/rb/rcache_rb.c | 2 +- ompi/mca/rcache/vma/rcache_vma.c | 2 +- ompi/mca/topo/base/topo_base_close.c | 4 +- ompi/mca/topo/base/topo_base_comm_select.c | 24 +- ompi/mca/topo/base/topo_base_find_available.c | 12 +- ompi/mca/topo/base/topo_base_open.c | 7 +- ompi/mpi/c/abort.c | 2 +- ompi/mpi/c/comm_spawn.c | 2 +- ompi/mpi/c/comm_spawn_multiple.c | 2 +- ompi/mpi/c/init.c | 6 +- ompi/mpi/c/init_thread.c | 6 +- ompi/mpi/c/wtick.c | 2 +- ompi/proc/proc.c | 9 +- ompi/runtime/ompi_cr.c | 25 +- ompi/runtime/ompi_mpi_finalize.c | 4 +- ompi/runtime/ompi_mpi_init.c | 14 +- ompi/runtime/ompi_mpi_params.c | 19 +- ompi/tools/ompi-server/ompi-server.c | 11 +- ompi/tools/ompi_info/ompi_info.cc | 13 +- ompi/tools/ompi_info/param.cc | 6 +- opal/mca/filter/Makefile.am | 41 + opal/mca/filter/base/Makefile.am | 27 + opal/mca/filter/base/base.h | 75 ++ opal/mca/filter/base/filter_base_close.c | 38 + opal/mca/filter/base/filter_base_fns.c | 28 + opal/mca/filter/base/filter_base_open.c | 63 ++ opal/mca/filter/base/filter_base_select.c | 61 ++ opal/mca/filter/filter.h | 100 ++ opal/mca/filter/xml/Makefile.am | 47 + opal/mca/filter/xml/configure.params | 22 + opal/mca/filter/xml/filter_xml.h | 46 + opal/mca/filter/xml/filter_xml_component.c | 116 +++ opal/mca/filter/xml/filter_xml_module.c | 99 ++ opal/runtime/opal_finalize.c | 9 + opal/runtime/opal_init.c | 14 + opal/tools/wrappers/help-opal-wrapper.txt | 14 +- opal/util/output.c | 246 +++-- opal/util/output.h | 52 +- opal/util/show_help.c | 258 +++-- opal/util/show_help.h | 106 +- opal/util/show_help_lex.l | 1 - orte/mca/errmgr/base/errmgr_base_fns.c | 6 +- orte/mca/errmgr/base/errmgr_base_open.c | 17 +- orte/mca/errmgr/default/errmgr_default.c | 10 +- .../errmgr/default/errmgr_default_component.c | 2 +- orte/mca/ess/alps/ess_alps_module.c | 20 +- orte/mca/ess/base/ess_base_build_nidmap.c | 3 +- orte/mca/ess/base/ess_base_close.c | 4 +- orte/mca/ess/base/ess_base_get.c | 2 +- orte/mca/ess/base/ess_base_open.c | 6 +- orte/mca/ess/base/ess_base_put.c | 2 +- orte/mca/ess/base/ess_base_select.c | 2 +- orte/mca/ess/base/ess_base_std_app.c | 13 +- orte/mca/ess/base/ess_base_std_orted.c | 9 +- orte/mca/ess/base/ess_base_std_tool.c | 8 +- orte/mca/ess/cnos/ess_cnos_module.c | 4 +- orte/mca/ess/env/ess_env_module.c | 21 +- orte/mca/ess/hnp/ess_hnp_module.c | 28 +- orte/mca/ess/lsf/ess_lsf_module.c | 14 +- .../portals_utcp/ess_portals_utcp_module.c | 8 +- orte/mca/ess/singleton/ess_singleton_module.c | 9 +- orte/mca/ess/slurm/ess_slurm_module.c | 23 +- orte/mca/ess/tool/ess_tool_module.c | 5 +- orte/mca/filem/base/filem_base_close.c | 2 +- orte/mca/filem/base/filem_base_fns.c | 2 +- orte/mca/filem/base/filem_base_open.c | 16 +- orte/mca/filem/base/filem_base_receive.c | 14 +- orte/mca/filem/base/filem_base_select.c | 6 +- orte/mca/filem/filem.h | 2 +- orte/mca/filem/rsh/filem_rsh_component.c | 22 +- orte/mca/filem/rsh/filem_rsh_module.c | 109 +- .../mca/grpcomm/base/grpcomm_base_allgather.c | 20 +- orte/mca/grpcomm/base/grpcomm_base_modex.c | 22 +- orte/mca/grpcomm/base/grpcomm_base_open.c | 6 +- .../grpcomm/basic/grpcomm_basic_component.c | 4 +- orte/mca/grpcomm/basic/grpcomm_basic_module.c | 22 +- orte/mca/iof/base/iof_base_endpoint.c | 32 +- orte/mca/iof/base/iof_base_flush.c | 10 +- orte/mca/iof/base/iof_base_fragment.c | 8 +- orte/mca/iof/base/iof_base_fragment.h | 2 +- orte/mca/iof/base/iof_base_open.c | 14 +- orte/mca/iof/base/iof_base_select.c | 12 +- orte/mca/iof/base/iof_base_setup.c | 2 +- orte/mca/iof/null/iof_null_component.c | 2 +- orte/mca/iof/null/iof_null_module.c | 2 +- orte/mca/iof/proxy/iof_proxy.c | 6 +- orte/mca/iof/proxy/iof_proxy_component.c | 4 +- orte/mca/iof/proxy/iof_proxy_svc.c | 4 +- orte/mca/iof/svc/iof_svc.c | 2 +- orte/mca/iof/svc/iof_svc_component.c | 10 +- orte/mca/iof/svc/iof_svc_proxy.c | 32 +- orte/mca/iof/svc/iof_svc_pub.c | 4 +- orte/mca/iof/svc/iof_svc_sub.c | 32 +- orte/mca/odls/base/odls_base_default_fns.c | 99 +- orte/mca/odls/base/odls_base_open.c | 5 +- orte/mca/odls/base/odls_base_state.c | 15 +- orte/mca/odls/default/odls_default_module.c | 16 +- orte/mca/odls/process/odls_process_module.c | 10 +- orte/mca/oob/base/oob_base_init.c | 6 +- orte/mca/oob/base/oob_base_open.c | 15 +- orte/mca/oob/tcp/oob_tcp.c | 85 +- orte/mca/oob/tcp/oob_tcp_msg.c | 14 +- orte/mca/oob/tcp/oob_tcp_msg.h | 2 +- orte/mca/oob/tcp/oob_tcp_peer.c | 68 +- orte/mca/oob/tcp/oob_tcp_ping.c | 12 +- orte/mca/oob/tcp/oob_tcp_send.c | 2 +- orte/mca/plm/alps/plm_alps_component.c | 2 +- orte/mca/plm/alps/plm_alps_module.c | 46 +- orte/mca/plm/base/plm_base_close.c | 2 +- orte/mca/plm/base/plm_base_jobid.c | 6 +- orte/mca/plm/base/plm_base_launch_support.c | 59 +- orte/mca/plm/base/plm_base_open.c | 5 +- orte/mca/plm/base/plm_base_orted_cmds.c | 21 +- orte/mca/plm/base/plm_base_proxy.c | 9 +- orte/mca/plm/base/plm_base_receive.c | 16 +- orte/mca/plm/base/plm_base_select.c | 3 +- orte/mca/plm/ccp/plm_ccp_component.c | 2 +- orte/mca/plm/ccp/plm_ccp_module.c | 90 +- .../plm/gridengine/plm_gridengine_component.c | 6 +- .../plm/gridengine/plm_gridengine_module.c | 68 +- orte/mca/plm/lsf/plm_lsf_component.c | 4 +- orte/mca/plm/lsf/plm_lsf_module.c | 34 +- orte/mca/plm/process/plm_process_component.c | 4 +- orte/mca/plm/process/plm_process_module.c | 80 +- orte/mca/plm/rsh/plm_rsh_component.c | 10 +- orte/mca/plm/rsh/plm_rsh_module.c | 84 +- orte/mca/plm/slurm/plm_slurm_component.c | 4 +- orte/mca/plm/slurm/plm_slurm_module.c | 49 +- orte/mca/plm/submit/pls_submit_component.c | 4 +- orte/mca/plm/submit/pls_submit_module.c | 88 +- orte/mca/plm/tm/plm_tm_component.c | 2 +- orte/mca/plm/tm/plm_tm_module.c | 58 +- orte/mca/plm/xgrid/src/plm_xgrid_client.m | 30 +- orte/mca/plm/xgrid/src/plm_xgrid_component.m | 8 +- orte/mca/plm/xgrid/src/plm_xgrid_module.m | 10 +- orte/mca/ras/alps/ras_alps_component.c | 6 +- orte/mca/ras/alps/ras_alps_module.c | 22 +- orte/mca/ras/base/base.h | 1 + orte/mca/ras/base/ras_base_allocate.c | 20 +- orte/mca/ras/base/ras_base_node.c | 8 +- orte/mca/ras/base/ras_base_open.c | 8 +- orte/mca/ras/base/ras_base_select.c | 2 +- orte/mca/ras/ccp/ras_ccp_component.c | 2 +- orte/mca/ras/ccp/ras_ccp_module.c | 38 +- .../ras/gridengine/ras_gridengine_component.c | 11 +- .../ras/gridengine/ras_gridengine_module.c | 18 +- .../loadleveler/ras_loadleveler_component.c | 6 +- .../ras/loadleveler/ras_loadleveler_module.c | 62 +- orte/mca/ras/lsf/ras_lsf_component.c | 2 +- orte/mca/ras/lsf/ras_lsf_module.c | 4 +- orte/mca/ras/slurm/ras_slurm_component.c | 6 +- orte/mca/ras/slurm/ras_slurm_module.c | 33 +- orte/mca/ras/tm/ras_tm_component.c | 2 +- orte/mca/ras/tm/ras_tm_module.c | 16 +- orte/mca/rmaps/base/base.h | 1 + orte/mca/rmaps/base/rmaps_base_close.c | 2 +- orte/mca/rmaps/base/rmaps_base_map_job.c | 5 +- orte/mca/rmaps/base/rmaps_base_open.c | 6 +- orte/mca/rmaps/base/rmaps_base_select.c | 2 +- orte/mca/rmaps/base/rmaps_base_support_fns.c | 31 +- orte/mca/rmaps/rank_file/rmaps_rank_file.c | 32 +- .../rank_file/rmaps_rank_file_component.c | 4 +- orte/mca/rmaps/round_robin/rmaps_rr.c | 19 +- .../rmaps/round_robin/rmaps_rr_component.c | 2 +- orte/mca/rmaps/seq/rmaps_seq.c | 11 +- orte/mca/rmaps/seq/rmaps_seq_component.c | 2 +- orte/mca/rmaps/topo/rmaps_topo.c | 17 +- orte/mca/rmaps/topo/rmaps_topo_component.c | 2 +- orte/mca/rml/base/base.h | 2 +- orte/mca/rml/base/rml_base_components.c | 19 +- orte/mca/rml/base/rml_base_contact.c | 4 +- orte/mca/rml/base/rml_base_receive.c | 2 +- orte/mca/rml/ftrm/rml_ftrm_component.c | 15 +- orte/mca/rml/ftrm/rml_ftrm_module.c | 38 +- orte/mca/rml/oob/rml_oob_component.c | 20 +- orte/mca/rml/oob/rml_oob_recv.c | 4 +- orte/mca/rml/oob/rml_oob_send.c | 18 +- orte/mca/rml/rml_types.h | 3 + orte/mca/routed/base/routed_base_components.c | 11 +- orte/mca/routed/base/routed_base_receive.c | 8 +- orte/mca/routed/binomial/routed_binomial.c | 32 +- .../binomial/routed_binomial_component.c | 2 +- orte/mca/routed/direct/routed_direct.c | 28 +- orte/mca/routed/linear/routed_linear.c | 28 +- .../routed/linear/routed_linear_component.c | 2 +- orte/mca/snapc/base/snapc_base_close.c | 2 +- orte/mca/snapc/base/snapc_base_fns.c | 32 +- orte/mca/snapc/base/snapc_base_open.c | 32 +- orte/mca/snapc/base/snapc_base_select.c | 6 +- orte/mca/snapc/full/snapc_full_app.c | 72 +- orte/mca/snapc/full/snapc_full_component.c | 18 +- orte/mca/snapc/full/snapc_full_global.c | 87 +- orte/mca/snapc/full/snapc_full_local.c | 107 +- orte/mca/snapc/full/snapc_full_module.c | 18 +- orte/mca/snapc/snapc.h | 4 +- orte/orted/orted_comm.c | 61 +- orte/orted/orted_main.c | 38 +- orte/runtime/orte_cr.c | 31 +- orte/runtime/orte_data_server.c | 22 +- orte/runtime/orte_finalize.c | 4 + orte/runtime/orte_globals.c | 10 +- orte/runtime/orte_init.c | 13 +- orte/runtime/orte_wait.c | 4 +- orte/runtime/orte_wait.h | 12 +- orte/runtime/orte_wakeup.c | 2 +- orte/runtime/orte_wakeup.h | 4 +- orte/test/mpi/Makefile | 11 +- orte/test/mpi/hello_output.c | 29 + orte/test/mpi/hello_show_help.c | 49 + orte/tools/orte-checkpoint/orte-checkpoint.c | 45 +- orte/tools/orte-clean/orte-clean.c | 5 +- orte/tools/orte-ps/orte-ps.c | 17 +- orte/tools/orte-restart/orte-restart.c | 35 +- orte/tools/orterun/orterun.c | 87 +- orte/tools/orterun/totalview.c | 33 +- orte/util/Makefile.am | 7 +- orte/util/comm/comm.c | 28 +- orte/util/dash_host/dash_host.c | 5 +- orte/util/hnp_contact.c | 4 +- orte/util/hostfile/hostfile.c | 31 +- orte/util/name_fns.c | 2 +- orte/util/nidmap.c | 23 +- orte/util/output.c | 965 ++++++++++++++++++ orte/util/output.h | 333 ++++++ orte/util/pre_condition_transports.c | 2 +- orte/util/proc_info.c | 6 +- orte/util/session_dir.c | 36 +- 454 files changed, 5859 insertions(+), 3432 deletions(-) create mode 100644 opal/mca/filter/Makefile.am create mode 100644 opal/mca/filter/base/Makefile.am create mode 100644 opal/mca/filter/base/base.h create mode 100644 opal/mca/filter/base/filter_base_close.c create mode 100644 opal/mca/filter/base/filter_base_fns.c create mode 100644 opal/mca/filter/base/filter_base_open.c create mode 100644 opal/mca/filter/base/filter_base_select.c create mode 100644 opal/mca/filter/filter.h create mode 100644 opal/mca/filter/xml/Makefile.am create mode 100644 opal/mca/filter/xml/configure.params create mode 100644 opal/mca/filter/xml/filter_xml.h create mode 100644 opal/mca/filter/xml/filter_xml_component.c create mode 100644 opal/mca/filter/xml/filter_xml_module.c create mode 100644 orte/test/mpi/hello_output.c create mode 100644 orte/test/mpi/hello_show_help.c create mode 100644 orte/util/output.c create mode 100644 orte/util/output.h diff --git a/ompi/class/ompi_free_list.c b/ompi/class/ompi_free_list.c index e9f248e506..bde9e359be 100644 --- a/ompi/class/ompi_free_list.c +++ b/ompi/class/ompi_free_list.c @@ -22,7 +22,7 @@ #include "ompi/class/ompi_free_list.h" #include "opal/include/opal/align.h" #include "opal/sys/cache.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "ompi/mca/mpool/mpool.h" static void ompi_free_list_construct(ompi_free_list_t* fl); @@ -62,7 +62,7 @@ static void ompi_free_list_destruct(ompi_free_list_t* fl) #if 0 && OMPI_ENABLE_DEBUG if(opal_list_get_size(&fl->super) != fl->fl_num_allocated) { - opal_output(0, "ompi_free_list: %d allocated %d returned: %s:%d\n", + orte_output(0, "ompi_free_list: %d allocated %d returned: %s:%d\n", fl->fl_num_allocated, opal_list_get_size(&fl->super), fl->super.super.cls_init_file_name, fl->super.super.cls_init_lineno); } diff --git a/ompi/class/ompi_seq_tracker.c b/ompi/class/ompi_seq_tracker.c index 14cb93e4fb..d195eb2843 100644 --- a/ompi/class/ompi_seq_tracker.c +++ b/ompi/class/ompi_seq_tracker.c @@ -20,7 +20,7 @@ #include "ompi/class/ompi_seq_tracker.h" #include "opal/sys/cache.h" -#include "opal/util/output.h" +#include "orte/util/output.h" diff --git a/ompi/communicator/comm.c b/ompi/communicator/comm.c index 4aa5688411..5f27cb07b0 100644 --- a/ompi/communicator/comm.c +++ b/ompi/communicator/comm.c @@ -30,7 +30,7 @@ #include "ompi/proc/proc.h" #include "opal/threads/mutex.h" #include "opal/util/bit_ops.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "opal/util/convert.h" #include "ompi/mca/topo/topo.h" #include "ompi/mca/topo/base/base.h" @@ -1154,7 +1154,7 @@ ompi_proc_t **ompi_comm_get_rprocs ( ompi_communicator_t *local_comm, /* rprocs isn't freed unless we have an error, since it is used in the communicator */ if ( OMPI_SUCCESS !=rc ) { - opal_output(0, "%d: Error in ompi_get_rprocs\n", local_rank); + orte_output(0, "%d: Error in ompi_get_rprocs\n", local_rank); if ( NULL != rprocs ) { free ( rprocs ); rprocs=NULL; @@ -1269,25 +1269,25 @@ int ompi_comm_determine_first ( ompi_communicator_t *intercomm, int high ) /********************************************************************************/ int ompi_comm_dump ( ompi_communicator_t *comm ) { - opal_output(0, "Dumping information for comm_cid %d\n", comm->c_contextid); - opal_output(0," f2c index:%d cube_dim: %d\n", comm->c_f_to_c_index, + orte_output(0, "Dumping information for comm_cid %d\n", comm->c_contextid); + orte_output(0," f2c index:%d cube_dim: %d\n", comm->c_f_to_c_index, comm->c_cube_dim); - opal_output(0," Local group: size = %d my_rank = %d\n", + orte_output(0," Local group: size = %d my_rank = %d\n", comm->c_local_group->grp_proc_count, comm->c_local_group->grp_my_rank ); - opal_output(0," Communicator is:"); + orte_output(0," Communicator is:"); /* Display flags */ if ( OMPI_COMM_IS_INTER(comm) ) - opal_output(0," inter-comm,"); + orte_output(0," inter-comm,"); if ( OMPI_COMM_IS_CART(comm)) - opal_output(0," topo-cart,"); + orte_output(0," topo-cart,"); if ( OMPI_COMM_IS_GRAPH(comm)) - opal_output(0," topo-graph"); - opal_output(0,"\n"); + orte_output(0," topo-graph"); + orte_output(0,"\n"); if (OMPI_COMM_IS_INTER(comm)) { - opal_output(0," Remote group size:%d\n", comm->c_remote_group->grp_proc_count); + orte_output(0," Remote group size:%d\n", comm->c_remote_group->grp_proc_count); } return OMPI_SUCCESS; } diff --git a/ompi/communicator/comm_init.c b/ompi/communicator/comm_init.c index dad41e726d..9d213d4464 100644 --- a/ompi/communicator/comm_init.c +++ b/ompi/communicator/comm_init.c @@ -258,7 +258,7 @@ int ompi_comm_finalize(void) if ( NULL != comm ) { /* Still here ? */ if ( ompi_debug_show_handle_leaks && !(OMPI_COMM_IS_FREED(comm)) ){ - opal_output(0,"WARNING: MPI_Comm still allocated in MPI_Finalize\n"); + orte_output(0,"WARNING: MPI_Comm still allocated in MPI_Finalize\n"); ompi_comm_dump ( comm); OBJ_RELEASE(comm); } diff --git a/ompi/communicator/communicator.h b/ompi/communicator/communicator.h index 2a53bc95ed..44b43f4e98 100644 --- a/ompi/communicator/communicator.h +++ b/ompi/communicator/communicator.h @@ -238,7 +238,7 @@ struct ompi_communicator_t { { #if OMPI_ENABLE_DEBUG if(peer_id >= comm->c_remote_group->grp_proc_count) { - opal_output(0, "ompi_comm_lookup_peer: invalid peer index (%d)", peer_id); + orte_output(0, "ompi_comm_lookup_peer: invalid peer index (%d)", peer_id); return (struct ompi_proc_t *) NULL; } #endif diff --git a/ompi/datatype/convertor.c b/ompi/datatype/convertor.c index e9c54ce7b1..cec13fb1bc 100644 --- a/ompi/datatype/convertor.c +++ b/ompi/datatype/convertor.c @@ -130,7 +130,7 @@ ompi_convertor_find_or_create_master( uint32_t remote_arch ) } else if( opal_arch_checkmask( &master->remote_arch, OPAL_ARCH_BOOLIS32 ) ) { remote_sizes[DT_CXX_BOOL] = 4; } else { - opal_output( 0, "Unknown sizeof(bool) for the remote architecture\n" ); + orte_output( 0, "Unknown sizeof(bool) for the remote architecture\n" ); } /* check the length of the long */ @@ -151,7 +151,7 @@ ompi_convertor_find_or_create_master( uint32_t remote_arch ) } else if( opal_arch_checkmask( &master->remote_arch, OPAL_ARCH_LOGICALIS32 ) ) { remote_sizes[DT_LOGIC] = 4; } else { - opal_output( 0, "Unknown sizeof(fortran logical) for the remote architecture\n" ); + orte_output( 0, "Unknown sizeof(fortran logical) for the remote architecture\n" ); } /** @@ -637,17 +637,17 @@ void ompi_convertor_dump( ompi_convertor_t* convertor ) void ompi_ddt_dump_stack( const dt_stack_t* pStack, int stack_pos, const union dt_elem_desc* pDesc, const char* name ) { - opal_output( 0, "\nStack %p stack_pos %d name %s\n", (void*)pStack, stack_pos, name ); + orte_output( 0, "\nStack %p stack_pos %d name %s\n", (void*)pStack, stack_pos, name ); for( ; stack_pos >= 0; stack_pos-- ) { - opal_output( 0, "%d: pos %d count %d disp %ld ", stack_pos, pStack[stack_pos].index, + orte_output( 0, "%d: pos %d count %d disp %ld ", stack_pos, pStack[stack_pos].index, (int)pStack[stack_pos].count, (long)pStack[stack_pos].disp ); if( pStack->index != -1 ) - opal_output( 0, "\t[desc count %d disp %ld extent %ld]\n", + orte_output( 0, "\t[desc count %d disp %ld extent %ld]\n", pDesc[pStack[stack_pos].index].elem.count, (long)pDesc[pStack[stack_pos].index].elem.disp, (long)pDesc[pStack[stack_pos].index].elem.extent ); else - opal_output( 0, "\n" ); + orte_output( 0, "\n" ); } - opal_output( 0, "\n" ); + orte_output( 0, "\n" ); } diff --git a/ompi/datatype/copy_functions_heterogeneous.c b/ompi/datatype/copy_functions_heterogeneous.c index affd6e878e..c1db822279 100644 --- a/ompi/datatype/copy_functions_heterogeneous.c +++ b/ompi/datatype/copy_functions_heterogeneous.c @@ -12,7 +12,7 @@ #include "ompi_config.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "opal/util/arch.h" #include "opal/types.h" diff --git a/ompi/datatype/datatype_internal.h b/ompi/datatype/datatype_internal.h index 096f5dd0c4..b72828caec 100644 --- a/ompi/datatype/datatype_internal.h +++ b/ompi/datatype/datatype_internal.h @@ -23,7 +23,7 @@ #ifdef HAVE_STRING_H #include #endif /* HAVE_STRING_H */ -#include "opal/util/output.h" +#include "orte/util/output.h" extern int ompi_ddt_dfd; @@ -31,17 +31,17 @@ extern int ompi_ddt_dfd; # define DDT_DUMP_STACK( PSTACK, STACK_POS, PDESC, NAME ) \ ompi_ddt_dump_stack( (PSTACK), (STACK_POS), (PDESC), (NAME) ) # if defined(ACCEPT_C99) -# define DUMP( ARGS... ) opal_output(ompi_ddt_dfd, __VA_ARGS__) +# define DUMP( ARGS... ) orte_output(ompi_ddt_dfd, __VA_ARGS__) # else # if defined(__GNUC__) && !defined(__STDC__) -# define DUMP(ARGS...) opal_output( ompi_ddt_dfd, ARGS) +# define DUMP(ARGS...) orte_output( ompi_ddt_dfd, ARGS) # else static inline void DUMP( char* fmt, ... ) { va_list list; va_start( list, fmt ); - opal_output( ompi_ddt_dfd, fmt, list ); + orte_output( ompi_ddt_dfd, fmt, list ); va_end( list ); } # define DUMP printf @@ -265,7 +265,7 @@ OMPI_DECLSPEC int ompi_ddt_safeguard_pointer_debug_breakpoint( const void* actua ((PDATA)->ub - (PDATA)->lb) * ((COUNT) - 1); \ if( ((ACTPTR) < __lower_bound) || ((ACTPTR) >= __upper_bound) ) { \ ompi_ddt_safeguard_pointer_debug_breakpoint( (ACTPTR), (LENGTH), (INITPTR), (PDATA), (COUNT) ); \ - opal_output( 0, "%s:%d\n\tPointer %p size %lu is outside [%p,%p] for\n\tbase ptr %p count %d and data \n", \ + orte_output( 0, "%s:%d\n\tPointer %p size %lu is outside [%p,%p] for\n\tbase ptr %p count %d and data \n", \ __FILE__, __LINE__, (ACTPTR), (unsigned long)(LENGTH), __lower_bound, __upper_bound, \ (INITPTR), (COUNT) ); \ ompi_ddt_dump( (PDATA) ); \ diff --git a/ompi/datatype/datatype_pack.c b/ompi/datatype/datatype_pack.c index 38b32f025d..c385834c1b 100644 --- a/ompi/datatype/datatype_pack.c +++ b/ompi/datatype/datatype_pack.c @@ -257,7 +257,7 @@ ompi_generic_simple_pack_function( ompi_convertor_t* pConvertor, size_t iov_len_local; uint32_t iov_count; - DO_DEBUG( opal_output( 0, "ompi_convertor_generic_simple_pack( %p, {%p, %lu}, %d )\n", (void*)pConvertor, + DO_DEBUG( orte_output( 0, "ompi_convertor_generic_simple_pack( %p, {%p, %lu}, %d )\n", (void*)pConvertor, iov[0].iov_base, (unsigned long)iov[0].iov_len, *out_size ); ); description = pConvertor->use_desc->desc; @@ -275,7 +275,7 @@ ompi_generic_simple_pack_function( ompi_convertor_t* pConvertor, pElem = &(description[pos_desc]); source_base += pStack->disp; - DO_DEBUG( opal_output( 0, "unpack start pos_desc %d count_desc %d disp %ld\n" + DO_DEBUG( orte_output( 0, "unpack start pos_desc %d count_desc %d disp %ld\n" "stack_pos %d pos_desc %d count_desc %d disp %ld\n", pos_desc, count_desc, (long)(source_base - pConvertor->pBaseBuf), pConvertor->stack_pos, pStack->index, (int)pStack->count, (long)pStack->disp ); ); @@ -297,7 +297,7 @@ ompi_generic_simple_pack_function( ompi_convertor_t* pConvertor, goto complete_loop; } if( DT_END_LOOP == pElem->elem.common.type ) { /* end of the current loop */ - DO_DEBUG( opal_output( 0, "pack end_loop count %d stack_pos %d pos_desc %d disp %ld space %lu\n", + DO_DEBUG( orte_output( 0, "pack end_loop count %d stack_pos %d pos_desc %d disp %ld space %lu\n", (int)pStack->count, pConvertor->stack_pos, pos_desc, (long)pStack->disp, (unsigned long)iov_len_local ); ); if( --(pStack->count) == 0 ) { /* end of loop */ if( pConvertor->stack_pos == 0 ) { @@ -321,7 +321,7 @@ ompi_generic_simple_pack_function( ompi_convertor_t* pConvertor, } source_base = pConvertor->pBaseBuf + pStack->disp; UPDATE_INTERNAL_COUNTERS( description, pos_desc, pElem, count_desc ); - DO_DEBUG( opal_output( 0, "pack new_loop count %d stack_pos %d pos_desc %d disp %ld space %lu\n", + DO_DEBUG( orte_output( 0, "pack new_loop count %d stack_pos %d pos_desc %d disp %ld space %lu\n", (int)pStack->count, pConvertor->stack_pos, pos_desc, (long)pStack->disp, (unsigned long)iov_len_local ); ); } if( DT_LOOP == pElem->elem.common.type ) { @@ -361,7 +361,7 @@ ompi_generic_simple_pack_function( ompi_convertor_t* pConvertor, /* I complete an element, next step I should go to the next one */ PUSH_STACK( pStack, pConvertor->stack_pos, pos_desc, DT_BYTE, count_desc, source_base - pStack->disp - pConvertor->pBaseBuf ); - DO_DEBUG( opal_output( 0, "pack save stack stack_pos %d pos_desc %d count_desc %d disp %ld\n", + DO_DEBUG( orte_output( 0, "pack save stack stack_pos %d pos_desc %d count_desc %d disp %ld\n", pConvertor->stack_pos, pStack->index, (int)pStack->count, (long)pStack->disp ); ); return 0; } diff --git a/ompi/datatype/datatype_pack.h b/ompi/datatype/datatype_pack.h index d6a56b271e..61a5b87630 100644 --- a/ompi/datatype/datatype_pack.h +++ b/ompi/datatype/datatype_pack.h @@ -36,7 +36,7 @@ static inline void pack_predefined_data( ompi_convertor_t* CONVERTOR, /* the extent and the size of the basic datatype are equals */ OMPI_DDT_SAFEGUARD_POINTER( _source, _copy_blength, (CONVERTOR)->pBaseBuf, (CONVERTOR)->pDesc, (CONVERTOR)->count ); - DO_DEBUG( opal_output( 0, "pack 1. memcpy( %p, %p, %lu ) => space %lu\n", + DO_DEBUG( orte_output( 0, "pack 1. memcpy( %p, %p, %lu ) => space %lu\n", *(DESTINATION), _source, (unsigned long)_copy_blength, (unsigned long)(*(SPACE)) ); ); MEMCPY_CSUM( *(DESTINATION), _source, _copy_blength, (CONVERTOR) ); _source += _copy_blength; @@ -46,7 +46,7 @@ static inline void pack_predefined_data( ompi_convertor_t* CONVERTOR, for( _i = 0; _i < _copy_count; _i++ ) { OMPI_DDT_SAFEGUARD_POINTER( _source, _copy_blength, (CONVERTOR)->pBaseBuf, (CONVERTOR)->pDesc, (CONVERTOR)->count ); - DO_DEBUG( opal_output( 0, "pack 2. memcpy( %p, %p, %lu ) => space %lu\n", + DO_DEBUG( orte_output( 0, "pack 2. memcpy( %p, %p, %lu ) => space %lu\n", *(DESTINATION), _source, (unsigned long)_copy_blength, (unsigned long)(*(SPACE) - (_i * _copy_blength)) ); ); MEMCPY_CSUM( *(DESTINATION), _source, _copy_blength, (CONVERTOR) ); *(DESTINATION) += _copy_blength; @@ -77,7 +77,7 @@ static inline void pack_contiguous_loop( ompi_convertor_t* CONVERTOR, for( _i = 0; _i < _copy_loops; _i++ ) { OMPI_DDT_SAFEGUARD_POINTER( _source, _end_loop->size, (CONVERTOR)->pBaseBuf, (CONVERTOR)->pDesc, (CONVERTOR)->count ); - DO_DEBUG( opal_output( 0, "pack 3. memcpy( %p, %p, %lu ) => space %lu\n", + DO_DEBUG( orte_output( 0, "pack 3. memcpy( %p, %p, %lu ) => space %lu\n", *(DESTINATION), _source, (unsigned long)_end_loop->size, (unsigned long)(*(SPACE) - _i * _end_loop->size) ); ); MEMCPY_CSUM( *(DESTINATION), _source, _end_loop->size, (CONVERTOR) ); *(DESTINATION) += _end_loop->size; diff --git a/ompi/datatype/datatype_unpack.c b/ompi/datatype/datatype_unpack.c index 1884772e16..8966ae7bc8 100644 --- a/ompi/datatype/datatype_unpack.c +++ b/ompi/datatype/datatype_unpack.c @@ -198,7 +198,7 @@ ompi_unpack_homogeneous_contig_function( ompi_convertor_t* pConv, ptrdiff_t extent = pData->ub - pData->lb; ptrdiff_t initial_displ = pConv->use_desc->desc[pConv->use_desc->used].end_loop.first_elem_disp; - DO_DEBUG( opal_output( 0, "unpack_homogeneous_contig( pBaseBuf %p, iov_count %d )\n", + DO_DEBUG( orte_output( 0, "unpack_homogeneous_contig( pBaseBuf %p, iov_count %d )\n", pConv->pBaseBuf, *out_size ); ); for( iov_count = 0; iov_count < (*out_size); iov_count++ ) { packed_buffer = (unsigned char*)iov[iov_count].iov_base; @@ -210,19 +210,19 @@ ompi_unpack_homogeneous_contig_function( ompi_convertor_t* pConv, if( (ptrdiff_t)pData->size == extent ) { user_memory += pConv->bConverted; - DO_DEBUG( opal_output( 0, "unpack_homogeneous_contig( user_memory %p, packed_buffer %p length %lu\n", + DO_DEBUG( orte_output( 0, "unpack_homogeneous_contig( user_memory %p, packed_buffer %p length %lu\n", user_memory, packed_buffer, (unsigned long)remaining ); ); /* contiguous data or basic datatype with count */ OMPI_DDT_SAFEGUARD_POINTER( user_memory, remaining, pConv->pBaseBuf, pData, pConv->count ); - DO_DEBUG( opal_output( 0, "1. unpack contig dest %p src %p length %lu\n", + DO_DEBUG( orte_output( 0, "1. unpack contig dest %p src %p length %lu\n", user_memory, packed_buffer, (unsigned long)remaining ); ); MEMCPY_CSUM( user_memory, packed_buffer, remaining, pConv ); } else { user_memory += stack[0].disp + stack[1].disp; - DO_DEBUG( opal_output( 0, "unpack_homogeneous_contig( user_memory %p, packed_buffer %p length %lu\n", + DO_DEBUG( orte_output( 0, "unpack_homogeneous_contig( user_memory %p, packed_buffer %p length %lu\n", user_memory, packed_buffer, (unsigned long)remaining ); ); length = pConv->bConverted / pData->size; /* already done */ @@ -234,7 +234,7 @@ ompi_unpack_homogeneous_contig_function( ompi_convertor_t* pConv, if( length <= remaining ) { OMPI_DDT_SAFEGUARD_POINTER( user_memory, length, pConv->pBaseBuf, pData, pConv->count ); - DO_DEBUG( opal_output( 0, "2. unpack dest %p src %p length %lu\n", + DO_DEBUG( orte_output( 0, "2. unpack dest %p src %p length %lu\n", user_memory, packed_buffer, (unsigned long)length ); ); MEMCPY_CSUM( user_memory, packed_buffer, length, pConv ); packed_buffer += length; @@ -245,7 +245,7 @@ ompi_unpack_homogeneous_contig_function( ompi_convertor_t* pConv, for( i = 0; pData->size <= remaining; i++ ) { OMPI_DDT_SAFEGUARD_POINTER( user_memory, pData->size, pConv->pBaseBuf, pData, pConv->count ); - DO_DEBUG( opal_output( 0, "3. unpack dest %p src %p length %lu\n", + DO_DEBUG( orte_output( 0, "3. unpack dest %p src %p length %lu\n", user_memory, packed_buffer, (unsigned long)pData->size ); ); MEMCPY_CSUM( user_memory, packed_buffer, pData->size, pConv ); packed_buffer += pData->size; @@ -258,7 +258,7 @@ ompi_unpack_homogeneous_contig_function( ompi_convertor_t* pConv, if( remaining != 0 ) { OMPI_DDT_SAFEGUARD_POINTER( user_memory, remaining, pConv->pBaseBuf, pData, pConv->count ); - DO_DEBUG( opal_output( 0, "4. unpack dest %p src %p length %lu\n", + DO_DEBUG( orte_output( 0, "4. unpack dest %p src %p length %lu\n", user_memory, packed_buffer, (unsigned long)remaining ); ); MEMCPY_CSUM( user_memory, packed_buffer, remaining, pConv ); user_memory += remaining; @@ -299,7 +299,7 @@ ompi_unpack_partial_datatype( ompi_convertor_t* pConvertor, dt_elem_desc_t* pEle uint32_t i, length, count_desc = 1; size_t data_length = ompi_ddt_basicDatatypes[pElem->elem.common.type]->size; - DO_DEBUG( opal_output( 0, "unpack partial data start %lu end %lu data_length %lu user %p\n" + DO_DEBUG( orte_output( 0, "unpack partial data start %lu end %lu data_length %lu user %p\n" "\tbConverted %lu total_length %lu count %d\n", (unsigned long)start_position, (unsigned long)end_position, (unsigned long)data_length, *user_buffer, (unsigned long)pConvertor->bConverted, (unsigned long)pConvertor->local_size, pConvertor->count ); ); @@ -365,7 +365,7 @@ ompi_generic_simple_unpack_function( ompi_convertor_t* pConvertor, size_t iov_len_local; uint32_t iov_count; - DO_DEBUG( opal_output( 0, "ompi_convertor_generic_simple_unpack( %p, {%p, %lu}, %u )\n", + DO_DEBUG( orte_output( 0, "ompi_convertor_generic_simple_unpack( %p, {%p, %lu}, %u )\n", (void*)pConvertor, iov[0].iov_base, (unsigned long)iov[0].iov_len, *out_size ); ); description = pConvertor->use_desc->desc; @@ -383,7 +383,7 @@ ompi_generic_simple_unpack_function( ompi_convertor_t* pConvertor, pElem = &(description[pos_desc]); user_memory_base += pStack->disp; - DO_DEBUG( opal_output( 0, "unpack start pos_desc %d count_desc %d disp %ld\n" + DO_DEBUG( orte_output( 0, "unpack start pos_desc %d count_desc %d disp %ld\n" "stack_pos %d pos_desc %d count_desc %d disp %ld\n", pos_desc, count_desc, (long)(user_memory_base - pConvertor->pBaseBuf), pConvertor->stack_pos, pStack->index, (int)pStack->count, (long)(pStack->disp) ); ); @@ -443,7 +443,7 @@ ompi_generic_simple_unpack_function( ompi_convertor_t* pConvertor, goto complete_loop; } if( DT_END_LOOP == pElem->elem.common.type ) { /* end of the current loop */ - DO_DEBUG( opal_output( 0, "unpack end_loop count %d stack_pos %d pos_desc %d disp %ld space %lu\n", + DO_DEBUG( orte_output( 0, "unpack end_loop count %d stack_pos %d pos_desc %d disp %ld space %lu\n", (int)pStack->count, pConvertor->stack_pos, pos_desc, (long)pStack->disp, (unsigned long)iov_len_local ); ); if( --(pStack->count) == 0 ) { /* end of loop */ @@ -466,7 +466,7 @@ ompi_generic_simple_unpack_function( ompi_convertor_t* pConvertor, } user_memory_base = pConvertor->pBaseBuf + pStack->disp; UPDATE_INTERNAL_COUNTERS( description, pos_desc, pElem, count_desc ); - DO_DEBUG( opal_output( 0, "unpack new_loop count %d stack_pos %d pos_desc %d disp %ld space %lu\n", + DO_DEBUG( orte_output( 0, "unpack new_loop count %d stack_pos %d pos_desc %d disp %ld space %lu\n", (int)pStack->count, pConvertor->stack_pos, pos_desc, (long)pStack->disp, (unsigned long)iov_len_local ); ); } @@ -506,7 +506,7 @@ ompi_generic_simple_unpack_function( ompi_convertor_t* pConvertor, /* I complete an element, next step I should go to the next one */ PUSH_STACK( pStack, pConvertor->stack_pos, pos_desc, DT_BYTE, count_desc, user_memory_base - pStack->disp - pConvertor->pBaseBuf ); - DO_DEBUG( opal_output( 0, "unpack save stack stack_pos %d pos_desc %d count_desc %d disp %ld\n", + DO_DEBUG( orte_output( 0, "unpack save stack stack_pos %d pos_desc %d count_desc %d disp %ld\n", pConvertor->stack_pos, pStack->index, (int)pStack->count, (long)pStack->disp ); ); return 0; } diff --git a/ompi/datatype/datatype_unpack.h b/ompi/datatype/datatype_unpack.h index 8dde1bc23c..7729795af3 100644 --- a/ompi/datatype/datatype_unpack.h +++ b/ompi/datatype/datatype_unpack.h @@ -36,7 +36,7 @@ static inline void unpack_predefined_data( ompi_convertor_t* CONVERTOR, /* the c /* the extent and the size of the basic datatype are equals */ OMPI_DDT_SAFEGUARD_POINTER( _destination, _copy_blength, (CONVERTOR)->pBaseBuf, (CONVERTOR)->pDesc, (CONVERTOR)->count ); - DO_DEBUG( opal_output( 0, "unpack 1. memcpy( %p, %p, %lu ) => space %lu\n", + DO_DEBUG( orte_output( 0, "unpack 1. memcpy( %p, %p, %lu ) => space %lu\n", _destination, *(SOURCE), (unsigned long)_copy_blength, (unsigned long)(*(SPACE)) ); ); MEMCPY_CSUM( _destination, *(SOURCE), _copy_blength, (CONVERTOR) ); *(SOURCE) += _copy_blength; @@ -46,7 +46,7 @@ static inline void unpack_predefined_data( ompi_convertor_t* CONVERTOR, /* the c for( _i = 0; _i < _copy_count; _i++ ) { OMPI_DDT_SAFEGUARD_POINTER( _destination, _copy_blength, (CONVERTOR)->pBaseBuf, (CONVERTOR)->pDesc, (CONVERTOR)->count ); - DO_DEBUG( opal_output( 0, "unpack 2. memcpy( %p, %p, %lu ) => space %lu\n", + DO_DEBUG( orte_output( 0, "unpack 2. memcpy( %p, %p, %lu ) => space %lu\n", _destination, *(SOURCE), (unsigned long)_copy_blength, (unsigned long)(*(SPACE) - (_i * _copy_blength)) ); ); MEMCPY_CSUM( _destination, *(SOURCE), _copy_blength, (CONVERTOR) ); *(SOURCE) += _copy_blength; @@ -77,7 +77,7 @@ static inline void unpack_contiguous_loop( ompi_convertor_t* CONVERTOR, for( _i = 0; _i < _copy_loops; _i++ ) { OMPI_DDT_SAFEGUARD_POINTER( _destination, _end_loop->size, (CONVERTOR)->pBaseBuf, (CONVERTOR)->pDesc, (CONVERTOR)->count ); - DO_DEBUG( opal_output( 0, "unpack 3. memcpy( %p, %p, %lu ) => space %lu\n", + DO_DEBUG( orte_output( 0, "unpack 3. memcpy( %p, %p, %lu ) => space %lu\n", _destination, *(SOURCE), (unsigned long)_end_loop->size, (unsigned long)(*(SPACE) - _i * _end_loop->size) ); ); MEMCPY_CSUM( _destination, *(SOURCE), _end_loop->size, (CONVERTOR) ); *(SOURCE) += _end_loop->size; diff --git a/ompi/datatype/dt_add.c b/ompi/datatype/dt_add.c index b312315f5a..e7d6f129ff 100644 --- a/ompi/datatype/dt_add.c +++ b/ompi/datatype/dt_add.c @@ -125,7 +125,7 @@ int32_t ompi_ddt_add( ompi_datatype_t* pdtBase, const ompi_datatype_t* pdtAdd, /* The data-type contain too many elements. We will be unable * to handle it, so let's just complain by now. */ - opal_output( 0, "Too many elements in the datatype. The limit is %ud\n", + orte_output( 0, "Too many elements in the datatype. The limit is %ud\n", MAX_DT_COMPONENT_COUNT ); return OMPI_ERROR; } diff --git a/ompi/datatype/dt_copy.c b/ompi/datatype/dt_copy.c index a6182a88de..201fd25fe1 100644 --- a/ompi/datatype/dt_copy.c +++ b/ompi/datatype/dt_copy.c @@ -60,7 +60,7 @@ static inline void copy_predefined_data( const dt_elem_desc_t* ELEM, OMPI_DDT_SAFEGUARD_POINTER( _source, _copy_blength, (SOURCE_BASE), (DATATYPE), (TOTAL_COUNT) ); /* the extent and the size of the basic datatype are equals */ - DO_DEBUG( opal_output( 0, "copy 1. memcpy( %p, %p, %lu ) => space %lu\n", + DO_DEBUG( orte_output( 0, "copy 1. memcpy( %p, %p, %lu ) => space %lu\n", _destination, _source, (unsigned long)_copy_blength, (unsigned long)(*(SPACE)) ); ); MEMCPY( _destination, _source, _copy_blength ); _source += _copy_blength; @@ -70,7 +70,7 @@ static inline void copy_predefined_data( const dt_elem_desc_t* ELEM, for( _i = 0; _i < _copy_count; _i++ ) { OMPI_DDT_SAFEGUARD_POINTER( _source, _copy_blength, (SOURCE_BASE), (DATATYPE), (TOTAL_COUNT) ); - DO_DEBUG( opal_output( 0, "copy 2. memcpy( %p, %p, %lu ) => space %lu\n", + DO_DEBUG( orte_output( 0, "copy 2. memcpy( %p, %p, %lu ) => space %lu\n", _destination, _source, (unsigned long)_copy_blength, (unsigned long)(*(SPACE) - (_i * _copy_blength)) ); ); MEMCPY( _destination, _source, _copy_blength ); _source += _elem->extent; @@ -106,7 +106,7 @@ static inline void copy_contiguous_loop( const dt_elem_desc_t* ELEM, for( _i = 0; _i < _copy_loops; _i++ ) { OMPI_DDT_SAFEGUARD_POINTER( _source, _end_loop->size, (SOURCE_BASE), (DATATYPE), (TOTAL_COUNT) ); - DO_DEBUG( opal_output( 0, "copy 3. memcpy( %p, %p, %lu ) => space %lu\n", + DO_DEBUG( orte_output( 0, "copy 3. memcpy( %p, %p, %lu ) => space %lu\n", _destination, _source, (unsigned long)_end_loop->size, (unsigned long)(*(SPACE) - _i * _end_loop->size) ); ); MEMCPY( _destination, _source, _end_loop->size ); _source += _loop->extent; @@ -138,7 +138,7 @@ int32_t ompi_ddt_copy_content_same_ddt( const ompi_datatype_t* datatype, int32_t unsigned char *source = (unsigned char*)source_base, *destination = (unsigned char*)destination_base; - DO_DEBUG( opal_output( 0, "ompi_ddt_copy_content_same_ddt( %p, %d, dst %p, src %p )\n", + DO_DEBUG( orte_output( 0, "ompi_ddt_copy_content_same_ddt( %p, %d, dst %p, src %p )\n", (void*)datatype, count, destination_base, source_base ); ); /* empty data ? then do nothing. This should normally be trapped * at a higher level. @@ -166,7 +166,7 @@ int32_t ompi_ddt_copy_content_same_ddt( const ompi_datatype_t* datatype, int32_t (unsigned char*)destination_base, datatype, count ); OMPI_DDT_SAFEGUARD_POINTER( source, memcpy_chunk, (unsigned char*)source_base, datatype, count ); - DO_DEBUG( opal_output( 0, "copy c1. memcpy( %p, %p, %lu ) => space %lu\n", + DO_DEBUG( orte_output( 0, "copy c1. memcpy( %p, %p, %lu ) => space %lu\n", destination, source, (unsigned long)memcpy_chunk, (unsigned long)total_length ); ); MEMCPY( destination, source, memcpy_chunk ); destination += memcpy_chunk; @@ -180,7 +180,7 @@ int32_t ompi_ddt_copy_content_same_ddt( const ompi_datatype_t* datatype, int32_t (unsigned char*)destination_base, datatype, count ); OMPI_DDT_SAFEGUARD_POINTER( source, datatype->size, (unsigned char*)source_base, datatype, count ); - DO_DEBUG( opal_output( 0, "copy c2. memcpy( %p, %p, %lu ) => space %lu\n", + DO_DEBUG( orte_output( 0, "copy c2. memcpy( %p, %p, %lu ) => space %lu\n", destination, source, (unsigned long)datatype->size, (unsigned long)(iov_len_local - (pos_desc * datatype->size)) ); ); MEMCPY( destination, source, datatype->size ); @@ -218,7 +218,7 @@ int32_t ompi_ddt_copy_content_same_ddt( const ompi_datatype_t* datatype, int32_t UPDATE_INTERNAL_COUNTERS( description, pos_desc, pElem, count_desc ); } if( DT_END_LOOP == pElem->elem.common.type ) { /* end of the current loop */ - DO_DEBUG( opal_output( 0, "copy end_loop count %d stack_pos %d pos_desc %d disp %ld space %lu\n", + DO_DEBUG( orte_output( 0, "copy end_loop count %d stack_pos %d pos_desc %d disp %ld space %lu\n", (int)pStack->count, stack_pos, pos_desc, (long)pStack->disp, (unsigned long)iov_len_local ); ); if( --(pStack->count) == 0 ) { /* end of loop */ if( stack_pos == 0 ) { @@ -240,7 +240,7 @@ int32_t ompi_ddt_copy_content_same_ddt( const ompi_datatype_t* datatype, int32_t source = (unsigned char*)source_base + pStack->disp; destination = (unsigned char*)destination_base + pStack->disp; UPDATE_INTERNAL_COUNTERS( description, pos_desc, pElem, count_desc ); - DO_DEBUG( opal_output( 0, "copy new_loop count %d stack_pos %d pos_desc %d disp %ld space %lu\n", + DO_DEBUG( orte_output( 0, "copy new_loop count %d stack_pos %d pos_desc %d disp %ld space %lu\n", (int)pStack->count, stack_pos, pos_desc, (long)pStack->disp, (unsigned long)iov_len_local ); ); } if( DT_LOOP == pElem->elem.common.type ) { diff --git a/ompi/datatype/dt_module.c b/ompi/datatype/dt_module.c index 94d23161c6..004edce569 100644 --- a/ompi/datatype/dt_module.c +++ b/ompi/datatype/dt_module.c @@ -837,7 +837,7 @@ int32_t ompi_ddt_finalize( void ) #if defined(VERBOSE) if( ompi_ddt_dfd != -1 ) - opal_output_close( ompi_ddt_dfd ); + orte_output_close( ompi_ddt_dfd ); ompi_ddt_dfd = -1; #endif /* VERBOSE */ @@ -999,7 +999,7 @@ void ompi_ddt_dump( const ompi_datatype_t* pData ) index += snprintf( buffer + index, length - index, "No optimized description\n" ); } buffer[index] = '\0'; /* make sure we end the string with 0 */ - opal_output( 0, "%s\n", buffer ); + orte_output( 0, "%s\n", buffer ); ompi_ddt_print_args( pData ); diff --git a/ompi/datatype/fake_stack.c b/ompi/datatype/fake_stack.c index ecc4819906..1c0afe300b 100644 --- a/ompi/datatype/fake_stack.c +++ b/ompi/datatype/fake_stack.c @@ -60,7 +60,7 @@ int ompi_convertor_create_stack_with_pos_general( ompi_convertor_t* pConvertor, assert( pConvertor->bConverted != starting_point ); assert( starting_point <=(pConvertor->count * pData->size) ); - /*opal_output( 0, "Data extent %d size %d count %d total_size %d starting_point %d\n", + /*orte_output( 0, "Data extent %d size %d count %d total_size %d starting_point %d\n", pData->ub - pData->lb, pData->size, pConvertor->count, pConvertor->local_size, starting_point );*/ pConvertor->stack_pos = 0; diff --git a/ompi/datatype/position.c b/ompi/datatype/position.c index 20de9ab26c..9d87083fa7 100644 --- a/ompi/datatype/position.c +++ b/ompi/datatype/position.c @@ -120,7 +120,7 @@ int ompi_convertor_generic_simple_position( ompi_convertor_t* pConvertor, if( iov_len_local > pConvertor->pDesc->size ) { pStack = pConvertor->pStack; /* we're working with the full stack */ count_desc = (uint32_t)(iov_len_local / pConvertor->pDesc->size); - DO_DEBUG( opal_output( 0, "position before %lu asked %lu data size %lu" + DO_DEBUG( orte_output( 0, "position before %lu asked %lu data size %lu" " iov_len_local %lu count_desc %d\n", (unsigned long)pConvertor->bConverted, (unsigned long)*position, (unsigned long)pConvertor->pDesc->size, (unsigned long)iov_len_local, count_desc ); ); @@ -133,7 +133,7 @@ int ompi_convertor_generic_simple_position( ompi_convertor_t* pConvertor, pConvertor->bConverted += count_desc * pConvertor->pDesc->size; iov_len_local = *position - pConvertor->bConverted; pStack[0].count -= count_desc; - DO_DEBUG( opal_output( 0, "after bConverted %lu remaining count %lu iov_len_local %lu\n", + DO_DEBUG( orte_output( 0, "after bConverted %lu remaining count %lu iov_len_local %lu\n", (unsigned long)pConvertor->bConverted, (unsigned long)pStack[0].count, (unsigned long)iov_len_local ); ); } @@ -146,14 +146,14 @@ int ompi_convertor_generic_simple_position( ompi_convertor_t* pConvertor, pElem = &(description[pos_desc]); base_pointer += pStack->disp; - DO_DEBUG( opal_output( 0, "position start pos_desc %d count_desc %d disp %llx\n" + DO_DEBUG( orte_output( 0, "position start pos_desc %d count_desc %d disp %llx\n" "stack_pos %d pos_desc %d count_desc %d disp %llx\n", pos_desc, count_desc, (unsigned long long)(base_pointer - pConvertor->pBaseBuf), pConvertor->stack_pos, pStack->index, (int)pStack->count, (unsigned long long)pStack->disp ); ); while( 1 ) { if( DT_END_LOOP == pElem->elem.common.type ) { /* end of the current loop */ - DO_DEBUG( opal_output( 0, "position end_loop count %d stack_pos %d pos_desc %d disp %llx space %lu\n", + DO_DEBUG( orte_output( 0, "position end_loop count %d stack_pos %d pos_desc %d disp %llx space %lu\n", (int)pStack->count, pConvertor->stack_pos, pos_desc, (unsigned long long)pStack->disp, (unsigned long)iov_len_local ); ); if( --(pStack->count) == 0 ) { /* end of loop */ @@ -176,7 +176,7 @@ int ompi_convertor_generic_simple_position( ompi_convertor_t* pConvertor, } base_pointer = pConvertor->pBaseBuf + pStack->disp; UPDATE_INTERNAL_COUNTERS( description, pos_desc, pElem, count_desc ); - DO_DEBUG( opal_output( 0, "position new_loop count %d stack_pos %d pos_desc %d disp %llx space %lu\n", + DO_DEBUG( orte_output( 0, "position new_loop count %d stack_pos %d pos_desc %d disp %llx space %lu\n", (int)pStack->count, pConvertor->stack_pos, pos_desc, (unsigned long long)pStack->disp, (unsigned long)iov_len_local ); ); } @@ -199,7 +199,7 @@ int ompi_convertor_generic_simple_position( ompi_convertor_t* pConvertor, base_pointer = pConvertor->pBaseBuf + pStack->disp; UPDATE_INTERNAL_COUNTERS( description, pos_desc, pElem, count_desc ); DDT_DUMP_STACK( pConvertor->pStack, pConvertor->stack_pos, pElem, "advance loop" ); - DO_DEBUG( opal_output( 0, "position set loop count %d stack_pos %d pos_desc %d disp %llx space %lu\n", + DO_DEBUG( orte_output( 0, "position set loop count %d stack_pos %d pos_desc %d disp %llx space %lu\n", (int)pStack->count, pConvertor->stack_pos, pos_desc, (unsigned long long)pStack->disp, (unsigned long)iov_len_local ); ); continue; @@ -216,7 +216,7 @@ int ompi_convertor_generic_simple_position( ompi_convertor_t* pConvertor, base_pointer = pConvertor->pBaseBuf + pStack->disp; pos_desc++; /* advance to the next data */ UPDATE_INTERNAL_COUNTERS( description, pos_desc, pElem, count_desc ); - DO_DEBUG( opal_output( 0, "position set loop count %d stack_pos %d pos_desc %d disp %llx space %lu\n", + DO_DEBUG( orte_output( 0, "position set loop count %d stack_pos %d pos_desc %d disp %llx space %lu\n", (int)pStack->count, pConvertor->stack_pos, pos_desc, (unsigned long long)pStack->disp, (unsigned long)iov_len_local ); ); } @@ -228,7 +228,7 @@ int ompi_convertor_generic_simple_position( ompi_convertor_t* pConvertor, /* I complete an element, next step I should go to the next one */ PUSH_STACK( pStack, pConvertor->stack_pos, pos_desc, DT_BYTE, count_desc, base_pointer - pStack->disp - pConvertor->pBaseBuf ); - DO_DEBUG( opal_output( 0, "position save stack stack_pos %d pos_desc %d count_desc %d disp %llx\n", + DO_DEBUG( orte_output( 0, "position save stack stack_pos %d pos_desc %d count_desc %d disp %llx\n", pConvertor->stack_pos, pStack->index, (int)pStack->count, (unsigned long long)pStack->disp ); ); return 0; } diff --git a/ompi/errhandler/errhandler_predefined.c b/ompi/errhandler/errhandler_predefined.c index aea87e05cd..9e9b5503a9 100644 --- a/ompi/errhandler/errhandler_predefined.c +++ b/ompi/errhandler/errhandler_predefined.c @@ -21,7 +21,7 @@ #include #include -#include "opal/util/output.h" +#include "orte/util/output.h" #include "ompi/errhandler/errhandler.h" #include "ompi/errhandler/errhandler_predefined.h" #include "ompi/errhandler/errcode.h" @@ -139,9 +139,9 @@ static void out(char *str, char *arg) { if (ompi_mpi_initialized && !ompi_mpi_finalized) { if (NULL != arg) { - opal_output(0, str, arg); + orte_output(0, str, arg); } else { - opal_output(0, str); + orte_output(0, str); } } else { if (NULL != arg) { diff --git a/ompi/file/file.c b/ompi/file/file.c index 3f7173a2f9..a75d9ee1e7 100644 --- a/ompi/file/file.c +++ b/ompi/file/file.c @@ -24,7 +24,7 @@ #include "ompi/runtime/params.h" #include "ompi/mca/io/base/base.h" #include "ompi/info/info.h" -#include "opal/util/output.h" +#include "orte/util/output.h" /* * Table for Fortran <-> C file handle conversion @@ -200,7 +200,7 @@ int ompi_file_finalize(void) we're destroying everything, it isn't worth it */ } if (num_unnamed > 0) { - opal_output(0, "WARNING: %lu unnamed MPI_File handles still allocated at MPI_FINALIZE", (unsigned long)num_unnamed); + orte_output(0, "WARNING: %lu unnamed MPI_File handles still allocated at MPI_FINALIZE", (unsigned long)num_unnamed); } OBJ_DESTRUCT(&ompi_file_f_to_c_table); diff --git a/ompi/group/group.h b/ompi/group/group.h index 8da7cd5738..d6a4542f0f 100644 --- a/ompi/group/group.h +++ b/ompi/group/group.h @@ -28,7 +28,7 @@ #ifndef OMPI_GROUP_H #define OMPI_GROUP_H -#include "opal/util/output.h" +#include "orte/util/output.h" #include "mpi.h" #include "opal/class/opal_pointer_array.h" #if defined(c_plusplus) || defined(__cplusplus) @@ -310,7 +310,7 @@ static inline struct ompi_proc_t* ompi_group_peer_lookup(ompi_group_t *group, in { #if OMPI_ENABLE_DEBUG if (peer_id >= group->grp_proc_count) { - opal_output(0, "ompi_group_lookup_peer: invalid peer index (%d)", peer_id); + orte_output(0, "ompi_group_lookup_peer: invalid peer index (%d)", peer_id); return (struct ompi_proc_t *) NULL; } #endif diff --git a/ompi/info/info.c b/ompi/info/info.c index 37745771ce..4a47bbe0ad 100644 --- a/ompi/info/info.c +++ b/ompi/info/info.c @@ -33,7 +33,7 @@ #include "ompi/constants.h" #include "ompi/info/info.h" #include "ompi/runtime/params.h" -#include "opal/util/output.h" +#include "orte/util/output.h" /* @@ -378,12 +378,12 @@ int ompi_info_finalize(void) if (!info->i_freed && ompi_debug_show_handle_leaks) { if (ompi_debug_show_handle_leaks) { - opal_output(0, "WARNING: MPI_Info still allocated at MPI_FINALIZE"); + orte_output(0, "WARNING: MPI_Info still allocated at MPI_FINALIZE"); for (item = opal_list_get_first(&(info->super)); opal_list_get_end(&(info->super)) != item; item = opal_list_get_next(item)) { entry = (ompi_info_entry_t *) item; - opal_output(0, "WARNING: key=\"%s\", value=\"%s\"", + orte_output(0, "WARNING: key=\"%s\", value=\"%s\"", entry->ie_key, NULL != entry->ie_value ? entry->ie_value : "(null)"); found = true; @@ -397,7 +397,7 @@ int ompi_info_finalize(void) since we're destroying everything, it isn't worth it */ if (!found && ompi_debug_show_handle_leaks) { - opal_output(0, "WARNING: (no keys)"); + orte_output(0, "WARNING: (no keys)"); } } } diff --git a/ompi/mca/allocator/basic/allocator_basic.c b/ompi/mca/allocator/basic/allocator_basic.c index d1b4c7136c..b9cf042db4 100644 --- a/ompi/mca/allocator/basic/allocator_basic.c +++ b/ompi/mca/allocator/basic/allocator_basic.c @@ -18,7 +18,7 @@ */ #include "ompi_config.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "allocator_basic.h" #include "ompi/constants.h" diff --git a/ompi/mca/bml/base/bml_base_btl.c b/ompi/mca/bml/base/bml_base_btl.c index 185ad00db5..d304ab4359 100644 --- a/ompi/mca/bml/base/bml_base_btl.c +++ b/ompi/mca/bml/base/bml_base_btl.c @@ -108,7 +108,7 @@ int mca_bml_base_send( mca_bml_base_btl_t* bml_btl, } if(mca_bml_base_error_count % 2) { /* local completion - network "drops" packet */ - opal_output(0, "%s:%d: dropping data, with local completion\n", __FILE__, __LINE__); + orte_output(0, "%s:%d: dropping data, with local completion\n", __FILE__, __LINE__); des->des_cbfunc(bml_btl->btl, bml_btl->btl_endpoint, des, OMPI_SUCCESS); return OMPI_SUCCESS; } else { @@ -116,7 +116,7 @@ int mca_bml_base_send( mca_bml_base_btl_t* bml_btl, mca_bml_base_context_t* ctx = (mca_bml_base_context_t*) malloc(sizeof(mca_bml_base_context_t)); if(NULL != ctx) { - opal_output(0, "%s:%d: corrupting data\n", __FILE__, __LINE__); + orte_output(0, "%s:%d: corrupting data\n", __FILE__, __LINE__); ctx->index = (size_t) ((des->des_src[0].seg_len * rand() * 1.0) / (RAND_MAX + 1.0)); ctx->cbfunc = des->des_cbfunc; ctx->cbdata = des->des_cbdata; diff --git a/ompi/mca/bml/base/bml_base_btl.h b/ompi/mca/bml/base/bml_base_btl.h index 00798f953d..71847e3883 100644 --- a/ompi/mca/bml/base/bml_base_btl.h +++ b/ompi/mca/bml/base/bml_base_btl.h @@ -24,7 +24,7 @@ #include "opal/mca/mca.h" #include "ompi/mca/bml/bml.h" -#include "opal/util/output.h" +#include "orte/util/output.h" /* * Global functions for the BML diff --git a/ompi/mca/bml/base/bml_base_endpoint.h b/ompi/mca/bml/base/bml_base_endpoint.h index f210212bd5..5eb3f56203 100644 --- a/ompi/mca/bml/base/bml_base_endpoint.h +++ b/ompi/mca/bml/base/bml_base_endpoint.h @@ -24,7 +24,7 @@ #include "opal/mca/mca.h" #include "ompi/mca/bml/bml.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "opal/threads/mutex.h" #include "bml_base_btl.h" diff --git a/ompi/mca/bml/base/bml_base_init.c b/ompi/mca/bml/base/bml_base_init.c index a1b00b8861..f4742bfe4c 100644 --- a/ompi/mca/bml/base/bml_base_init.c +++ b/ompi/mca/bml/base/bml_base_init.c @@ -67,7 +67,7 @@ int mca_bml_base_init( bool enable_progress_threads, cli = (mca_base_component_list_item_t*) item; component = (mca_bml_base_component_t*) cli->cli_component; if(NULL == component->bml_init) { - opal_output_verbose( 10, mca_bml_base_output, + orte_output_verbose( 10, mca_bml_base_output, "select: no init function; ignoring component %s", component->bml_version.mca_component_name ); continue; diff --git a/ompi/mca/bml/bml.h b/ompi/mca/bml/bml.h index f313dc7f8c..61a42c4d5c 100644 --- a/ompi/mca/bml/bml.h +++ b/ompi/mca/bml/bml.h @@ -133,7 +133,7 @@ static inline mca_bml_base_btl_t* mca_bml_base_btl_array_insert(mca_bml_base_btl { #if OMPI_ENABLE_DEBUG if(array->arr_size >= array->arr_reserve) { - opal_output(0, "mca_bml_base_btl_array_insert: invalid array index %lu >= %lu", + orte_output(0, "mca_bml_base_btl_array_insert: invalid array index %lu >= %lu", (unsigned long)array->arr_size, (unsigned long)array->arr_reserve); return 0; } @@ -179,7 +179,7 @@ static inline mca_bml_base_btl_t* mca_bml_base_btl_array_get_index(mca_bml_base_ { #if OMPI_ENABLE_DEBUG if(item_index >= array->arr_size) { - opal_output(0, "mca_bml_base_btl_array_get_index: invalid array index %lu >= %lu", + orte_output(0, "mca_bml_base_btl_array_get_index: invalid array index %lu >= %lu", (unsigned long)item_index, (unsigned long)array->arr_size); return 0; } @@ -198,7 +198,7 @@ static inline mca_bml_base_btl_t* mca_bml_base_btl_array_get_next(mca_bml_base_b { #if OMPI_ENABLE_DEBUG if(array->arr_size == 0) { - opal_output(0, "mca_bml_base_btl_array_get_next: invalid array size"); + orte_output(0, "mca_bml_base_btl_array_get_next: invalid array size"); return 0; } #endif diff --git a/ompi/mca/bml/r2/bml_r2.c b/ompi/mca/bml/r2/bml_r2.c index f5661223ce..d65de340ef 100644 --- a/ompi/mca/bml/r2/bml_r2.c +++ b/ompi/mca/bml/r2/bml_r2.c @@ -23,7 +23,7 @@ #include #include -#include "opal/util/show_help.h" +#include "orte/util/output.h" #include "ompi/class/ompi_bitmap.h" #include "ompi/mca/bml/bml.h" #include "ompi/mca/bml/base/base.h" @@ -244,7 +244,7 @@ int mca_bml_r2_add_procs( /* allocate bml specific proc data */ bml_endpoint = OBJ_NEW(mca_bml_base_endpoint_t); if (NULL == bml_endpoint) { - opal_output(0, "mca_bml_r2_add_procs: unable to allocate resources"); + orte_output(0, "mca_bml_r2_add_procs: unable to allocate resources"); free(btl_endpoints); return OMPI_ERR_OUT_OF_RESOURCE; } @@ -299,14 +299,14 @@ int mca_bml_r2_add_procs( bml_btl->btl_flags = btl->btl_flags; bml_btl->btl_put = btl->btl_put; if( (bml_btl->btl_flags & MCA_BTL_FLAGS_PUT) && (NULL == bml_btl->btl_put) ) { - opal_output(0, "mca_bml_r2_add_procs: The PUT flag is specified for" + orte_output(0, "mca_bml_r2_add_procs: The PUT flag is specified for" " the %s BTL without any PUT function attached. Disard the flag !", bml_btl->btl->btl_component->btl_version.mca_component_name); bml_btl->btl_flags ^= MCA_BTL_FLAGS_PUT; } bml_btl->btl_get = btl->btl_get; if( (bml_btl->btl_flags & MCA_BTL_FLAGS_GET) && (NULL == bml_btl->btl_get) ) { - opal_output(0, "mca_bml_r2_add_procs: The GET flag is specified for" + orte_output(0, "mca_bml_r2_add_procs: The GET flag is specified for" " the %s BTL without any GET function attached. Disard the flag !", bml_btl->btl->btl_component->btl_version.mca_component_name); bml_btl->btl_flags ^= MCA_BTL_FLAGS_GET; @@ -460,7 +460,7 @@ int mca_bml_r2_add_procs( remote = strdup("Unknown"); } - opal_show_help("help-mca-bml-r2", + orte_show_help("help-mca-bml-r2", "unreachable proc", true, local, remote, NULL); @@ -607,7 +607,7 @@ int mca_bml_r2_del_btl(mca_btl_base_module_t* btl) return OMPI_SUCCESS; if(opal_list_get_size(&mca_btl_base_modules_initialized) == 2){ - opal_output(0, "only one BTL left, can't failover"); + orte_output(0, "only one BTL left, can't failover"); goto CLEANUP; } diff --git a/ompi/mca/bml/r2/bml_r2_ft.c b/ompi/mca/bml/r2/bml_r2_ft.c index 4c9eb8306a..78c325a507 100644 --- a/ompi/mca/bml/r2/bml_r2_ft.c +++ b/ompi/mca/bml/r2/bml_r2_ft.c @@ -23,7 +23,7 @@ #include #include -#include "opal/util/show_help.h" +#include "orte/util/output.h" #include "ompi/runtime/ompi_cr.h" #include "ompi/class/ompi_bitmap.h" #include "ompi/mca/bml/bml.h" @@ -99,7 +99,7 @@ int mca_bml_r2_ft_event(int state) */ if( NULL != (mca_bml_r2.btl_modules[btl_idx])->btl_mpool && NULL != (mca_bml_r2.btl_modules[btl_idx])->btl_mpool->mpool_ft_event ) { - opal_output_verbose(10, ompi_cr_output, + orte_output_verbose(10, ompi_cr_output, "bml:r2: ft_event: Notify the %s MPool.\n", (mca_bml_r2.btl_modules[btl_idx])->btl_mpool->mpool_component->mpool_version.mca_component_name); if(OMPI_SUCCESS != (ret = (mca_bml_r2.btl_modules[btl_idx])->btl_mpool->mpool_ft_event(loc_state) ) ) { @@ -111,7 +111,7 @@ int mca_bml_r2_ft_event(int state) * Notify BTL */ if( NULL != (mca_bml_r2.btl_modules[btl_idx])->btl_ft_event) { - opal_output_verbose(10, ompi_cr_output, + orte_output_verbose(10, ompi_cr_output, "bml:r2: ft_event: Notify the %s BTL.\n", (mca_bml_r2.btl_modules[btl_idx])->btl_component->btl_version.mca_component_name); if(OMPI_SUCCESS != (ret = (mca_bml_r2.btl_modules[btl_idx])->btl_ft_event(loc_state) ) ) { @@ -140,7 +140,7 @@ int mca_bml_r2_ft_event(int state) mca_bml_r2.btl_progress = NULL; } - opal_output_verbose(10, ompi_cr_output, + orte_output_verbose(10, ompi_cr_output, "bml:r2: ft_event(Restart): Reselect BTLs\n"); /* @@ -152,7 +152,7 @@ int mca_bml_r2_ft_event(int state) * are not available now. */ if( OMPI_SUCCESS != (ret = mca_btl_base_close())) { - opal_output(0, "bml:r2: ft_event(Restart): Failed to close BTL framework\n"); + orte_output(0, "bml:r2: ft_event(Restart): Failed to close BTL framework\n"); return ret; } @@ -164,11 +164,11 @@ int mca_bml_r2_ft_event(int state) * we try to remove some restart only files. */ if (OMPI_SUCCESS != (ret = orte_grpcomm.barrier())) { - opal_output(0, "bml:r2: ft_event(Restart): Failed in orte_grpcomm.barrier (%d)", ret); + orte_output(0, "bml:r2: ft_event(Restart): Failed in orte_grpcomm.barrier (%d)", ret); return ret; } - opal_output_verbose(10, ompi_cr_output, + orte_output_verbose(10, ompi_cr_output, "bml:r2: ft_event(Restart): Cleanup restart files\n"); opal_crs_base_cleanup_flush(); @@ -176,7 +176,7 @@ int mca_bml_r2_ft_event(int state) * Re-open the BTL framework to get the full list of components. */ if( OMPI_SUCCESS != (ret = mca_btl_base_open()) ) { - opal_output(0, "bml:r2: ft_event(Restart): Failed to open BTL framework\n"); + orte_output(0, "bml:r2: ft_event(Restart): Failed to open BTL framework\n"); return ret; } @@ -187,7 +187,7 @@ int mca_bml_r2_ft_event(int state) */ if( OMPI_SUCCESS != (ret = mca_btl_base_select(OMPI_ENABLE_PROGRESS_THREADS, OMPI_ENABLE_MPI_THREADS) ) ) { - opal_output(0, "bml:r2: ft_event(Restart): Failed to select in BTL framework\n"); + orte_output(0, "bml:r2: ft_event(Restart): Failed to select in BTL framework\n"); return ret; } diff --git a/ompi/mca/bml/r2/bml_r2_ft.h b/ompi/mca/bml/r2/bml_r2_ft.h index 8d77db7e90..e92d3b7d5e 100644 --- a/ompi/mca/bml/r2/bml_r2_ft.h +++ b/ompi/mca/bml/r2/bml_r2_ft.h @@ -21,7 +21,7 @@ #ifndef MCA_BML_R2_FT_H #define MCA_BML_R2_FT_H -#include "opal/util/output.h" +#include "orte/util/output.h" #include "ompi/mca/btl/btl.h" #if defined(c_plusplus) || defined(__cplusplus) diff --git a/ompi/mca/btl/base/btl_base_error.c b/ompi/mca/btl/base/btl_base_error.c index ce850ba99a..b40cd1cef1 100644 --- a/ompi/mca/btl/base/btl_base_error.c +++ b/ompi/mca/btl/base/btl_base_error.c @@ -24,8 +24,8 @@ #include "base.h" #include "btl_base_error.h" -#include "opal/util/show_help.h" +#include "orte/util/output.h" #include "orte/util/proc_info.h" #include "orte/types.h" #include "orte/util/name_fns.h" @@ -65,7 +65,7 @@ void mca_btl_base_error_no_nics(const char* transport, /* print out no-nic warning if user told us to */ asprintf(&procid, "%s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME)); - opal_show_help("help-mpi-btl-base.txt", "btl:no-nics", + orte_show_help("help-mpi-btl-base.txt", "btl:no-nics", true, procid, transport, orte_process_info.nodename, nic_name); free(procid); diff --git a/ompi/mca/btl/base/btl_base_error.h b/ompi/mca/btl/base/btl_base_error.h index cf8514177e..e22a730ec7 100644 --- a/ompi/mca/btl/base/btl_base_error.h +++ b/ompi/mca/btl/base/btl_base_error.h @@ -9,7 +9,7 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. - * Copyright (c) 2007 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2007-2008 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2007 Sun Microsystems, Inc. All rights reserved. * $COPYRIGHT$ * @@ -28,6 +28,7 @@ #include "orte/util/proc_info.h" #include "orte/util/name_fns.h" +#include "orte/util/output.h" #include "orte/runtime/orte_globals.h" OMPI_DECLSPEC extern int mca_btl_base_verbose; diff --git a/ompi/mca/btl/base/btl_base_mca.c b/ompi/mca/btl/base/btl_base_mca.c index aa9ac1ece0..fee83581bf 100644 --- a/ompi/mca/btl/base/btl_base_mca.c +++ b/ompi/mca/btl/base/btl_base_mca.c @@ -24,6 +24,9 @@ #include #include "opal/mca/base/mca_base_param.h" + +#include "orte/util/output.h" + #include "ompi/mca/btl/btl.h" #include "ompi/mca/btl/base/base.h" @@ -72,7 +75,7 @@ int mca_btl_base_param_register(mca_base_component_t *version, mca_base_param_reg_int(version, "min_rdma_size", "", true, false, 0, &value); if(value != 0) { - opal_output(0, "min_rdma_size BTL parameter is deprecated. Please " + orte_output(0, "min_rdma_size BTL parameter is deprecated. Please " "use the rdma_pipeline_send_length BTL parameter instead\n"); module->btl_rdma_pipeline_send_length = (size_t)value; } @@ -85,7 +88,7 @@ int mca_btl_base_param_register(mca_base_component_t *version, mca_base_param_reg_int(version, "max_rdma_size", "", true, false, 0, &value); if (0 != value) { - opal_output(0, "The max_rdma_size BTL parameter is deprecated. Please use the rdma_pipeline_frag_size BTL parameter instead"); + orte_output(0, "The max_rdma_size BTL parameter is deprecated. Please use the rdma_pipeline_frag_size BTL parameter instead"); module->btl_rdma_pipeline_frag_size = (size_t)value; } diff --git a/ompi/mca/btl/base/btl_base_open.c b/ompi/mca/btl/base/btl_base_open.c index 7284f22543..85777e5ca4 100644 --- a/ompi/mca/btl/base/btl_base_open.c +++ b/ompi/mca/btl/base/btl_base_open.c @@ -23,7 +23,10 @@ #include "opal/mca/mca.h" #include "opal/mca/base/base.h" -#include "opal/util/output.h" +#include "orte/util/output.h" + +#include "orte/util/output.h" + #include "opal/mca/base/mca_base_param.h" #include "ompi/mca/pml/pml.h" #include "ompi/mca/btl/btl.h" @@ -94,8 +97,8 @@ int mca_btl_base_open(void) 0, &mca_btl_base_verbose); - mca_btl_base_output = opal_output_open(NULL); - opal_output_set_verbosity(mca_btl_base_output, mca_btl_base_verbose); + mca_btl_base_output = orte_output_open(NULL, "BTL", "DEBUG", NULL); + orte_output_set_verbosity(mca_btl_base_output, mca_btl_base_verbose); /* Open up all available components */ diff --git a/ompi/mca/btl/base/btl_base_select.c b/ompi/mca/btl/base/btl_base_select.c index 49fc876972..84340431db 100644 --- a/ompi/mca/btl/base/btl_base_select.c +++ b/ompi/mca/btl/base/btl_base_select.c @@ -20,8 +20,7 @@ #include "ompi_config.h" #include "opal/util/argv.h" -#include "opal/util/show_help.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "opal/mca/mca.h" #include "opal/mca/base/base.h" #include "opal/mca/base/mca_base_component_repository.h" @@ -99,12 +98,12 @@ int mca_btl_base_select(bool enable_progress_threads, } } - opal_output_verbose(10, mca_btl_base_output, + orte_output_verbose(10, mca_btl_base_output, "select: initializing %s component %s", component->btl_version.mca_type_name, component->btl_version.mca_component_name); if (NULL == component->btl_init) { - opal_output_verbose(10, mca_btl_base_output, + orte_output_verbose(10, mca_btl_base_output, "select: no init function; ignoring component %s", component->btl_version.mca_component_name); } else { @@ -115,10 +114,10 @@ int mca_btl_base_select(bool enable_progress_threads, list and remove it from the component repository */ if (NULL == modules) { - opal_output_verbose(10, mca_btl_base_output, + orte_output_verbose(10, mca_btl_base_output, "select: init of component %s returned failure", component->btl_version.mca_component_name); - opal_output_verbose(10, mca_btl_base_output, + orte_output_verbose(10, mca_btl_base_output, "select: module %s unloaded", component->btl_version.mca_component_name); @@ -129,7 +128,7 @@ int mca_btl_base_select(bool enable_progress_threads, /* Otherwise, it initialized properly. Save it. */ else { - opal_output_verbose(10, mca_btl_base_output, + orte_output_verbose(10, mca_btl_base_output, "select: init of component %s returned success", component->btl_version.mca_component_name); @@ -152,7 +151,7 @@ int mca_btl_base_select(bool enable_progress_threads, /* Finished querying all components. Check for the bozo case. */ if (0 == opal_list_get_size(&mca_btl_base_modules_initialized)) { - opal_show_help("help-mca-base.txt", "find-available:none-found", true, + orte_show_help("help-mca-base.txt", "find-available:none-found", true, "btl"); orte_errmgr.abort(1, NULL); } diff --git a/ompi/mca/btl/elan/btl_elan.c b/ompi/mca/btl/elan/btl_elan.c index e9089d78b2..e1103448dc 100644 --- a/ompi/mca/btl/elan/btl_elan.c +++ b/ompi/mca/btl/elan/btl_elan.c @@ -10,7 +10,7 @@ */ #include "ompi_config.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "opal/util/if.h" #include "ompi/mca/pml/pml.h" #include "ompi/mca/btl/btl.h" @@ -471,7 +471,7 @@ static int mca_btl_elan_send( struct mca_btl_base_module_t* btl, (void*)elan_hdr, send_len, ELAN_RAIL_ALL ); if( OPAL_UNLIKELY(NULL == frag->elan_event) ) { - opal_output( 0, "elan_queueTx failed for destination %d\n", endpoint->elan_vp ); + orte_output( 0, "elan_queueTx failed for destination %d\n", endpoint->elan_vp ); return OMPI_ERROR; } } else { @@ -479,7 +479,7 @@ static int mca_btl_elan_send( struct mca_btl_base_module_t* btl, elan_btl->elan_vp, frag->tag, (void*)elan_hdr, frag->segment.seg_len ); if( OPAL_UNLIKELY(NULL == frag->elan_event) ) { - opal_output( 0, "elan_tportTxStart failed for destination %d\n", endpoint->elan_vp ); + orte_output( 0, "elan_tportTxStart failed for destination %d\n", endpoint->elan_vp ); return OMPI_ERROR; } } @@ -554,7 +554,7 @@ static int mca_btl_elan_get( mca_btl_base_module_t* btl, frag->endpoint = endpoint; frag->btl = elan_btl; frag->type = MCA_BTL_ELAN_HDR_TYPE_GET; - opal_output( 0, "elan_get( remote %p, local %p, length %d, peer %d )\n", + orte_output( 0, "elan_get( remote %p, local %p, length %d, peer %d )\n", (void*)src_addr, (void*)dst_addr, (int)src_len, peer ); frag->elan_event = elan_get(elan_btl->base->state, src_addr, dst_addr, src_len, peer); /* Add the fragment to the pending RDMA list */ diff --git a/ompi/mca/btl/elan/btl_elan.h b/ompi/mca/btl/elan/btl_elan.h index 253c90d8fa..e540e96f8a 100644 --- a/ompi/mca/btl/elan/btl_elan.h +++ b/ompi/mca/btl/elan/btl_elan.h @@ -23,7 +23,7 @@ #include "opal/event/event.h" #include "ompi/mca/pml/pml.h" #include "ompi/mca/btl/btl.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "ompi/mca/btl/base/btl_base_error.h" #include "ompi/mca/btl/btl.h" diff --git a/ompi/mca/btl/elan/btl_elan_component.c b/ompi/mca/btl/elan/btl_elan_component.c index 6dc991ae51..bb3324dea1 100644 --- a/ompi/mca/btl/elan/btl_elan_component.c +++ b/ompi/mca/btl/elan/btl_elan_component.c @@ -15,7 +15,7 @@ #include "opal/event/event.h" #include "opal/util/if.h" #include "opal/util/argv.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "ompi/mca/pml/pml.h" #include "ompi/mca/btl/btl.h" @@ -231,13 +231,13 @@ mca_btl_elan_component_init( int *num_btl_modules, } } if( 0 == fscanf( position, "%s%i", file_line, &positions[count] ) ) { - opal_output( 0, "Unable to read the network position" ); + orte_output( 0, "Unable to read the network position" ); continue; } fclose(position); btl = (mca_btl_elan_module_t*)malloc (sizeof (mca_btl_elan_module_t)); if(NULL == btl) { - opal_output( 0, "No enough memory to allocate the Elan internal structures" ); + orte_output( 0, "No enough memory to allocate the Elan internal structures" ); return NULL; } memcpy( btl, &mca_btl_elan_module, sizeof(mca_btl_elan_module_t) ); diff --git a/ompi/mca/btl/gm/btl_gm.c b/ompi/mca/btl/gm/btl_gm.c index ddc01720a6..c5cb5916f6 100644 --- a/ompi/mca/btl/gm/btl_gm.c +++ b/ompi/mca/btl/gm/btl_gm.c @@ -19,7 +19,7 @@ #include "ompi_config.h" #include -#include "opal/util/output.h" +#include "orte/util/output.h" #include "opal/util/if.h" #include "ompi/mca/pml/pml.h" #include "ompi/mca/btl/btl.h" @@ -484,7 +484,7 @@ static void mca_btl_gm_send_callback( struct gm_port* port, void* context, gm_st default: /* error condition can't deal with */ - opal_output(0, "[%s:%d] send completed with unhandled gm error %d\n", __FILE__,__LINE__,status); + orte_output(0, "[%s:%d] send completed with unhandled gm error %d\n", __FILE__,__LINE__,status); /* release the send token */ OPAL_THREAD_ADD32( &btl->gm_num_send_tokens, 1 ); @@ -678,7 +678,7 @@ static void mca_btl_gm_put_callback( struct gm_port* port, void* context, gm_sta break; default: /* error condition can't deal with */ - opal_output(0, "[%s:%d] gm_put operation failed with status %d\n", __FILE__, __LINE__, status); + orte_output(0, "[%s:%d] gm_put operation failed with status %d\n", __FILE__, __LINE__, status); /* release the send token */ OPAL_THREAD_ADD32( &btl->gm_num_send_tokens, 1 ); @@ -832,7 +832,7 @@ static void mca_btl_gm_get_callback( struct gm_port* port, void* context, gm_sta break; default: /* error condition can't deal with */ - opal_output(0, "[%s:%d] gm_get operation failed with status %d\n", __FILE__, __LINE__, status); + orte_output(0, "[%s:%d] gm_get operation failed with status %d\n", __FILE__, __LINE__, status); /* release the send token */ OPAL_THREAD_ADD32( &btl->gm_num_send_tokens, 1 ); diff --git a/ompi/mca/btl/gm/btl_gm.h b/ompi/mca/btl/gm/btl_gm.h index 9260cb72a4..b45bd62433 100644 --- a/ompi/mca/btl/gm/btl_gm.h +++ b/ompi/mca/btl/gm/btl_gm.h @@ -34,7 +34,7 @@ #include "ompi/mca/pml/pml.h" #include "ompi/mca/btl/btl.h" #include "ompi/mca/btl/base/base.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "ompi/mca/mpool/mpool.h" #include "ompi/mca/btl/btl.h" #include "btl_gm_endpoint.h" diff --git a/ompi/mca/btl/gm/btl_gm_component.c b/ompi/mca/btl/gm/btl_gm_component.c index 42bdad47c4..0d02604005 100644 --- a/ompi/mca/btl/gm/btl_gm_component.c +++ b/ompi/mca/btl/gm/btl_gm_component.c @@ -23,7 +23,7 @@ #include "opal/event/event.h" #include "opal/util/if.h" #include "opal/util/argv.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "ompi/mca/pml/pml.h" #include "ompi/mca/btl/btl.h" #include "ompi/request/request.h" @@ -220,7 +220,7 @@ static int gm_dereg_mr(void *reg_data, mca_mpool_base_registration_t *reg) rc = gm_deregister_memory(port, reg->base, reg->bound - reg->base + 1); if(rc != GM_SUCCESS) { - opal_output(0, "%s: error unpinning gm memory errno says %s\n", + orte_output(0, "%s: error unpinning gm memory errno says %s\n", __func__, strerror(errno)); return OMPI_ERROR; } @@ -278,7 +278,7 @@ mca_btl_gm_module_init (mca_btl_gm_module_t * btl) &btl->super, &resources); if(NULL == btl->super.btl_mpool) { - opal_output (0, "[%s:%d] unable to initialize mpool", __FILE__, __LINE__); + orte_output (0, "[%s:%d] unable to initialize mpool", __FILE__, __LINE__); return OMPI_ERROR; } @@ -349,7 +349,7 @@ mca_btl_gm_module_init (mca_btl_gm_module_t * btl) /* enable rdma */ if( GM_SUCCESS != gm_allow_remote_memory_access (btl->port) ) { - opal_output (0, "[%s:%d] unable to allow remote memory access", __FILE__, __LINE__); + orte_output (0, "[%s:%d] unable to allow remote memory access", __FILE__, __LINE__); return OMPI_ERROR; } @@ -359,7 +359,7 @@ mca_btl_gm_module_init (mca_btl_gm_module_t * btl) btl->gm_thread.t_run = mca_btl_gm_progress_thread; btl->gm_thread.t_arg = btl; if(OPAL_SUCCESS != (rc = opal_thread_start(&btl->gm_thread))) { - opal_output (0, "[%s:%d] unable to create progress thread, retval=%d", __FILE__, __LINE__, rc); + orte_output (0, "[%s:%d] unable to create progress thread, retval=%d", __FILE__, __LINE__, rc); return rc; } #endif @@ -402,18 +402,18 @@ static int mca_btl_gm_discover( void ) /* Get node local Id */ if( GM_SUCCESS != gm_get_node_id( port, &node_id) ) { - opal_output (0, " failure to get node_id \n"); + orte_output (0, " failure to get node_id \n"); continue; } /* Gather an unique id for the node */ #if GM_API_VERSION > 0x200 if (GM_SUCCESS != gm_node_id_to_global_id( port, node_id, &global_id) ) { - opal_output (0, "[%s:%d] Unable to get my GM global unique id", __FILE__, __LINE__); + orte_output (0, "[%s:%d] Unable to get my GM global unique id", __FILE__, __LINE__); continue; } #else if( GM_SUCCESS != gm_get_host_name( port, global_id ) ) { - opal_output( 0, "[%s:%d] Unable to get the GM host name\n", __FILE__, __LINE__); + orte_output( 0, "[%s:%d] Unable to get the GM host name\n", __FILE__, __LINE__); continue; } #endif /* GM_API_VERSION > 0x200 */ @@ -421,7 +421,7 @@ static int mca_btl_gm_discover( void ) /* create the btl module */ btl = (mca_btl_gm_module_t *)malloc( sizeof(mca_btl_gm_module_t) ); if (NULL == btl) { - opal_output( 0, "[%s:%d] out of resources", __FILE__, __LINE__); + orte_output( 0, "[%s:%d] out of resources", __FILE__, __LINE__); return OMPI_ERR_OUT_OF_RESOURCE; } /* copy the basic informations into the new BTL */ @@ -438,7 +438,7 @@ static int mca_btl_gm_discover( void ) #endif /* GM_API_VERSION > 0x200 */ if(mca_btl_gm_component.gm_debug > 0) { - opal_output(0, + orte_output(0, "%s gm_port %08lX, " "board %" PRIu32 ", global %" PRIu32 " " "node %" PRIu32 "port %" PRIu32 "\n", @@ -447,7 +447,7 @@ static int mca_btl_gm_discover( void ) } if((rc = mca_btl_gm_module_init(btl)) != OMPI_SUCCESS) { - opal_output(0, "[%s:%d] unable to initialze gm port", __FILE__, __LINE__); + orte_output(0, "[%s:%d] unable to initialze gm port", __FILE__, __LINE__); return rc; } @@ -511,7 +511,7 @@ mca_btl_gm_component_init (int *num_btl_modules, /* try to initialize GM */ if( GM_SUCCESS != gm_init() ) { - opal_output( 0, "[%s:%d] error in initializing the gm library\n", __FILE__, __LINE__ ); + orte_output( 0, "[%s:%d] error in initializing the gm library\n", __FILE__, __LINE__ ); mca_btl_gm_component.gm_num_btls = 0; mca_btl_gm_modex_send(); OPAL_THREAD_UNLOCK(&mca_btl_gm_component.gm_lock); @@ -521,7 +521,7 @@ mca_btl_gm_component_init (int *num_btl_modules, /* First discover all available boards. For each board we create a unique BTL */ mca_btl_gm_component.gm_btls = malloc( mca_btl_gm_component.gm_max_btls * sizeof (mca_btl_gm_module_t *)); if (NULL == mca_btl_gm_component.gm_btls) { - opal_output( 0, "[%s:%d] out of resources.", __FILE__, __LINE__ ); + orte_output( 0, "[%s:%d] out of resources.", __FILE__, __LINE__ ); OPAL_THREAD_UNLOCK(&mca_btl_gm_component.gm_lock); return NULL; } diff --git a/ompi/mca/btl/gm/btl_gm_proc.c b/ompi/mca/btl/gm/btl_gm_proc.c index 476fa4ddee..2e20e6b0b2 100644 --- a/ompi/mca/btl/gm/btl_gm_proc.c +++ b/ompi/mca/btl/gm/btl_gm_proc.c @@ -131,14 +131,14 @@ mca_btl_gm_proc_t* mca_btl_gm_proc_create(ompi_proc_t* ompi_proc) (void*)&gm_proc->proc_addrs, &size); if(OMPI_SUCCESS != rc) { - opal_output(0, "[%s:%d] ompi_modex_recv failed for peer %s", + orte_output(0, "[%s:%d] ompi_modex_recv failed for peer %s", __FILE__,__LINE__,ORTE_NAME_PRINT(&ompi_proc->proc_name)); OBJ_RELEASE(gm_proc); return NULL; } if((size % sizeof(mca_btl_gm_addr_t)) != 0) { - opal_output(0, "[%s:%d] invalid gm address for peer %s", + orte_output(0, "[%s:%d] invalid gm address for peer %s", __FILE__,__LINE__,ORTE_NAME_PRINT(&ompi_proc->proc_name)); OBJ_RELEASE(gm_proc); return NULL; @@ -187,12 +187,12 @@ int mca_btl_gm_proc_insert( gm_btl->port, gm_endpoint->endpoint_addr.global_id, &gm_endpoint->endpoint_addr.node_id)) { - opal_output( 0, "[%s:%d] error in converting global to local id \n", + orte_output( 0, "[%s:%d] error in converting global to local id \n", __FILE__, __LINE__ ); return OMPI_ERROR; } if(mca_btl_gm_component.gm_debug > 0) { - opal_output(0, "%s mapped global id %" PRIu32 + orte_output(0, "%s mapped global id %" PRIu32 " to node id %" PRIu32 "\n", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), gm_endpoint->endpoint_addr.global_id, @@ -202,7 +202,7 @@ int mca_btl_gm_proc_insert( gm_endpoint->endpoint_addr.node_id = gm_host_name_to_node_id( gm_btl->port, gm_endpoint->endpoint_addr.global_id); if( GM_NO_SUCH_NODE_ID == gm_endpoint->endpoint_addr.node_id ) { - opal_output( 0, "[%s:%d] unable to convert the remote host name (%s) to a host id", + orte_output( 0, "[%s:%d] unable to convert the remote host name (%s) to a host id", __FILE__, __LINE__, gm_endpoint->endpoint_addr.global_id); return OMPI_ERROR; } diff --git a/ompi/mca/btl/mx/btl_mx.c b/ompi/mca/btl/mx/btl_mx.c index d534553cc6..e9998d6971 100644 --- a/ompi/mca/btl/mx/btl_mx.c +++ b/ompi/mca/btl/mx/btl_mx.c @@ -95,7 +95,7 @@ int mca_btl_mx_del_procs( struct mca_btl_base_module_t* btl, struct ompi_proc_t** procs, struct mca_btl_base_endpoint_t** peers ) { - opal_output( 0, "MX BTL delete procs\n" ); + orte_output( 0, "MX BTL delete procs\n" ); /* TODO */ return OMPI_SUCCESS; } @@ -121,7 +121,7 @@ int mca_btl_mx_register( struct mca_btl_base_module_t* btl, for( i = 0; i < mca_btl_mx_component.mx_max_posted_recv; i++ ) { MCA_BTL_MX_FRAG_ALLOC_EAGER( mx_btl, frag, rc ); if( NULL == frag ) { - opal_output( 0, "mca_btl_mx_register: unable to allocate more eager fragments\n" ); + orte_output( 0, "mca_btl_mx_register: unable to allocate more eager fragments\n" ); if( 0 == i ) { return OMPI_ERROR; } @@ -140,7 +140,7 @@ int mca_btl_mx_register( struct mca_btl_base_module_t* btl, 0x01ULL, BTL_MX_RECV_MASK, frag, &(frag->mx_request) ); if( MX_SUCCESS != mx_return ) { - opal_output( 0, "mca_btl_mx_register: mx_irecv failed with status %d (%s)\n", + orte_output( 0, "mca_btl_mx_register: mx_irecv failed with status %d (%s)\n", mx_return, mx_strerror(mx_return) ); MCA_BTL_MX_FRAG_RETURN( mx_btl, frag ); return OMPI_ERROR; @@ -323,7 +323,7 @@ mca_btl_base_descriptor_t* mca_btl_mx_prepare_dst( struct mca_btl_base_module_t* frag->segment[0].seg_key.key64, BTL_MX_PUT_MASK, NULL, &(frag->mx_request) ); if( OPAL_UNLIKELY(MX_SUCCESS != mx_return) ) { - opal_output( 0, "Fail to re-register a fragment with the MX NIC ...\n" ); + orte_output( 0, "Fail to re-register a fragment with the MX NIC ...\n" ); MCA_BTL_MX_FRAG_RETURN( btl, frag ); return NULL; } @@ -332,7 +332,7 @@ mca_btl_base_descriptor_t* mca_btl_mx_prepare_dst( struct mca_btl_base_module_t* { mx_return = mx_forget( mx_btl->mx_endpoint, &(frag->mx_request) ); if( OPAL_UNLIKELY(MX_SUCCESS != mx_return) ) { - opal_output( 0, "mx_forget failed in mca_btl_mx_prepare_dst with error %d (%s)\n", + orte_output( 0, "mx_forget failed in mca_btl_mx_prepare_dst with error %d (%s)\n", mx_return, mx_strerror(mx_return) ); return NULL; } @@ -389,7 +389,7 @@ static int mca_btl_mx_put( struct mca_btl_base_module_t* btl, descriptor->des_dst[0].seg_key.key64, frag, &frag->mx_request ); if( OPAL_UNLIKELY(MX_SUCCESS != mx_return) ) { - opal_output( 0, "mx_isend fails with error %s\n", mx_strerror(mx_return) ); + orte_output( 0, "mx_isend fails with error %s\n", mx_strerror(mx_return) ); return OMPI_ERROR; } return OMPI_SUCCESS; @@ -442,7 +442,7 @@ int mca_btl_mx_send( struct mca_btl_base_module_t* btl, endpoint->mx_peer_addr, tag64, frag, &frag->mx_request ); if( OPAL_UNLIKELY(MX_SUCCESS != mx_return) ) { - opal_output( 0, "mx_isend fails with error %s\n", mx_strerror(mx_return) ); + orte_output( 0, "mx_isend fails with error %s\n", mx_strerror(mx_return) ); return OMPI_ERROR; } @@ -451,7 +451,7 @@ int mca_btl_mx_send( struct mca_btl_base_module_t* btl, uint32_t mx_result; mx_return = mx_ibuffered( mx_btl->mx_endpoint, &(frag->mx_request), &mx_result ); if( OPAL_UNLIKELY(MX_SUCCESS != mx_return) ) { - opal_output( 0, "mx_ibuffered failed with error %d (%s)\n", + orte_output( 0, "mx_ibuffered failed with error %d (%s)\n", mx_return, mx_strerror(mx_return) ); return OMPI_ERROR; } @@ -462,7 +462,7 @@ int mca_btl_mx_send( struct mca_btl_base_module_t* btl, MCA_BTL_MX_FRAG_RETURN( mx_btl, frag ); } if( OPAL_UNLIKELY(MX_SUCCESS != mx_return) ) { - opal_output( 0, "mx_forget failed with error %d (%s)\n", + orte_output( 0, "mx_forget failed with error %d (%s)\n", mx_return, mx_strerror(mx_return) ); return OMPI_ERROR; } diff --git a/ompi/mca/btl/mx/btl_mx.h b/ompi/mca/btl/mx/btl_mx.h index 5aef135b7e..405369bcd3 100644 --- a/ompi/mca/btl/mx/btl_mx.h +++ b/ompi/mca/btl/mx/btl_mx.h @@ -29,7 +29,7 @@ /* Open MPI includes */ #include "ompi/class/ompi_free_list.h" #include "ompi/class/ompi_bitmap.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "opal/event/event.h" #include "ompi/mca/pml/pml.h" #include "ompi/mca/btl/btl.h" diff --git a/ompi/mca/btl/mx/btl_mx_component.c b/ompi/mca/btl/mx/btl_mx_component.c index 547085c1be..3d770a972a 100644 --- a/ompi/mca/btl/mx/btl_mx_component.c +++ b/ompi/mca/btl/mx/btl_mx_component.c @@ -203,7 +203,7 @@ mca_btl_mx_unexpected_handler( void *context, mx_endpoint_addr_t source, mca_btl_base_descriptor_t descriptor; mca_btl_base_segment_t segment; - /*opal_output( 0, "Get unexpected handler context %p source %lld match_value %lld\n" + /*orte_output( 0, "Get unexpected handler context %p source %lld match_value %lld\n" "\tlength %d data %p\n", context, source.stuff[0], match_value, length, data_if_available );*/ if( !(0x01 & match_value) ) @@ -246,7 +246,7 @@ static mca_btl_mx_module_t* mca_btl_mx_create(uint64_t addr) ret = mx_open_board( nic_id, &endp_handle ); if( MX_SUCCESS != ret ) { - opal_output( 0, "Unable to open board %d: %s\n", nic_id, mx_strerror(ret) ); + orte_output( 0, "Unable to open board %d: %s\n", nic_id, mx_strerror(ret) ); return NULL; } @@ -254,7 +254,7 @@ static mca_btl_mx_module_t* mca_btl_mx_create(uint64_t addr) ms.iport = 0; ret = mx__get_mapper_state( endp_handle, &ms ); if( MX_SUCCESS != ret ) { - opal_output( 0, "get_mapper_state failed for board %d: %s\n", + orte_output( 0, "get_mapper_state failed for board %d: %s\n", nic_id, mx_strerror(ret) ); return NULL; } @@ -271,13 +271,13 @@ static mca_btl_mx_module_t* mca_btl_mx_create(uint64_t addr) if( (NULL != mca_btl_mx_component.mx_if_exclude) && (NULL != (where = strstr(mca_btl_mx_component.mx_if_exclude, mapper_mac))) ) { - /*opal_output( 0, "MX network %d connected to the mapper %s has been excluded\n", + /*orte_output( 0, "MX network %d connected to the mapper %s has been excluded\n", nic_id, mapper_mac );*/ return NULL; } else if( (NULL != mca_btl_mx_component.mx_if_include) && (NULL == (where = strstr(mca_btl_mx_component.mx_if_include, mapper_mac))) ) { - /*opal_output( 0, "MX network %d connected to the mapper %s has not been included\n", + /*orte_output( 0, "MX network %d connected to the mapper %s has not been included\n", nic_id, mapper_mac );*/ return NULL; } @@ -294,7 +294,7 @@ static mca_btl_mx_module_t* mca_btl_mx_create(uint64_t addr) mca_btl_mx_component.mx_filter, NULL, 0, &mx_btl->mx_endpoint); if(status != MX_SUCCESS) { - opal_output( 0, "mca_btl_mx_init: mx_open_endpoint() failed with status %d (%s)\n", + orte_output( 0, "mca_btl_mx_init: mx_open_endpoint() failed with status %d (%s)\n", status, mx_strerror(status) ); mx_btl->mx_endpoint = NULL; mca_btl_mx_finalize( &mx_btl->super ); @@ -309,7 +309,7 @@ static mca_btl_mx_module_t* mca_btl_mx_create(uint64_t addr) if( (status = mx_get_info( mx_btl->mx_endpoint, MX_LINE_SPEED, &nic_id, sizeof(nic_id), &value, sizeof(int))) != MX_SUCCESS ) { - opal_output( 0, "mx_get_info(MX_LINE_SPEED) failed with status %d (%s)\n", + orte_output( 0, "mx_get_info(MX_LINE_SPEED) failed with status %d (%s)\n", status, mx_strerror(status) ); } else { if( MX_SPEED_2G == value ) { @@ -334,13 +334,13 @@ static mca_btl_mx_module_t* mca_btl_mx_create(uint64_t addr) char *counters_name; if( (status = mx_get_info( mx_btl->mx_endpoint, MX_PIO_SEND_MAX, NULL, 0, &value, sizeof(int))) != MX_SUCCESS ) { - opal_output( 0, "mx_get_info(MX_PIO_SEND_MAX) failed with status %d (%s)\n", + orte_output( 0, "mx_get_info(MX_PIO_SEND_MAX) failed with status %d (%s)\n", status, mx_strerror(status) ); } printf( "MX_PIO_SEND_MAX = %d\n", value ); if( (status = mx_get_info( mx_btl->mx_endpoint, MX_COPY_SEND_MAX, NULL, 0, &value, sizeof(int))) != MX_SUCCESS ) { - opal_output( 0, "mx_get_info(MX_COPY_SEND_MAX) failed with status %d (%s)\n", + orte_output( 0, "mx_get_info(MX_COPY_SEND_MAX) failed with status %d (%s)\n", status, mx_strerror(status) ); } printf( "MX_COPY_SEND_MAX = %d\n", value ); @@ -348,27 +348,27 @@ static mca_btl_mx_module_t* mca_btl_mx_create(uint64_t addr) board = 0; if( (status = mx_get_info( mx_btl->mx_endpoint, MX_PRODUCT_CODE, &board, sizeof(int), text, MX_MAX_STR_LEN)) != MX_SUCCESS ) { - opal_output( 0, "mx_get_info(MX_PRODUCT_CODE) failed with status %d (%s)\n", + orte_output( 0, "mx_get_info(MX_PRODUCT_CODE) failed with status %d (%s)\n", status, mx_strerror(status) ); } printf( "product code %s\n", text ); if( (status = mx_get_info( mx_btl->mx_endpoint, MX_COUNTERS_COUNT, &board, sizeof(int), &counters, sizeof(int))) != MX_SUCCESS ) { - opal_output( 0, "mx_get_info(MX_COUNTERS_COUNT) failed with status %d (%s)\n", + orte_output( 0, "mx_get_info(MX_COUNTERS_COUNT) failed with status %d (%s)\n", status, mx_strerror(status) ); } printf( "counters = %d\n", counters ); counters_name = (char*)malloc( counters * MX_MAX_STR_LEN ); if( (status = mx_get_info( mx_btl->mx_endpoint, MX_COUNTERS_LABELS, &board, sizeof(int), counters_name, counters * MX_MAX_STR_LEN)) != MX_SUCCESS ) { - opal_output( 0, "mx_get_info(MX_COUNTERS_LABELS) failed with status %d (%s)\n", + orte_output( 0, "mx_get_info(MX_COUNTERS_LABELS) failed with status %d (%s)\n", status, mx_strerror(status) ); } counters_value = (int*)malloc( counters * sizeof(int) ); if( (status = mx_get_info( mx_btl->mx_endpoint, MX_COUNTERS_VALUES, &board, sizeof(int), counters_value, counters * sizeof(int))) != MX_SUCCESS ) { - opal_output( 0, "mx_get_info(MX_COUNTERS_VALUES) failed with status %d (%s)\n", + orte_output( 0, "mx_get_info(MX_COUNTERS_VALUES) failed with status %d (%s)\n", status, mx_strerror(status) ); } for( i = 0; i < counters; i++ ) @@ -381,7 +381,7 @@ static mca_btl_mx_module_t* mca_btl_mx_create(uint64_t addr) /* query the endpoint address */ if((status = mx_get_endpoint_addr( mx_btl->mx_endpoint, &mx_btl->mx_endpoint_addr)) != MX_SUCCESS) { - opal_output( 0, "mca_btl_mx_init: mx_get_endpoint_addr() failed with status %d (%s)\n", + orte_output( 0, "mca_btl_mx_init: mx_get_endpoint_addr() failed with status %d (%s)\n", status, mx_strerror(status) ); mca_btl_mx_finalize( &mx_btl->super ); return NULL; @@ -391,7 +391,7 @@ static mca_btl_mx_module_t* mca_btl_mx_create(uint64_t addr) status = mx_register_unexp_handler( mx_btl->mx_endpoint, mca_btl_mx_unexpected_handler, (void*)mx_btl ); if( MX_SUCCESS != status ) { - opal_output( 0, "mca_btl_mx_init: mx_register_unexp_handler() failed with status %d (%s)\n", + orte_output( 0, "mca_btl_mx_init: mx_register_unexp_handler() failed with status %d (%s)\n", status, mx_strerror(status) ); mca_btl_mx_finalize( &mx_btl->super ); return NULL; @@ -421,7 +421,7 @@ mca_btl_base_module_t** mca_btl_mx_component_init(int *num_btl_modules, *num_btl_modules = 0; if (enable_progress_threads) { - opal_output( 0, "mca_btl_mx_component_init: progress threads requested but not supported"); + orte_output( 0, "mca_btl_mx_component_init: progress threads requested but not supported"); ompi_modex_send(&mca_btl_mx_component.super.btl_version, NULL, 0); return NULL; @@ -487,7 +487,7 @@ mca_btl_base_module_t** mca_btl_mx_component_init(int *num_btl_modules, /* get the number of card available on the system */ if( (status = mx_get_info( NULL, MX_NIC_COUNT, NULL, 0, &mca_btl_mx_component.mx_num_btls, sizeof(uint32_t))) != MX_SUCCESS ) { - opal_output( 0, "mca_btl_mx_component_init: mx_get_info(MX_NIC_COUNT) failed with status %d(%s)\n", + orte_output( 0, "mca_btl_mx_component_init: mx_get_info(MX_NIC_COUNT) failed with status %d(%s)\n", status, mx_strerror(status) ); ompi_modex_send(&mca_btl_mx_component.super.btl_version, NULL, 0); @@ -511,7 +511,7 @@ mca_btl_base_module_t** mca_btl_mx_component_init(int *num_btl_modules, */ mca_btl_mx_component.mx_btls = malloc( mca_btl_mx_component.mx_num_btls * sizeof(mca_btl_base_module_t*) ); if( NULL == mca_btl_mx_component.mx_btls ) { - opal_output( 0, "MX BTL no memory\n" ); + orte_output( 0, "MX BTL no memory\n" ); return NULL; } @@ -521,7 +521,7 @@ mca_btl_base_module_t** mca_btl_mx_component_init(int *num_btl_modules, return NULL; if( (status = mx_get_info( NULL, MX_NIC_IDS, NULL, 0, nic_addrs, size)) != MX_SUCCESS) { - opal_output(0, "MX BTL error (mx_get_info failed) size = %ld [%s] #cards %d\n", + orte_output(0, "MX BTL error (mx_get_info failed) size = %ld [%s] #cards %d\n", (unsigned long)size, mx_strerror(status), mca_btl_mx_component.mx_num_btls ); free(nic_addrs); return NULL; @@ -596,7 +596,7 @@ int mca_btl_mx_component_progress(void) mx_return = mx_ipeek( mx_btl->mx_endpoint, &mx_request, &mx_result ); if( OPAL_UNLIKELY(mx_return != MX_SUCCESS) ) { - opal_output( 0, "mca_btl_mx_component_progress: mx_ipeek() failed with status %d (%s)\n", + orte_output( 0, "mca_btl_mx_component_progress: mx_ipeek() failed with status %d (%s)\n", mx_return, mx_strerror(mx_return) ); continue; } @@ -606,7 +606,7 @@ int mca_btl_mx_component_progress(void) mx_return = mx_test( mx_btl->mx_endpoint, &mx_request, &mx_status, &mx_result); if( OPAL_UNLIKELY(mx_return != MX_SUCCESS) ) { - opal_output(0, "mca_btl_mx_progress: mx_test() failed with status %d (%s)\n", + orte_output(0, "mca_btl_mx_progress: mx_test() failed with status %d (%s)\n", mx_return, mx_strerror(mx_return)); continue; } @@ -644,7 +644,7 @@ int mca_btl_mx_component_progress(void) 0x01ULL, BTL_MX_RECV_MASK, frag, &(frag->mx_request) ); if( MX_SUCCESS != mx_return ) { - opal_output( 0, "Fail to re-register a fragment with the MX NIC ... (%s)\n", + orte_output( 0, "Fail to re-register a fragment with the MX NIC ... (%s)\n", mx_strerror(mx_return) ); } } diff --git a/ompi/mca/btl/mx/btl_mx_proc.c b/ompi/mca/btl/mx/btl_mx_proc.c index 8fa0991231..9c44096ec6 100644 --- a/ompi/mca/btl/mx/btl_mx_proc.c +++ b/ompi/mca/btl/mx/btl_mx_proc.c @@ -122,7 +122,7 @@ mca_btl_mx_proc_t* mca_btl_mx_proc_create(ompi_proc_t* ompi_proc) rc = ompi_modex_recv( &mca_btl_mx_component.super.btl_version, ompi_proc, (void*)&mx_peers, &size ); if( OMPI_SUCCESS != rc ) { - opal_output( 0, "mca_pml_base_modex_recv failed for peer %s", + orte_output( 0, "mca_pml_base_modex_recv failed for peer %s", ORTE_NAME_PRINT(&ompi_proc->proc_name) ); return NULL; } @@ -131,7 +131,7 @@ mca_btl_mx_proc_t* mca_btl_mx_proc_create(ompi_proc_t* ompi_proc) return NULL; } if( (size % sizeof(mca_btl_mx_addr_t)) != 0 ) { - opal_output( 0, "invalid mx address for peer %s", + orte_output( 0, "invalid mx address for peer %s", ORTE_NAME_PRINT(&ompi_proc->proc_name) ); return NULL; } @@ -228,7 +228,7 @@ int mca_btl_mx_proc_connect( mca_btl_mx_endpoint_t* module_endpoint ) if( MX_SUCCESS != mx_nic_id_to_hostname( module_endpoint->mx_peer.nic_id, peer_name ) ) sprintf( peer_name, "unknown %lx nic_id", (long)module_endpoint->mx_peer.nic_id ); - opal_output( 0, "mx_connect fail for %s with key %x (error %s)\n\tUnique ID (local %x remote %x)\n", + orte_output( 0, "mx_connect fail for %s with key %x (error %s)\n\tUnique ID (local %x remote %x)\n", peer_name, mca_btl_mx_component.mx_filter, mx_strerror(mx_status), module_endpoint->endpoint_btl->mx_unique_network_id, module_endpoint->mx_peer.unique_network_id ); diff --git a/ompi/mca/btl/ofud/btl_ofud.c b/ompi/mca/btl/ofud/btl_ofud.c index f6faecf743..e07438dec6 100644 --- a/ompi/mca/btl/ofud/btl_ofud.c +++ b/ompi/mca/btl/ofud/btl_ofud.c @@ -23,7 +23,7 @@ #include "ompi_config.h" #include "opal/prefetch.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "ompi/datatype/convertor.h" #include "ompi/datatype/datatype.h" #include "ompi/mca/btl/btl.h" @@ -435,7 +435,7 @@ static int mca_btl_ud_dereg_mr(void* reg_data, if(ud_reg->mr != NULL) { if(ibv_dereg_mr(ud_reg->mr)) { - opal_output(0, "%s: error unpinning UD memory: %s\n", + orte_output(0, "%s: error unpinning UD memory: %s\n", __func__, strerror(errno)); return OMPI_ERROR; } diff --git a/ompi/mca/btl/ofud/btl_ofud.h b/ompi/mca/btl/ofud/btl_ofud.h index 5f509d17af..2af61807a4 100644 --- a/ompi/mca/btl/ofud/btl_ofud.h +++ b/ompi/mca/btl/ofud/btl_ofud.h @@ -34,7 +34,7 @@ /* Open MPI includes */ #include "opal/class/opal_hash_table.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "opal/sys/timer.h" #include "ompi/class/ompi_free_list.h" #include "ompi/class/ompi_bitmap.h" @@ -345,7 +345,7 @@ do { \ } while(0) #define MCA_BTL_UD_SHOW_TIME(var) \ - OPAL_OUTPUT((0, " " #var " avg %lu cnt %lu", \ + ORTE_OUTPUT((0, " " #var " avg %lu cnt %lu", \ (mca_btl_ud_profile.avg_ ## var) / (mca_btl_ud_profile.cnt_ ## var), \ mca_btl_ud_profile.cnt_ ## var)); diff --git a/ompi/mca/btl/ofud/btl_ofud_component.c b/ompi/mca/btl/ofud/btl_ofud_component.c index 7ce5c9dd48..5ee237708f 100644 --- a/ompi/mca/btl/ofud/btl_ofud_component.c +++ b/ompi/mca/btl/ofud/btl_ofud_component.c @@ -25,7 +25,7 @@ #include "ompi_config.h" #include "ompi/constants.h" #include "opal/prefetch.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "ompi/mca/btl/btl.h" #include "opal/sys/timer.h" #include "opal/mca/base/mca_base_param.h" diff --git a/ompi/mca/btl/ofud/btl_ofud_endpoint.c b/ompi/mca/btl/ofud/btl_ofud_endpoint.c index 6b44ee0487..04b4f96db7 100644 --- a/ompi/mca/btl/ofud/btl_ofud_endpoint.c +++ b/ompi/mca/btl/ofud/btl_ofud_endpoint.c @@ -97,7 +97,7 @@ int mca_btl_ud_endpoint_post_send(mca_btl_ud_module_t* ud_btl, MCA_BTL_UD_START_TIME(ibv_post_send); if(OPAL_UNLIKELY((ret = ibv_post_send(ib_qp, wr, &bad_wr)))) { #if 0 - opal_output(0, "ep->sd_wqe %d btl->sd_wqe %d len %d ib_qp_next %d", + orte_output(0, "ep->sd_wqe %d btl->sd_wqe %d len %d ib_qp_next %d", endpoint->sd_wqe, ud_btl->sd_wqe, frag->sg_entry.length, ud_btl->ib_qp_next); #endif diff --git a/ompi/mca/btl/ofud/btl_ofud_proc.c b/ompi/mca/btl/ofud/btl_ofud_proc.c index ddd3a96bf6..74f9c6b34b 100644 --- a/ompi/mca/btl/ofud/btl_ofud_proc.c +++ b/ompi/mca/btl/ofud/btl_ofud_proc.c @@ -126,7 +126,7 @@ mca_btl_ud_proc_t* mca_btl_ud_proc_create(ompi_proc_t* ompi_proc) &size); if(OMPI_SUCCESS != rc) { - opal_output(0, + orte_output(0, "[%s:%d] ompi_modex_recv failed for peer %s", __FILE__,__LINE__,ORTE_NAME_PRINT(&ompi_proc->proc_name)); OBJ_RELEASE(module_proc); @@ -134,7 +134,7 @@ mca_btl_ud_proc_t* mca_btl_ud_proc_create(ompi_proc_t* ompi_proc) } if((size % sizeof(mca_btl_ud_addr_t)) != 0) { - opal_output(0, "[%s:%d] invalid module address for peer %s", + orte_output(0, "[%s:%d] invalid module address for peer %s", __FILE__,__LINE__,ORTE_NAME_PRINT(&ompi_proc->proc_name)); OBJ_RELEASE(module_proc); return NULL; diff --git a/ompi/mca/btl/openib/btl_openib.c b/ompi/mca/btl/openib/btl_openib.c index 3e84a517a8..f75f8c78c6 100644 --- a/ompi/mca/btl/openib/btl_openib.c +++ b/ompi/mca/btl/openib/btl_openib.c @@ -25,9 +25,8 @@ #include "ompi_config.h" #include #include -#include "opal/util/output.h" +#include "orte/util/output.h" #include "opal/util/if.h" -#include "opal/util/show_help.h" #include "opal/util/arch.h" #include "ompi/mca/pml/pml.h" @@ -109,13 +108,13 @@ static void show_init_error(const char *file, int line, asprintf(&str_limit, "%ld", (long)limit.rlim_cur); } - opal_show_help("help-mpi-btl-openib.txt", "init-fail-no-mem", + orte_show_help("help-mpi-btl-openib.txt", "init-fail-no-mem", true, orte_process_info.nodename, file, line, func, dev, str_limit); if (NULL != str_limit) free(str_limit); } else { - opal_show_help("help-mpi-btl-openib.txt", "init-fail-create-q", + orte_show_help("help-mpi-btl-openib.txt", "init-fail-create-q", true, orte_process_info.nodename, file, line, func, strerror(errno), errno, dev); } @@ -318,7 +317,7 @@ int mca_btl_openib_add_procs( mca_btl_openib_proc_t* ib_proc; int remote_matching_port; - opal_output(-1, "add procs: adding proc %d", i); + orte_output(-1, "add procs: adding proc %d", i); if(NULL == (ib_proc = mca_btl_openib_proc_create(ompi_proc))) { return OMPI_ERR_OUT_OF_RESOURCE; } diff --git a/ompi/mca/btl/openib/btl_openib.h b/ompi/mca/btl/openib/btl_openib.h index 384b16e67d..fef14d1583 100644 --- a/ompi/mca/btl/openib/btl_openib.h +++ b/ompi/mca/btl/openib/btl_openib.h @@ -39,7 +39,7 @@ #include "opal/event/event.h" #include "ompi/mca/pml/pml.h" #include "ompi/mca/btl/btl.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "ompi/mca/mpool/mpool.h" #include "ompi/mca/btl/base/btl_base_error.h" @@ -61,7 +61,7 @@ BEGIN_C_DECLS #if OMPI_ENABLE_DEBUG #define ATTACH() do { \ int i = 0; \ - opal_output(0, "WAITING TO DEBUG ATTACH"); \ + orte_output(0, "WAITING TO DEBUG ATTACH"); \ while (i == 0) sleep(5); \ } while(0); #else diff --git a/ompi/mca/btl/openib/btl_openib_async.c b/ompi/mca/btl/openib/btl_openib_async.c index 4627fef39a..205ce52c76 100644 --- a/ompi/mca/btl/openib/btl_openib_async.c +++ b/ompi/mca/btl/openib/btl_openib_async.c @@ -19,8 +19,7 @@ #include #include -#include "opal/util/output.h" -#include "opal/util/show_help.h" +#include "orte/util/output.h" #include "ompi/mca/btl/btl.h" #include "ompi/mca/btl/base/base.h" @@ -276,7 +275,7 @@ static int btl_openib_async_hcah(struct mca_btl_openib_async_poll *hcas_poll, in case IBV_EVENT_PATH_MIG_ERR: case IBV_EVENT_SRQ_ERR: case IBV_EVENT_PORT_ERR: - opal_show_help("help-mpi-btl-openib.txt", "of error event", + orte_show_help("help-mpi-btl-openib.txt", "of error event", true,orte_process_info.nodename, orte_process_info.pid, event.event_type, openib_event_to_str(event.event_type), xrc_event ? "true" : "false"); @@ -294,7 +293,7 @@ static int btl_openib_async_hcah(struct mca_btl_openib_async_poll *hcas_poll, in case IBV_EVENT_SRQ_LIMIT_REACHED: break; default: - opal_show_help("help-mpi-btl-openib.txt", "of unknown event", + orte_show_help("help-mpi-btl-openib.txt", "of unknown event", true,orte_process_info.nodename, orte_process_info.pid, event.event_type, xrc_event ? "true" : "false"); } diff --git a/ompi/mca/btl/openib/btl_openib_component.c b/ompi/mca/btl/openib/btl_openib_component.c index 6821f3cdfc..17353819ff 100644 --- a/ompi/mca/btl/openib/btl_openib_component.c +++ b/ompi/mca/btl/openib/btl_openib_component.c @@ -34,8 +34,7 @@ #include "opal/include/opal/align.h" #include "opal/util/if.h" #include "opal/util/argv.h" -#include "opal/util/output.h" -#include "opal/util/show_help.h" +#include "orte/util/output.h" #include "opal/sys/timer.h" #include "opal/sys/atomic.h" #include "opal/util/argv.h" @@ -174,7 +173,7 @@ static int btl_openib_modex_send(void) size_t size, msg_size; ompi_btl_openib_connect_base_module_t *cpc; - opal_output(-1, "Starting to modex send"); + orte_output(-1, "Starting to modex send"); if (0 == mca_btl_openib_component.ib_num_btls) { return 0; } @@ -228,7 +227,7 @@ static int btl_openib_modex_send(void) /* Pack the number of modules */ offset = message; pack8(&offset, mca_btl_openib_component.ib_num_btls); - opal_output(-1, "modex sending %d btls (packed: %d, offset now at %d)", mca_btl_openib_component.ib_num_btls, *((uint8_t*) message), (int) (offset - message)); + orte_output(-1, "modex sending %d btls (packed: %d, offset now at %d)", mca_btl_openib_component.ib_num_btls, *((uint8_t*) message), (int) (offset - message)); /* Pack each of the modules */ for (i = 0; i < mca_btl_openib_component.ib_num_btls; i++) { @@ -238,7 +237,7 @@ static int btl_openib_modex_send(void) memcpy(offset, &(mca_btl_openib_component.openib_btls[i]->port_info), size); - opal_output(-1, "modex packed btl port modex message: %lx, %d, %d (size: %d)", + orte_output(-1, "modex packed btl port modex message: %lx, %d, %d (size: %d)", mca_btl_openib_component.openib_btls[i]->port_info.subnet_id, mca_btl_openib_component.openib_btls[i]->port_info.mtu, mca_btl_openib_component.openib_btls[i]->port_info.lid, @@ -248,13 +247,13 @@ static int btl_openib_modex_send(void) MCA_BTL_OPENIB_MODEX_MSG_HTON(*(mca_btl_openib_modex_message_t *)offset); #endif offset += size; - opal_output(-1, "modex packed btl %d: modex message, offset now %d", + orte_output(-1, "modex packed btl %d: modex message, offset now %d", i, (int) (offset -message)); /* Pack the number of CPCs that follow */ pack8(&offset, mca_btl_openib_component.openib_btls[i]->num_cpcs); - opal_output(-1, "modex packed btl %d: to pack %d cpcs (packed: %d, offset now %d)", + orte_output(-1, "modex packed btl %d: to pack %d cpcs (packed: %d, offset now %d)", i, mca_btl_openib_component.openib_btls[i]->num_cpcs, *((uint8_t*) (offset - 1)), (int) (offset-message)); @@ -265,27 +264,27 @@ static int btl_openib_modex_send(void) uint8_t u8; cpc = mca_btl_openib_component.openib_btls[i]->cpcs[j]; - opal_output(-1, "modex packed btl %d: packing cpc %s", + orte_output(-1, "modex packed btl %d: packing cpc %s", i, cpc->data.cbm_component->cbc_name); /* Pack the CPC index */ u8 = ompi_btl_openib_connect_base_get_cpc_index(cpc->data.cbm_component); pack8(&offset, u8); - opal_output(-1, "packing btl %d: cpc %d: index %d (packed %d, offset now %d)", + orte_output(-1, "packing btl %d: cpc %d: index %d (packed %d, offset now %d)", i, j, u8, *((uint8_t*) (offset-1)), (int)(offset-message)); /* Pack the CPC priority */ pack8(&offset, cpc->data.cbm_priority); - opal_output(-1, "packing btl %d: cpc %d: priority %d (packed %d, offset now %d)", + orte_output(-1, "packing btl %d: cpc %d: priority %d (packed %d, offset now %d)", i, j, cpc->data.cbm_priority, *((uint8_t*) (offset-1)), (int)(offset-message)); /* Pack the blob length */ u8 = cpc->data.cbm_modex_message_len; pack8(&offset, u8); - opal_output(-1, "packing btl %d: cpc %d: message len %d (packed %d, offset now %d)", + orte_output(-1, "packing btl %d: cpc %d: message len %d (packed %d, offset now %d)", i, j, u8, *((uint8_t*) (offset-1)), (int)(offset-message)); /* If the blob length is > 0, pack the blob */ if (u8 > 0) { memcpy(offset, cpc->data.cbm_modex_message, u8); offset += u8; - opal_output(-1, "packing btl %d: cpc %d: blob packed %d %x (offset now %d)", + orte_output(-1, "packing btl %d: cpc %d: blob packed %d %x (offset now %d)", i, j, ((uint32_t*)cpc->data.cbm_modex_message)[0], ((uint32_t*)cpc->data.cbm_modex_message)[1], @@ -301,7 +300,7 @@ static int btl_openib_modex_send(void) rc = ompi_modex_send(&mca_btl_openib_component.super.btl_version, message, msg_size); free(message); - opal_output(-1, "Modex sent! %d calculated, %d actual\n", (int) msg_size, (int) (offset - message)); + orte_output(-1, "Modex sent! %d calculated, %d actual\n", (int) msg_size, (int) (offset - message)); return rc; } @@ -480,7 +479,7 @@ static int init_one_port(opal_list_t *btl_list, mca_btl_openib_hca_t *hca, if(mca_btl_openib_component.ib_num_btls > 0 && IB_DEFAULT_GID_PREFIX == subnet_id && mca_btl_openib_component.warn_default_gid_prefix) { - opal_show_help("help-mpi-btl-openib.txt", "default subnet prefix", + orte_show_help("help-mpi-btl-openib.txt", "default subnet prefix", true, orte_process_info.nodename); } @@ -504,7 +503,7 @@ static int init_one_port(opal_list_t *btl_list, mca_btl_openib_hca_t *hca, } else if (0 == lmc % (mca_btl_openib_component.apm_lmc + 1)) { lmc_step = mca_btl_openib_component.apm_lmc + 1; } else { - opal_show_help("help-mpi-btl-openib.txt", "apm with wrong lmc",true, + orte_show_help("help-mpi-btl-openib.txt", "apm with wrong lmc",true, mca_btl_openib_component.apm_lmc, lmc); return OMPI_ERROR; } @@ -512,7 +511,7 @@ static int init_one_port(opal_list_t *btl_list, mca_btl_openib_hca_t *hca, if (mca_btl_openib_component.apm_lmc) { /* Disable apm and report warning */ mca_btl_openib_component.apm_lmc = 0; - opal_show_help("help-mpi-btl-openib.txt", "apm without lmc",true); + orte_show_help("help-mpi-btl-openib.txt", "apm without lmc",true); } } #endif @@ -1034,7 +1033,7 @@ static int init_one_hca(opal_list_t *btl_list, struct ibv_device* ib_dev) */ if (!(hca->ib_dev_attr.device_cap_flags & IBV_DEVICE_XRC) && mca_btl_openib_component.num_xrc_qps > 0) { - opal_show_help("help-mpi-btl-openib.txt", + orte_show_help("help-mpi-btl-openib.txt", "XRC on device without XRC support", true, mca_btl_openib_component.num_xrc_qps, ibv_get_device_name(ib_dev), @@ -1058,7 +1057,7 @@ static int init_one_hca(opal_list_t *btl_list, struct ibv_device* ib_dev) warning that we're using default values (unless overridden that we don't want to see these warnings) */ if (mca_btl_openib_component.warn_no_hca_params_found) { - opal_show_help("help-mpi-btl-openib.txt", + orte_show_help("help-mpi-btl-openib.txt", "no hca params found", true, orte_process_info.nodename, hca->ib_dev_attr.vendor_id, @@ -1193,7 +1192,7 @@ static int init_one_hca(opal_list_t *btl_list, struct ibv_device* ib_dev) if (hca->btls > 0) { /* if apm was enabled it should be > 1 */ if (1 == mca_btl_openib_component.apm_ports) { - opal_show_help("help-mpi-btl-openib.txt", "apm not enough ports", true); + orte_show_help("help-mpi-btl-openib.txt", "apm not enough ports", true); mca_btl_openib_component.apm_ports = 0; } ret = prepare_hca_for_use(hca); @@ -1516,7 +1515,7 @@ btl_openib_component_init(int *num_btl_modules, couldn't provide it. So print an error and deactivate this BTL. */ if (mca_btl_openib_component.want_fork_support > 0) { - opal_show_help("help-mpi-btl-openib.txt", + orte_show_help("help-mpi-btl-openib.txt", "ibv_fork_init fail", true, orte_process_info.nodename); goto no_btls; @@ -1531,7 +1530,7 @@ btl_openib_component_init(int *num_btl_modules, mca_btl_openib_component.if_list = NULL; if (NULL != mca_btl_openib_component.if_include && NULL != mca_btl_openib_component.if_exclude) { - opal_show_help("help-mpi-btl-openib.txt", + orte_show_help("help-mpi-btl-openib.txt", "specified include and exclude", true, mca_btl_openib_component.if_include, mca_btl_openib_component.if_exclude, NULL); @@ -1580,7 +1579,7 @@ btl_openib_component_init(int *num_btl_modules, } if(ret != OMPI_SUCCESS) { - opal_show_help("help-mpi-btl-openib.txt", + orte_show_help("help-mpi-btl-openib.txt", "error in hca init", true, orte_process_info.nodename); } @@ -1594,7 +1593,7 @@ btl_openib_component_init(int *num_btl_modules, if (0 != opal_argv_count(mca_btl_openib_component.if_list) && mca_btl_openib_component.warn_nonexistent_if) { char *str = opal_argv_join(mca_btl_openib_component.if_list, ','); - opal_show_help("help-mpi-btl-openib.txt", "nonexistent port", + orte_show_help("help-mpi-btl-openib.txt", "nonexistent port", true, orte_process_info.nodename, ((NULL != mca_btl_openib_component.if_include) ? "in" : "ex"), str); @@ -1602,7 +1601,7 @@ btl_openib_component_init(int *num_btl_modules, } if(0 == mca_btl_openib_component.ib_num_btls) { - opal_show_help("help-mpi-btl-openib.txt", + orte_show_help("help-mpi-btl-openib.txt", "no active ports found", true, orte_process_info.nodename); return NULL; } @@ -2087,7 +2086,7 @@ error: } if(IBV_WC_RETRY_EXC_ERR == wc->status) - opal_show_help("help-mpi-btl-openib.txt", "btl_openib:retry-exceeded", true); + orte_show_help("help-mpi-btl-openib.txt", "btl_openib:retry-exceeded", true); if(openib_btl) openib_btl->error_cb(&openib_btl->super, MCA_BTL_ERROR_FLAGS_FATAL); @@ -2146,7 +2145,7 @@ void* mca_btl_openib_progress_thread(opal_object_t* arg) pthread_setcancelstate( PTHREAD_CANCEL_ENABLE, NULL ); pthread_setcanceltype( PTHREAD_CANCEL_ASYNCHRONOUS, NULL ); - opal_output(-1, "WARNING: the openib btl progress thread code *does not yet work*. Your run is likely to hang, crash, break the kitchen sink, and/or eat your cat. You have been warned."); + orte_output(-1, "WARNING: the openib btl progress thread code *does not yet work*. Your run is likely to hang, crash, break the kitchen sink, and/or eat your cat. You have been warned."); while (hca->progress) { while(opal_progress_threads()) { diff --git a/ompi/mca/btl/openib/btl_openib_endpoint.c b/ompi/mca/btl/openib/btl_openib_endpoint.c index 178157447f..350ac236b5 100644 --- a/ompi/mca/btl/openib/btl_openib_endpoint.c +++ b/ompi/mca/btl/openib/btl_openib_endpoint.c @@ -380,7 +380,7 @@ void mca_btl_openib_endpoint_init(mca_btl_openib_module_t *btl, ep->rem_info.rem_lid = remote_proc_info->pm_port_info.lid; ep->rem_info.rem_subnet_id = remote_proc_info->pm_port_info.subnet_id; ep->rem_info.rem_mtu = remote_proc_info->pm_port_info.mtu; - opal_output(-1, "Got remote LID, subnet, MTU: %d, %lx, %d", + orte_output(-1, "Got remote LID, subnet, MTU: %d, %lx, %d", ep->rem_info.rem_lid, ep->rem_info.rem_subnet_id, ep->rem_info.rem_mtu); diff --git a/ompi/mca/btl/openib/btl_openib_fd.c b/ompi/mca/btl/openib/btl_openib_fd.c index df3e8cf229..c227006ac8 100644 --- a/ompi/mca/btl/openib/btl_openib_fd.c +++ b/ompi/mca/btl/openib/btl_openib_fd.c @@ -17,7 +17,7 @@ #include "opal/class/opal_list.h" #include "opal/event/event.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "ompi/constants.h" @@ -252,12 +252,12 @@ static bool local_pipe_cmd(void) break; case CMD_TIME_TO_QUIT: - opal_output(-1, "fd listener thread: time to quit"); + orte_output(-1, "fd listener thread: time to quit"); ret = true; break; default: - opal_output(-1, "fd listener thread: unknown pipe command!"); + orte_output(-1, "fd listener thread: unknown pipe command!"); break; } @@ -281,24 +281,24 @@ static void *thread_main(void *context) FD_SET(pipe_fd[0], &read_fds); max_fd = pipe_fd[0] + 1; - opal_output(-1, "fd listener thread running"); + orte_output(-1, "fd listener thread running"); /* Main loop waiting for commands over the fd's */ while (1) { memcpy(&read_fds_copy, &read_fds, sizeof(read_fds)); memcpy(&write_fds_copy, &write_fds, sizeof(write_fds)); - opal_output(-1, "fd listener thread blocking on select..."); + orte_output(-1, "fd listener thread blocking on select..."); rc = select(max_fd, &read_fds_copy, &write_fds_copy, NULL, NULL); if (0 != rc && EAGAIN == errno) { continue; } - opal_output(-1, "fd listener thread woke up!"); + orte_output(-1, "fd listener thread woke up!"); if (rc > 0) { if (FD_ISSET(pipe_fd[0], &read_fds_copy)) { - opal_output(-1, "fd listener thread: pipe command"); + orte_output(-1, "fd listener thread: pipe command"); if (local_pipe_cmd()) { - opal_output(-1, "fd listener thread: exiting"); + orte_output(-1, "fd listener thread: exiting"); break; } } @@ -324,7 +324,7 @@ static void *thread_main(void *context) /* If either was ready, invoke the callback */ if (0 != flags) { - opal_output(-1, "fd listener thread: invoking callback for registered fd %d", ri->ri_fd); + orte_output(-1, "fd listener thread: invoking callback for registered fd %d", ri->ri_fd); ri->ri_callback.fd(ri->ri_fd, flags, ri->ri_context); } diff --git a/ompi/mca/btl/openib/btl_openib_ini.c b/ompi/mca/btl/openib/btl_openib_ini.c index ddf7419b72..5ffeab196e 100644 --- a/ompi/mca/btl/openib/btl_openib_ini.c +++ b/ompi/mca/btl/openib/btl_openib_ini.c @@ -23,8 +23,7 @@ #include #include -#include "opal/util/output.h" -#include "opal/util/show_help.h" +#include "orte/util/output.h" #include "opal/mca/base/mca_base_param.h" #include "btl_openib.h" @@ -235,7 +234,7 @@ static int parse_file(char *filename) ini_filename = filename; btl_openib_ini_yyin = fopen(filename, "r"); if (NULL == btl_openib_ini_yyin) { - opal_show_help("help-mpi-btl-openib.txt", "ini file:file not found", + orte_show_help("help-mpi-btl-openib.txt", "ini file:file not found", true, filename); ret = OMPI_ERR_NOT_FOUND; goto cleanup; @@ -393,7 +392,7 @@ static int parse_line(parsed_section_values_t *sv) /* Have no idea what this parameter is. Not an error -- just ignore it */ if (!showed_unknown_field_warning) { - opal_show_help("help-mpi-btl-openib.txt", + orte_show_help("help-mpi-btl-openib.txt", "ini file:unknown field", true, ini_filename, btl_openib_ini_yynewlines, key_buffer); @@ -618,7 +617,7 @@ static inline void show_help(const char *topic) if (0 == strcmp("\n", btl_openib_ini_yytext)) { btl_openib_ini_yytext = ""; } - opal_show_help("help-mpi-btl-openib.txt", topic, true, + orte_show_help("help-mpi-btl-openib.txt", topic, true, ini_filename, btl_openib_ini_yynewlines, btl_openib_ini_yytext); btl_openib_ini_yytext = save; diff --git a/ompi/mca/btl/openib/btl_openib_mca.c b/ompi/mca/btl/openib/btl_openib_mca.c index 3dbbfb58b6..175a39ca48 100644 --- a/ompi/mca/btl/openib/btl_openib_mca.c +++ b/ompi/mca/btl/openib/btl_openib_mca.c @@ -26,9 +26,8 @@ #include #include "opal/mca/installdirs/installdirs.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "opal/util/argv.h" -#include "opal/util/show_help.h" #include "opal/mca/base/mca_base_param.h" #include "btl_openib.h" #include "btl_openib_mca.h" @@ -69,7 +68,7 @@ static inline int reg_string(const char* param_name, const char* param_desc, default_value, &value); if (0 != (flags & REGSTR_EMPTY_OK) && 0 == strlen(value)) { - opal_output(0, "Bad parameter value for parameter \"%s\"", + orte_output(0, "Bad parameter value for parameter \"%s\"", param_name); return OMPI_ERR_BAD_PARAM; } @@ -96,7 +95,7 @@ static inline int reg_int(const char* param_name, const char* param_desc, if ((0 != (flags & REGINT_GE_ZERO) && value < 0) || (0 != (flags & REGINT_GE_ONE) && value < 1) || (0 != (flags & REGINT_NONZERO) && 0 == value)) { - opal_output(0, "Bad parameter value for parameter \"%s\"", + orte_output(0, "Bad parameter value for parameter \"%s\"", param_name); return OMPI_ERR_BAD_PARAM; } @@ -150,7 +149,7 @@ int btl_openib_register_mca_params(void) mca_btl_openib_component.want_fork_support = ival; #else if (0 != ival) { - opal_show_help("help-mpi-btl-openib.txt", + orte_show_help("help-mpi-btl-openib.txt", "ibv_fork requested but not supported", true, orte_process_info.nodename); return OMPI_ERROR; @@ -175,7 +174,7 @@ int btl_openib_register_mca_params(void) mca_btl_openib_component.want_fork_support = ival; #else if (0 != ival) { - opal_show_help("help-mpi-btl-openib.txt", + orte_show_help("help-mpi-btl-openib.txt", "ibv_fork requested but not supported", true, orte_process_info.nodename); return OMPI_ERROR; @@ -236,7 +235,7 @@ int btl_openib_register_mca_params(void) "(must be > 0 and < 0xffff)", 0, &ival, REGINT_GE_ZERO)); if (ival > 0xffff) { - opal_show_help("help-mpi-btl-openib.txt", "invalid mca param value", + orte_show_help("help-mpi-btl-openib.txt", "invalid mca param value", true, "invalid value for btl_openib_ib_pkey_val", "btl_openib_ib_pkey_val ignored"); } else { @@ -266,7 +265,7 @@ int btl_openib_register_mca_params(void) CHECK(reg_int("ib_mtu", msg, IBV_MTU_1024, &ival, 0)); free(msg); if (ival < IBV_MTU_1024 || ival > IBV_MTU_4096) { - opal_show_help("help-mpi-btl-openib.txt", "invalid mca param value", + orte_show_help("help-mpi-btl-openib.txt", "invalid mca param value", true, "invalid value for btl_openib_ib_mtu", "btl_openib_ib_mtu reset to 1024"); mca_btl_openib_component.ib_mtu = IBV_MTU_1024; @@ -279,12 +278,12 @@ int btl_openib_register_mca_params(void) "(must be >= 0 and <= 31)", 5, &ival, 0)); if (ival > 31) { - opal_show_help("help-mpi-btl-openib.txt", "invalid mca param value", + orte_show_help("help-mpi-btl-openib.txt", "invalid mca param value", true, "btl_openib_ib_min_rnr_timer > 31", "btl_openib_ib_min_rnr_timer reset to 31"); ival = 31; } else if (ival < 0){ - opal_show_help("help-mpi-btl-openib.txt", "invalid mca param value", + orte_show_help("help-mpi-btl-openib.txt", "invalid mca param value", true, "btl_openib_ib_min_rnr_timer < 0", "btl_openib_ib_min_rnr_timer reset to 0"); ival = 0; @@ -295,12 +294,12 @@ int btl_openib_register_mca_params(void) "(must be >= 0 and <= 31)", 10, &ival, 0)); if (ival > 31) { - opal_show_help("help-mpi-btl-openib.txt", "invalid mca param value", + orte_show_help("help-mpi-btl-openib.txt", "invalid mca param value", true, "btl_openib_ib_timeout > 31", "btl_openib_ib_timeout reset to 31"); ival = 31; } else if (ival < 0) { - opal_show_help("help-mpi-btl-openib.txt", "invalid mca param value", + orte_show_help("help-mpi-btl-openib.txt", "invalid mca param value", true, "btl_openib_ib_timeout < 0", "btl_openib_ib_timeout reset to 0"); ival = 0; @@ -311,12 +310,12 @@ int btl_openib_register_mca_params(void) "(must be >= 0 and <= 7)", 7, &ival, 0)); if (ival > 7) { - opal_show_help("help-mpi-btl-openib.txt", "invalid mca param value", + orte_show_help("help-mpi-btl-openib.txt", "invalid mca param value", true, "btl_openib_ib_retry_count > 7", "btl_openib_ib_retry_count reset to 7"); ival = 7; } else if (ival < 0) { - opal_show_help("help-mpi-btl-openib.txt", "invalid mca param value", + orte_show_help("help-mpi-btl-openib.txt", "invalid mca param value", true, "btl_openib_ib_retry_count < 0", "btl_openib_ib_retry_count reset to 0"); ival = 0; @@ -328,12 +327,12 @@ int btl_openib_register_mca_params(void) "(must be >= 0 and <= 7)", 7, &ival, 0)); if (ival > 7) { - opal_show_help("help-mpi-btl-openib.txt", "invalid mca param value", + orte_show_help("help-mpi-btl-openib.txt", "invalid mca param value", true, "btl_openib_ib_rnr_retry > 7", "btl_openib_ib_rnr_retry reset to 7"); ival = 7; } else if (ival < 0) { - opal_show_help("help-mpi-btl-openib.txt", "invalid mca param value", + orte_show_help("help-mpi-btl-openib.txt", "invalid mca param value", true, "btl_openib_ib_rnr_retry < 0", "btl_openib_ib_rnr_retry reset to 0"); ival = 0; @@ -350,12 +349,12 @@ int btl_openib_register_mca_params(void) "(must be >= 0 and <= 15)", 0, &ival, 0)); if (ival > 15) { - opal_show_help("help-mpi-btl-openib.txt", "invalid mca param value", + orte_show_help("help-mpi-btl-openib.txt", "invalid mca param value", true, "btl_openib_ib_service_level > 15", "btl_openib_ib_service_level reset to 15"); ival = 15; } else if (ival < 0) { - opal_show_help("help-mpi-btl-openib.txt", "invalid mca param value", + orte_show_help("help-mpi-btl-openib.txt", "invalid mca param value", true, "btl_openib_ib_service_level < 0", "btl_openib_ib_service_level reset to 0"); ival = 0; @@ -432,7 +431,7 @@ int btl_openib_register_mca_params(void) "(must be > 0 and power of two)", 64, &ival, REGINT_GE_ZERO)); if(ival <= 1 || (ival & (ival - 1))) { - opal_show_help("help-mpi-btl-openib.txt", "wrong buffer alignment", + orte_show_help("help-mpi-btl-openib.txt", "wrong buffer alignment", true, ival, orte_process_info.nodename, 64); mca_btl_openib_component.buffer_alignment = 64; } else { @@ -544,7 +543,7 @@ static int mca_btl_openib_mca_setup_qps(void) queues = opal_argv_split(str, ':'); if (0 == opal_argv_count(queues)) { - opal_show_help("help-mpi-btl-openib.txt", + orte_show_help("help-mpi-btl-openib.txt", "no qps in receive_queues", true, orte_process_info.nodename, str); return OMPI_ERROR; @@ -561,12 +560,12 @@ static int mca_btl_openib_mca_setup_qps(void) #if HAVE_XRC num_xrc_qps++; #else - opal_show_help("help-mpi-btl-openib.txt", "No XRC support", true, + orte_show_help("help-mpi-btl-openib.txt", "No XRC support", true, orte_process_info.nodename, str); goto error; #endif } else { - opal_show_help("help-mpi-btl-openib.txt", + orte_show_help("help-mpi-btl-openib.txt", "invalid qp type in receive_queues", true, orte_process_info.nodename, str, queues[qp]); goto error; @@ -575,14 +574,14 @@ static int mca_btl_openib_mca_setup_qps(void) } /* Current XRC implementation can't used with other QP types - PP and SRQ */ if (num_xrc_qps > 0 && (num_pp_qps > 0 || num_srq_qps > 0)) { - opal_show_help("help-mpi-btl-openib.txt", "XRC with PP or SRQ", true, + orte_show_help("help-mpi-btl-openib.txt", "XRC with PP or SRQ", true, orte_process_info.nodename, str); goto error; } /* Current XRC implementation can't used with btls_per_lid > 1 */ if (num_xrc_qps > 0 && mca_btl_openib_component.btls_per_lid > 1) { - opal_show_help("help-mpi-btl-openib.txt", "XRC with BTLs per LID", true, + orte_show_help("help-mpi-btl-openib.txt", "XRC with BTLs per LID", true, orte_process_info.nodename, str, num_xrc_qps); goto error; } @@ -606,7 +605,7 @@ static int mca_btl_openib_mca_setup_qps(void) if ('P' == params[0][0]) { int32_t rd_win, rd_rsv; if (count < 3 || count > 6) { - opal_show_help("help-mpi-btl-openib.txt", + orte_show_help("help-mpi-btl-openib.txt", "invalid pp qp specification", true, orte_process_info.nodename, queues[qp]); goto error; @@ -629,12 +628,12 @@ static int mca_btl_openib_mca_setup_qps(void) mca_btl_openib_component.qp_infos[qp].u.pp_qp.rd_win = rd_win; mca_btl_openib_component.qp_infos[qp].u.pp_qp.rd_rsv = rd_rsv; if((rd_num - rd_low) > rd_win) - opal_show_help("help-mpi-btl-openib.txt", "non optimal rd_win", + orte_show_help("help-mpi-btl-openib.txt", "non optimal rd_win", true, rd_win, rd_num - rd_low); } else { int32_t sd_max; if(count < 3 || count > 5) { - opal_show_help("help-mpi-btl-openib.txt", + orte_show_help("help-mpi-btl-openib.txt", "invalid srq specification", true, orte_process_info.nodename, queues[qp]); goto error; @@ -657,7 +656,7 @@ static int mca_btl_openib_mca_setup_qps(void) } if (rd_num <= rd_low) { - opal_show_help("help-mpi-btl-openib.txt", "rd_num must be > rd_low", + orte_show_help("help-mpi-btl-openib.txt", "rd_num must be > rd_low", true, orte_process_info.nodename, queues[qp]); goto error; } @@ -679,24 +678,24 @@ static int mca_btl_openib_mca_setup_qps(void) mca_btl_openib_module.super.btl_eager_limit : mca_btl_openib_module.super.btl_max_send_size; if (max_qp_size < max_size_needed) { - opal_show_help("help-mpi-btl-openib.txt", + orte_show_help("help-mpi-btl-openib.txt", "biggest qp size is too small", true, orte_process_info.nodename, max_qp_size, max_size_needed); ret = OMPI_ERROR; goto error; } else if (max_qp_size > max_size_needed) { - opal_show_help("help-mpi-btl-openib.txt", + orte_show_help("help-mpi-btl-openib.txt", "biggest qp size is too big", true, orte_process_info.nodename, max_qp_size, max_size_needed); - opal_output(0, "The biggest QP size is bigger than maximum send size. " + orte_output(0, "The biggest QP size is bigger than maximum send size. " "This is not optimal configuration as memory will be wasted."); } if (mca_btl_openib_component.ib_free_list_max > 0 && min_freelist_size > mca_btl_openib_component.ib_free_list_max) { - opal_show_help("help-mpi-btl-openib.txt", "freelist too small", true, + orte_show_help("help-mpi-btl-openib.txt", "freelist too small", true, orte_process_info.nodename, mca_btl_openib_component.ib_free_list_max, min_freelist_size); diff --git a/ompi/mca/btl/openib/btl_openib_proc.c b/ompi/mca/btl/openib/btl_openib_proc.c index fc3b73519f..f2b14fdde5 100644 --- a/ompi/mca/btl/openib/btl_openib_proc.c +++ b/ompi/mca/btl/openib/btl_openib_proc.c @@ -173,7 +173,7 @@ mca_btl_openib_proc_t* mca_btl_openib_proc_create(ompi_proc_t* ompi_proc) /* Unpack the number of modules in the message */ offset = message; unpack8(&offset, &(module_proc->proc_port_count)); - opal_output(-1, "unpack: %d btls", module_proc->proc_port_count); + orte_output(-1, "unpack: %d btls", module_proc->proc_port_count); if (module_proc->proc_port_count > 0) { module_proc->proc_ports = (mca_btl_openib_proc_modex_t *) malloc(sizeof(mca_btl_openib_proc_modex_t) * @@ -192,12 +192,12 @@ mca_btl_openib_proc_t* mca_btl_openib_proc_create(ompi_proc_t* ompi_proc) MCA_BTL_OPENIB_MODEX_MSG_NTOH(module_proc->proc_ports[i].pm_port_info); #endif offset += size; - opal_output(-1, "unpacked btl %d: modex message, offset now %d", + orte_output(-1, "unpacked btl %d: modex message, offset now %d", i, (int)(offset-((char*)message))); /* Unpack the number of CPCs that follow */ unpack8(&offset, &(module_proc->proc_ports[i].pm_cpc_data_count)); - opal_output(-1, "unpacked btl %d: number of cpcs to follow %d (offset now %d)", + orte_output(-1, "unpacked btl %d: number of cpcs to follow %d (offset now %d)", i, module_proc->proc_ports[i].pm_cpc_data_count, (int)(offset-((char*)message))); module_proc->proc_ports[i].pm_cpc_data = calloc(module_proc->proc_ports[i].pm_cpc_data_count, @@ -212,16 +212,16 @@ mca_btl_openib_proc_t* mca_btl_openib_proc_create(ompi_proc_t* ompi_proc) ompi_btl_openib_connect_base_module_data_t *cpcd; cpcd = module_proc->proc_ports[i].pm_cpc_data + j; unpack8(&offset, &u8); - opal_output(-1, "unpacked btl %d: cpc %d: index %d (offset now %d)", + orte_output(-1, "unpacked btl %d: cpc %d: index %d (offset now %d)", i, j, u8, (int)(offset-(char*)message)); cpcd->cbm_component = ompi_btl_openib_connect_base_get_cpc_byindex(u8); - opal_output(-1, "unpacked btl %d: cpc %d: component %s", + orte_output(-1, "unpacked btl %d: cpc %d: component %s", i, j, cpcd->cbm_component->cbc_name); unpack8(&offset, &cpcd->cbm_priority); unpack8(&offset, &cpcd->cbm_modex_message_len); - opal_output(-1, "unpacked btl %d: cpc %d: priority %d, msg len %d (offset now %d)", + orte_output(-1, "unpacked btl %d: cpc %d: priority %d, msg len %d (offset now %d)", i, j, cpcd->cbm_priority, cpcd->cbm_modex_message_len, (int)(offset-(char*)message)); if (cpcd->cbm_modex_message_len > 0) { cpcd->cbm_modex_message = malloc(cpcd->cbm_modex_message_len); @@ -232,7 +232,7 @@ mca_btl_openib_proc_t* mca_btl_openib_proc_create(ompi_proc_t* ompi_proc) memcpy(cpcd->cbm_modex_message, offset, cpcd->cbm_modex_message_len); offset += cpcd->cbm_modex_message_len; - opal_output(-1, "unpacked btl %d: cpc %d: blob unpacked %d %x (offset now %d)", + orte_output(-1, "unpacked btl %d: cpc %d: blob unpacked %d %x (offset now %d)", i, j, ((uint32_t*)cpcd->cbm_modex_message)[0], ((uint32_t*)cpcd->cbm_modex_message)[1], @@ -253,7 +253,7 @@ mca_btl_openib_proc_t* mca_btl_openib_proc_create(ompi_proc_t* ompi_proc) return NULL; } - opal_output(-1, "unpacking done!"); + orte_output(-1, "unpacking done!"); return module_proc; } diff --git a/ompi/mca/btl/openib/btl_openib_xrc.c b/ompi/mca/btl/openib/btl_openib_xrc.c index fe7caeb77b..52496bf2ec 100644 --- a/ompi/mca/btl/openib/btl_openib_xrc.c +++ b/ompi/mca/btl/openib/btl_openib_xrc.c @@ -16,7 +16,7 @@ #include #include -#include "opal/util/output.h" +#include "orte/util/output.h" #include "ompi/mca/btl/btl.h" #include "ompi/mca/btl/base/base.h" #include "btl_openib_xrc.h" diff --git a/ompi/mca/btl/openib/connect/btl_openib_connect_base.c b/ompi/mca/btl/openib/connect/btl_openib_connect_base.c index 3a2f2bb3a2..63308654bf 100644 --- a/ompi/mca/btl/openib/connect/btl_openib_connect_base.c +++ b/ompi/mca/btl/openib/connect/btl_openib_connect_base.c @@ -25,8 +25,8 @@ #include "connect/btl_openib_connect_ibcm.h" #endif +#include "orte/util/output.h" #include "opal/util/argv.h" -#include "opal/util/show_help.h" /* * Array of all possible connection functions @@ -107,14 +107,14 @@ int ompi_btl_openib_connect_base_register(void) for (save = j = 0; NULL != temp[j]; ++j) { for (i = 0; NULL != all[i]; ++i) { if (0 == strcmp(temp[j], all[i]->cbc_name)) { - opal_output(-1, "include: saving %s", all[i]->cbc_name); + orte_output(-1, "include: saving %s", all[i]->cbc_name); available[save++] = all[i]; ++num_available; break; } } if (NULL == all[i]) { - opal_show_help("help-mpi-btl-openib-cpc-base.txt", + orte_show_help("help-mpi-btl-openib-cpc-base.txt", "cpc name not found", true, "include", orte_process_info.nodename, "include", cpc_include, temp[j], @@ -139,7 +139,7 @@ int ompi_btl_openib_connect_base_register(void) } } if (NULL == all[i]) { - opal_show_help("help-mpi-btl-openib-cpc-base.txt", + orte_show_help("help-mpi-btl-openib-cpc-base.txt", "cpc name not found", true, "exclude", orte_process_info.nodename, "exclude", cpc_exclude, temp[j], @@ -158,7 +158,7 @@ int ompi_btl_openib_connect_base_register(void) } } if (NULL == temp[j]) { - opal_output(-1, "exclude: saving %s", all[i]->cbc_name); + orte_output(-1, "exclude: saving %s", all[i]->cbc_name); available[save++] = all[i]; ++num_available; } @@ -168,7 +168,7 @@ int ompi_btl_openib_connect_base_register(void) /* If there's no include/exclude list, copy all[] into available[] */ else { - opal_output(-1, "no include or exclude: saving all"); + orte_output(-1, "no include or exclude: saving all"); memcpy(available, all, sizeof(all)); num_available = (sizeof(all) / sizeof(ompi_btl_openib_connect_base_module_t *)) - 1; @@ -201,7 +201,7 @@ int ompi_btl_openib_connect_base_init(void) for (i = num_available = 0; NULL != available[i]; ++i) { if (NULL == available[i]->cbc_init) { available[num_available++] = available[i]; - opal_output(-1, "found available cpc (NULL init): %s", + orte_output(-1, "found available cpc (NULL init): %s", all[i]->cbc_name); continue; } @@ -209,7 +209,7 @@ int ompi_btl_openib_connect_base_init(void) rc = available[i]->cbc_init(); if (OMPI_SUCCESS == rc) { available[num_available++] = available[i]; - opal_output(-1, "found available cpc (SUCCESS init): %s", + orte_output(-1, "found available cpc (SUCCESS init): %s", all[i]->cbc_name); continue; } else if (OMPI_ERR_NOT_SUPPORTED == rc) { @@ -265,7 +265,7 @@ int ompi_btl_openib_connect_base_select_for_local_port(mca_btl_openib_module_t * free(msg); return rc; } - opal_output(-1, "match cpc for local port: %s", + orte_output(-1, "match cpc for local port: %s", available[i]->cbc_name); /* This CPC has indicated that it wants to run on this openib @@ -275,7 +275,7 @@ int ompi_btl_openib_connect_base_select_for_local_port(mca_btl_openib_module_t * /* If we got an empty array, then no CPCs were eligible. Doh! */ if (0 == cpc_index) { - opal_show_help("help-mpi-btl-openib-cpc-base.txt", + orte_show_help("help-mpi-btl-openib-cpc-base.txt", "no cpcs for port", true, orte_process_info.nodename, ibv_get_device_name(btl->hca->ib_dev), @@ -350,10 +350,10 @@ ompi_btl_openib_connect_base_find_match(mca_btl_openib_module_t *btl, if (NULL != local_selected) { *ret_local_cpc = local_selected; *ret_remote_cpc_data = remote_selected; - opal_output(-1, "find_match: found match!"); + orte_output(-1, "find_match: found match!"); return OMPI_SUCCESS; } else { - opal_output(-1, "find_match: did NOT find match!"); + orte_output(-1, "find_match: did NOT find match!"); return OMPI_ERR_NOT_FOUND; } } diff --git a/ompi/mca/btl/openib/connect/btl_openib_connect_ibcm.c b/ompi/mca/btl/openib/connect/btl_openib_connect_ibcm.c index 4dd9639430..ada1c148e2 100644 --- a/ompi/mca/btl/openib/connect/btl_openib_connect_ibcm.c +++ b/ompi/mca/btl/openib/connect/btl_openib_connect_ibcm.c @@ -259,7 +259,7 @@ #include "opal/util/if.h" #include "opal/util/error.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "opal/event/event.h" #include "opal/class/opal_pointer_array.h" @@ -267,7 +267,6 @@ #include "btl_openib_proc.h" #include "btl_openib_fd.h" #include "connect/connect.h" -#include "opal/util/show_help.h" /* JMS to be removed: see #1264 */ #undef event @@ -576,7 +575,7 @@ static int ibcm_component_query(mca_btl_openib_module_t *btl, iWarp), so we can safely assume that we can use this CPC. */ #if defined(HAVE_STRUCT_IBV_DEVICE_TRANSPORT_TYPE) if (IBV_TRANSPORT_IB != btl->hca->ib_dev->transport_type) { - opal_output_verbose(5, mca_btl_base_output, + orte_output_verbose(5, mca_btl_base_output, "openib BTL: ibcm CPC only supported on InfiniBand"); rc = OMPI_ERR_NOT_SUPPORTED; goto error; @@ -585,7 +584,7 @@ static int ibcm_component_query(mca_btl_openib_module_t *btl, /* IBCM is not supported if we have any XRC QPs */ if (mca_btl_openib_component.num_xrc_qps > 0) { - opal_output_verbose(5, mca_btl_base_output, + orte_output_verbose(5, mca_btl_base_output, "openib BTL: ibcm CPC not supported with XRC receive queues"); rc = OMPI_ERR_NOT_SUPPORTED; goto error; @@ -609,7 +608,7 @@ static int ibcm_component_query(mca_btl_openib_module_t *btl, goto error; } msg = (modex_msg_t*) (m + 1); - opal_output(-1, "ibcm: created cpc module %p for btl %p", + orte_output(-1, "ibcm: created cpc module %p for btl %p", (void*)m, (void*)btl); /* See if we've already for an IB CM listener for this device */ @@ -630,7 +629,7 @@ static int ibcm_component_query(mca_btl_openib_module_t *btl, cmh = OBJ_NEW(ibcm_listen_cm_id_t); if (NULL == cmh) { rc = OMPI_ERR_OUT_OF_RESOURCE; - opal_output_verbose(5, mca_btl_base_output, + orte_output_verbose(5, mca_btl_base_output, "openib BTL: ibcm CPC system error (malloc failed)"); goto error; } @@ -647,7 +646,7 @@ static int ibcm_component_query(mca_btl_openib_module_t *btl, /* We can't open the device for some reason (can't read, can't write, doesn't exist, ...etc.); IBCM is not setup on this node. */ - opal_output_verbose(5, mca_btl_base_output, + orte_output_verbose(5, mca_btl_base_output, "openib BTL: ibcm CPC failed to open IB CM device: %s", filename); free(filename); rc = OMPI_ERR_NOT_SUPPORTED; @@ -664,7 +663,7 @@ static int ibcm_component_query(mca_btl_openib_module_t *btl, platform. So print an optional message and return ERR_NOT_SUPPORTED (i.e., gracefully fail). */ OBJ_RELEASE(cmh); - opal_output_verbose(5, mca_btl_base_output, + orte_output_verbose(5, mca_btl_base_output, "openib BTL: ibcm CPC failed to open IB CM device"); rc = OMPI_ERR_NOT_SUPPORTED; goto error; @@ -675,7 +674,7 @@ static int ibcm_component_query(mca_btl_openib_module_t *btl, 0 != ib_cm_listen(cmh->listen_cm_id, ibcm_pid, 0)) { /* Same rationale as above */ OBJ_RELEASE(cmh); - opal_output_verbose(5, mca_btl_base_output, + orte_output_verbose(5, mca_btl_base_output, "openib BTL: ibcm CPC failed to initialize IB CM handles"); rc = OMPI_ERR_NOT_SUPPORTED; goto error; @@ -708,7 +707,7 @@ static int ibcm_component_query(mca_btl_openib_module_t *btl, different formula). Query for the Nth GID (N = MCA param) on the port. */ if (ibcm_gid_table_index > btl->ib_port_attr.gid_tbl_len) { - opal_output_verbose(5, mca_btl_base_output, + orte_output_verbose(5, mca_btl_base_output, "openib BTL: ibcm CPC desired GID table index (%d) is larger than the actual table size (%d) on device %s", ibcm_gid_table_index, btl->ib_port_attr.gid_tbl_len, @@ -719,7 +718,7 @@ static int ibcm_component_query(mca_btl_openib_module_t *btl, rc = ibv_query_gid(btl->hca->ib_dev_context, btl->port_num, ibcm_gid_table_index, &gid); if (0 != rc) { - opal_output_verbose(5, mca_btl_base_output, + orte_output_verbose(5, mca_btl_base_output, "openib BTL: ibcm CPC system error (ibv_query_gid failed)"); rc = OMPI_ERR_UNREACH; goto error; @@ -740,7 +739,7 @@ static int ibcm_component_query(mca_btl_openib_module_t *btl, /* All done */ *cpc = (ompi_btl_openib_connect_base_module_t *) m; - opal_output_verbose(5, mca_btl_base_output, + orte_output_verbose(5, mca_btl_base_output, "openib BTL: ibcm CPC available for use on %s", ibv_get_device_name(btl->hca->ib_dev)); return OMPI_SUCCESS; @@ -748,11 +747,11 @@ static int ibcm_component_query(mca_btl_openib_module_t *btl, error: ibcm_module_finalize(btl, (ompi_btl_openib_connect_base_module_t *) m); if (OMPI_ERR_NOT_SUPPORTED == rc) { - opal_output_verbose(5, mca_btl_base_output, + orte_output_verbose(5, mca_btl_base_output, "openib BTL: ibcm CPC unavailable for use on %s; skipped", ibv_get_device_name(btl->hca->ib_dev)); } else { - opal_output_verbose(5, mca_btl_base_output, + orte_output_verbose(5, mca_btl_base_output, "openib BTL: ibcm CPC unavailable for use on %s; fatal error %d (%s)", ibv_get_device_name(btl->hca->ib_dev), rc, opal_strerror(rc)); @@ -881,7 +880,7 @@ static int fill_path_record(ibcm_module_t *m, modex_msg_t *local_msg = (modex_msg_t*) m->cpc.data.cbm_modex_message; - opal_output(-1, "filling path record"); + orte_output(-1, "filling path record"); /* Global attributes */ path_rec->dgid.global.subnet_prefix = path_rec->sgid.global.subnet_prefix = @@ -958,31 +957,31 @@ static int fill_path_record(ibcm_module_t *m, path_rec->rate = IBV_RATE_MAX; break; } - opal_output(-1, "Got src/dest subnet id: 0x%lx / 0x%lx", + orte_output(-1, "Got src/dest subnet id: 0x%lx / 0x%lx", path_rec->sgid.global.subnet_prefix, path_rec->dgid.global.subnet_prefix); - opal_output(-1, "Got src/dest interface id: 0x%lx / 0x%lx", + orte_output(-1, "Got src/dest interface id: 0x%lx / 0x%lx", path_rec->sgid.global.interface_id, path_rec->dgid.global.interface_id); - opal_output(-1, "Got src/dest lid: 0x%x / 0x%x", + orte_output(-1, "Got src/dest lid: 0x%x / 0x%x", path_rec->slid, path_rec->dlid); - opal_output(-1, "Got raw_traffic: %d\n", path_rec->raw_traffic); + orte_output(-1, "Got raw_traffic: %d\n", path_rec->raw_traffic); - opal_output(-1, "Got flow_label: %d\n", path_rec->flow_label); - opal_output(-1, "Got hop_limit: %d\n", path_rec->hop_limit); - opal_output(-1, "Got traffic_class: %d\n", path_rec->traffic_class); - opal_output(-1, "Got reversible: 0x%x\n", path_rec->reversible); - opal_output(-1, "Got numb_path: %d\n", path_rec->numb_path); - opal_output(-1, "Got pkey: 0x%x\n", path_rec->pkey); + orte_output(-1, "Got flow_label: %d\n", path_rec->flow_label); + orte_output(-1, "Got hop_limit: %d\n", path_rec->hop_limit); + orte_output(-1, "Got traffic_class: %d\n", path_rec->traffic_class); + orte_output(-1, "Got reversible: 0x%x\n", path_rec->reversible); + orte_output(-1, "Got numb_path: %d\n", path_rec->numb_path); + orte_output(-1, "Got pkey: 0x%x\n", path_rec->pkey); - opal_output(-1, "Got sl: %d\n", path_rec->sl); - opal_output(-1, "Got mtu_selector: %d\n", path_rec->mtu_selector); - opal_output(-1, "Got mtu: %d\n", path_rec->mtu); - opal_output(-1, "Got rate_selector: %d\n", path_rec->rate_selector); - opal_output(-1, "Got rate: %d\n", path_rec->rate); - opal_output(-1, "Got packet_life_time_selector: %d\n", path_rec->packet_life_time_selector); - opal_output(-1, "Got packet lifetime: 0x%x\n", path_rec->packet_life_time); - opal_output(-1, "Got preference: %d\n", path_rec->preference); + orte_output(-1, "Got sl: %d\n", path_rec->sl); + orte_output(-1, "Got mtu_selector: %d\n", path_rec->mtu_selector); + orte_output(-1, "Got mtu: %d\n", path_rec->mtu); + orte_output(-1, "Got rate_selector: %d\n", path_rec->rate_selector); + orte_output(-1, "Got rate: %d\n", path_rec->rate); + orte_output(-1, "Got packet_life_time_selector: %d\n", path_rec->packet_life_time_selector); + orte_output(-1, "Got packet lifetime: 0x%x\n", path_rec->packet_life_time); + orte_output(-1, "Got preference: %d\n", path_rec->preference); return OMPI_SUCCESS; } @@ -995,7 +994,7 @@ static int ibcm_endpoint_init(struct mca_btl_base_endpoint_t *endpoint) return OMPI_ERR_OUT_OF_RESOURCE; } - opal_output(-1, "ibcm endpoint init for endpoint %p / %p", + orte_output(-1, "ibcm endpoint init for endpoint %p / %p", (void*)endpoint, (void*)ie); ie->ie_cpc = endpoint->endpoint_local_cpc; ie->ie_endpoint = endpoint; @@ -1022,9 +1021,9 @@ static bool i_initiate(ibcm_module_t *m, uint64_t my_port_guid = ntoh64(m->btl->hca->ib_dev_attr.node_guid) + m->btl->port_num; - opal_output(-1, "i_initiate: my guid (%0lx), msg guid (%0lx)", + orte_output(-1, "i_initiate: my guid (%0lx), msg guid (%0lx)", my_port_guid, msg->mm_port_guid); - opal_output(-1, "i_initiate: my pid (%d), msg pid (%d)", + orte_output(-1, "i_initiate: my pid (%d), msg pid (%d)", ibcm_pid, msg->mm_service_id); return @@ -1043,7 +1042,7 @@ static ibcm_request_t *alloc_request(ibcm_module_t *m, modex_msg_t *msg, { struct ib_cm_req_param *cm_req; ibcm_request_t *req = OBJ_NEW(ibcm_request_t); - opal_output(-1, "allocated cached req id: %p", (void*)req); + orte_output(-1, "allocated cached req id: %p", (void*)req); if (NULL == req) { return NULL; @@ -1053,7 +1052,7 @@ static ibcm_request_t *alloc_request(ibcm_module_t *m, modex_msg_t *msg, if (0 != ib_cm_create_id(m->cmh->cm_device, &(req->super.cm_id), NULL)) { - opal_output(-1, "ib cm: failed to create active device id"); + orte_output(-1, "ib cm: failed to create active device id"); OBJ_RELEASE(req); return NULL; } @@ -1095,7 +1094,7 @@ static int ibcm_module_start_connect(ompi_btl_openib_connect_base_module_t *cpc, struct ibv_sa_path_rec path_rec; bool do_initiate; - opal_output(-1,"ibcm start connect on endpoint %p", (void*)endpoint); + orte_output(-1,"ibcm start connect on endpoint %p", (void*)endpoint); /* Has an incoming request already initiated the connect sequence on this endpoint? If so, just exit successfully -- the @@ -1116,7 +1115,7 @@ static int ibcm_module_start_connect(ompi_btl_openib_connect_base_module_t *cpc, /* Fill in the path record for this peer */ if (OMPI_SUCCESS != fill_path_record(m, endpoint, &path_rec)) { - opal_output(-1, "================ start connect failed!!!"); + orte_output(-1, "================ start connect failed!!!"); rc = OMPI_ERR_NOT_FOUND; goto err; } @@ -1160,7 +1159,7 @@ static int ibcm_module_start_connect(ompi_btl_openib_connect_base_module_t *cpc, ie->ie_cm_id_cache = calloc(ie->ie_cm_id_cache_size, sizeof(ibcm_base_cm_id_t*)); if (NULL == ie->ie_cm_id_cache) { - opal_output(-1, "ib cm: failed to malloc %d active device ids", + orte_output(-1, "ib cm: failed to malloc %d active device ids", num_ids); rc = OMPI_ERR_OUT_OF_RESOURCE; goto err; @@ -1193,14 +1192,14 @@ static int ibcm_module_start_connect(ompi_btl_openib_connect_base_module_t *cpc, cm_req->srq = BTL_OPENIB_QP_TYPE_SRQ(i); cm_req->qp_num = endpoint->qps[i].qp->lcl_qp->qp_num; cm_req->starting_psn = endpoint->qps[i].qp->lcl_psn; - opal_output(-1, "ibcm: sending my qpn %d, psn %d\n", + orte_output(-1, "ibcm: sending my qpn %d, psn %d\n", cm_req->qp_num, cm_req->starting_psn); req->private_data.ireqd_request = req; req->private_data.ireqd_qp_index = i; /* Send the request */ - opal_output(-1, "ibcm sending connect request %d of %d (id %p)", + orte_output(-1, "ibcm sending connect request %d of %d (id %p)", i, mca_btl_openib_component.num_qps, (void*)req->super.cm_id); if (0 != ib_cm_send_req(req->super.cm_id, cm_req)) { @@ -1232,7 +1231,7 @@ static int ibcm_module_start_connect(ompi_btl_openib_connect_base_module_t *cpc, cm_req->srq = 0; cm_req->qp_num = ie->ie_bogus_qp->qp_num; cm_req->starting_psn = 0; - opal_output(-1, "ibcm: sending BOGUS qpn %d, psn %d (id %p)", + orte_output(-1, "ibcm: sending BOGUS qpn %d, psn %d (id %p)", cm_req->qp_num, cm_req->starting_psn, (void*)req->super.cm_id); @@ -1355,14 +1354,14 @@ static int ibcm_endpoint_finalize(struct mca_btl_base_endpoint_t *endpoint) { ibcm_endpoint_t *ie = (ibcm_endpoint_t *) endpoint->endpoint_local_cpc_data; - opal_output(-1, "ibcm endpoint finalize: %p", (void*)endpoint); + orte_output(-1, "ibcm endpoint finalize: %p", (void*)endpoint); /* Free the stuff we allocated in ibcm_module_init */ if (NULL != ie) { int i; for (i = 0; i < ie->ie_cm_id_cache_size; ++i) { if (NULL != ie->ie_cm_id_cache[i]) { - opal_output(-1, "Endpoint %p (%p), destroying ID %d (%p)\n", + orte_output(-1, "Endpoint %p (%p), destroying ID %d (%p)\n", (void*)endpoint, (void*)ie, i, (void*)&(ie->ie_cm_id_cache[i]->cm_id)); @@ -1378,7 +1377,7 @@ static int ibcm_endpoint_finalize(struct mca_btl_base_endpoint_t *endpoint) endpoint->endpoint_local_cpc_data = NULL; } - opal_output(-1, "ibcm endpoint finalize done: %p", (void*)endpoint); + orte_output(-1, "ibcm endpoint finalize done: %p", (void*)endpoint); return OMPI_SUCCESS; } @@ -1429,7 +1428,7 @@ static int qp_to_rtr(int qp_index, struct ib_cm_id *cm_id, (mtu == IBV_MTU_4096) ? "4096" : "unknown (!)")); } - opal_output(-1, "ibm cm handler: connect qp set to IBV value %d (%s bytes)", mtu, + orte_output(-1, "ibm cm handler: connect qp set to IBV value %d (%s bytes)", mtu, (mtu == IBV_MTU_256) ? "256" : (mtu == IBV_MTU_512) ? "512" : (mtu == IBV_MTU_1024) ? "1024" : @@ -1464,7 +1463,7 @@ static int qp_to_rtr(int qp_index, struct ib_cm_id *cm_id, /* Setup attributes */ attr.path_mtu = mtu; attr.rq_psn = endpoint->qps[qp_index].qp->lcl_psn; - opal_output(-1, "ib cm qp connect: setting rq psn: %d", attr.rq_psn); + orte_output(-1, "ib cm qp connect: setting rq psn: %d", attr.rq_psn); /* IBM CM does not set these values for us */ attr.max_dest_rd_atomic = mca_btl_openib_component.ib_max_rdma_dst_ops; attr.min_rnr_timer = mca_btl_openib_component.ib_min_rnr_timer; @@ -1508,7 +1507,7 @@ static int qp_to_rts(int qp_index, struct ib_cm_id *cm_id, } /* All done */ - opal_output(-1, "successfully set RTS"); + orte_output(-1, "successfully set RTS"); return OMPI_SUCCESS; } @@ -1521,7 +1520,7 @@ static void *callback_set_endpoint_connecting(void *context) mca_btl_openib_endpoint_t *endpoint = (mca_btl_openib_endpoint_t *) context; - opal_output(-1, "ibcm scheduled callback: setting endpoint to CONNECTING"); + orte_output(-1, "ibcm scheduled callback: setting endpoint to CONNECTING"); endpoint->endpoint_state = MCA_BTL_IB_CONNECTING; return NULL; @@ -1536,14 +1535,14 @@ static void *callback_start_connect(void *context) callback_start_connect_data_t *cbdata = (callback_start_connect_data_t *) context; - opal_output(-1, "ibcm scheduled callback: calling start_connect()"); - opal_output(-1, "ibcm scheduled callback: cbdata %p", + orte_output(-1, "ibcm scheduled callback: calling start_connect()"); + orte_output(-1, "ibcm scheduled callback: cbdata %p", (void*)cbdata); - opal_output(-1, "ibcm scheduled callback: endpoint %p", + orte_output(-1, "ibcm scheduled callback: endpoint %p", (void*)cbdata->cscd_endpoint); - opal_output(-1, "ibcm scheduled callback: ie %p", + orte_output(-1, "ibcm scheduled callback: ie %p", (void*)cbdata->cscd_endpoint->endpoint_local_cpc_data); - opal_output(-1, "ibcm scheduled callback: msg %p", + orte_output(-1, "ibcm scheduled callback: msg %p", (void*)cbdata->cscd_endpoint->endpoint_remote_cpc_data->cbm_modex_message); ibcm_module_start_connect(cbdata->cscd_cpc, cbdata->cscd_endpoint); free(cbdata); @@ -1573,7 +1572,7 @@ static int request_received(ibcm_listen_cm_id_t *cmh, ibcm_module_t *m; ibcm_reply_t *rep; - opal_output(-1, "ibcm req handler: remote qp index %d, remote guid %lx, remote qkey %u, remote qpn %d, remote psn %d", + orte_output(-1, "ibcm req handler: remote qp index %d, remote guid %lx, remote qkey %u, remote qpn %d, remote psn %d", qp_index, ntoh64(req->primary_path->dgid.global.interface_id), req->remote_qkey, req->remote_qpn, @@ -1583,7 +1582,7 @@ static int request_received(ibcm_listen_cm_id_t *cmh, events come in per *device*, not per *port*. So we just got a device event, and have to find the ibcm_module_t (i.e., local port/openib BTL module ) that corresponds to it. */ - opal_output(-1, "looking for ibcm module -- source port guid: 0x%lx (%p)", + orte_output(-1, "looking for ibcm module -- source port guid: 0x%lx (%p)", ntoh64(req->primary_path->sgid.global.interface_id), (void*)cmh); for (item = opal_list_get_first(&(cmh->ibcm_modules)); @@ -1593,7 +1592,7 @@ static int request_received(ibcm_listen_cm_id_t *cmh, imli = (ibcm_module_list_item_t*) item; m = imli->ibcm_module; msg = imli->ibcm_module->cpc.data.cbm_modex_message; - opal_output(-1, "comparing ibcm module port guid: 0x%lx", + orte_output(-1, "comparing ibcm module port guid: 0x%lx", msg->mm_port_guid); if (msg->mm_port_guid == ntoh64(req->primary_path->sgid.global.interface_id)) { @@ -1613,37 +1612,37 @@ static int request_received(ibcm_listen_cm_id_t *cmh, ib_proc != (mca_btl_openib_proc_t*) opal_list_get_end(&mca_btl_openib_component.ib_procs); ib_proc = (mca_btl_openib_proc_t*)opal_list_get_next(ib_proc)) { - opal_output(-1, "ibcm req: checking ib_proc %p", (void*)ib_proc); + orte_output(-1, "ibcm req: checking ib_proc %p", (void*)ib_proc); /* Now cycle through all the endpoints on that proc */ for (i = 0; !found && i < (int) ib_proc->proc_endpoint_count; ++i) { - opal_output(-1, "ibcm req: checking endpoint %d of %d (ep %p, cpc data %p)", + orte_output(-1, "ibcm req: checking endpoint %d of %d (ep %p, cpc data %p)", i, (int) ib_proc->proc_endpoint_count, (void*)ib_proc->proc_endpoints[i], (void*)ib_proc->proc_endpoints[i]->endpoint_remote_cpc_data); if (NULL == ib_proc->proc_endpoints[i]->endpoint_remote_cpc_data) { - opal_output(-1, "NULL remote cpc data!"); + orte_output(-1, "NULL remote cpc data!"); } msg = ib_proc->proc_endpoints[i]->endpoint_remote_cpc_data->cbm_modex_message; - opal_output(-1, "ibcm req: my guid 0x%lx, remote guid 0x%lx", + orte_output(-1, "ibcm req: my guid 0x%lx, remote guid 0x%lx", msg->mm_port_guid, ntoh64(req->primary_path->dgid.global.interface_id)); if (msg->mm_port_guid == ntoh64(req->primary_path->dgid.global.interface_id) && msg->mm_service_id == active_private_data->ireqd_pid && msg->mm_port_num == req->port) { - opal_output(-1, "*** found matching endpoint!!!"); + orte_output(-1, "*** found matching endpoint!!!"); endpoint = ib_proc->proc_endpoints[i]; found = true; } } } if (!found) { - opal_output(-1, "ibcm req: could not find match for calling endpoint!"); + orte_output(-1, "ibcm req: could not find match for calling endpoint!"); rc = OMPI_ERR_NOT_FOUND; rej_reason = REJ_PEER_NOT_FOUND; goto reject; } - opal_output(-1, "ibcm req: Found endpoint %p", (void*)endpoint); + orte_output(-1, "ibcm req: Found endpoint %p", (void*)endpoint); /* Get our CPC-local data on the endpoint */ ie = (ibcm_endpoint_t*) endpoint->endpoint_local_cpc_data; @@ -1660,25 +1659,25 @@ static int request_received(ibcm_listen_cm_id_t *cmh, debugging. */ opal_mutex_lock(&ie->ie_lock); if (do_initiate) { - opal_output(-1, "ibcm request: request came from wrong direction"); + orte_output(-1, "ibcm request: request came from wrong direction"); rc = OMPI_SUCCESS; rej_reason = REJ_WRONG_DIRECTION; } else if (ie->ie_connection_flags & CFLAGS_COMPLETED) { - opal_output(-1, "ibcm request: all QPs already connected"); + orte_output(-1, "ibcm request: all QPs already connected"); rej_reason = REJ_ALREADY_CONNECTED; rc = OMPI_SUCCESS; } else if (ie->ie_connection_flags & CFLAGS_ONGOING) { /* See if the request for this QP already arrived */ if (ie->ie_qps_created && IBV_QPS_RESET != endpoint->qps[qp_index].qp->lcl_qp->state) { - opal_output(-1, "ibcm request: this QP (%d) already connected", + orte_output(-1, "ibcm request: this QP (%d) already connected", qp_index); rej_reason = REJ_QP_ALREADY_CONNECTED; rc = OMPI_SUCCESS; } } else { /* this is the first activity -- accept */ - opal_output(-1, "ibcm request: first initiation request"); + orte_output(-1, "ibcm request: first initiation request"); ie->ie_connection_flags |= CFLAGS_ONGOING; } opal_mutex_unlock(&ie->ie_lock); @@ -1688,11 +1687,11 @@ static int request_received(ibcm_listen_cm_id_t *cmh, IBCM will trigger a new event and we'll just reject it again. */ if (REJ_MAX != rej_reason) { - opal_output(-1, "arbitrartion failed -- reject"); + orte_output(-1, "arbitrartion failed -- reject"); goto reject; } - opal_output(-1, "ibcm req handler: initiation arbitration successful -- proceeding"); + orte_output(-1, "ibcm req handler: initiation arbitration successful -- proceeding"); /* If this is the first request we have received for this endpoint, then make *all* the QP's (because we analyze all the @@ -1705,11 +1704,11 @@ static int request_received(ibcm_listen_cm_id_t *cmh, endpoint); if (OMPI_SUCCESS != (rc = qp_create_all(endpoint, m))) { rej_reason = REJ_PASSIVE_SIDE_ERROR; - opal_output(-1, "qp_create_all failed -- reject"); + orte_output(-1, "qp_create_all failed -- reject"); goto reject; } ie->ie_qps_created = true; - opal_output(-1, "ibcm request: created qp's"); + orte_output(-1, "ibcm request: created qp's"); } /* Save these numbers on the endpoint for reference. Other values @@ -1723,7 +1722,7 @@ static int request_received(ibcm_listen_cm_id_t *cmh, /* Connect this QP to the peer */ if (OMPI_SUCCESS != (rc = qp_to_rtr(qp_index, event->cm_id, endpoint))) { - opal_output(-1, "ib cm req handler: failed to connect qp"); + orte_output(-1, "ib cm req handler: failed to connect qp"); rej_reason = REJ_PASSIVE_SIDE_ERROR; goto reject; } @@ -1737,7 +1736,7 @@ static int request_received(ibcm_listen_cm_id_t *cmh, if (OMPI_SUCCESS != (rc = mca_btl_openib_endpoint_post_recvs(endpoint))) { /* JMS */ - opal_output(-1, "ib cm req handler: failed to post recv buffers"); + orte_output(-1, "ib cm req handler: failed to post recv buffers"); rej_reason = REJ_PASSIVE_SIDE_ERROR; goto reject; } @@ -1751,7 +1750,7 @@ static int request_received(ibcm_listen_cm_id_t *cmh, sizeof(ibcm_base_cm_id_t*)); if (NULL == ie->ie_cm_id_cache) { rej_reason = REJ_PASSIVE_SIDE_ERROR; - opal_output(-1, "malloc failed -- reject"); + orte_output(-1, "malloc failed -- reject"); goto reject; } } @@ -1759,7 +1758,7 @@ static int request_received(ibcm_listen_cm_id_t *cmh, /* Save the CM ID on the endpoint for destruction later */ ie->ie_cm_id_cache[qp_index] = OBJ_NEW(ibcm_base_cm_id_t); if (NULL == ie->ie_cm_id_cache[qp_index]) { - opal_output(-1, "ib cm req handler: malloc failed"); + orte_output(-1, "ib cm req handler: malloc failed"); rej_reason = REJ_PASSIVE_SIDE_ERROR; goto reject; } @@ -1770,7 +1769,7 @@ static int request_received(ibcm_listen_cm_id_t *cmh, if (NULL == req) { rej_reason = REJ_PASSIVE_SIDE_ERROR; rc = OMPI_ERR_OUT_OF_RESOURCE; - opal_output(-1, "OBJ_NEW failed -- reject"); + orte_output(-1, "OBJ_NEW failed -- reject"); goto reject; } rep->super.cm_id = event->cm_id; @@ -1779,7 +1778,7 @@ static int request_received(ibcm_listen_cm_id_t *cmh, rep->cm_rep.qp_num = endpoint->qps[qp_index].qp->lcl_qp->qp_num; rep->cm_rep.srq = BTL_OPENIB_QP_TYPE_SRQ(qp_index); rep->cm_rep.starting_psn = endpoint->qps[qp_index].qp->lcl_psn; - opal_output(-1, "ib cm reply: setting reply psn %d\n", + orte_output(-1, "ib cm reply: setting reply psn %d\n", rep->cm_rep.starting_psn); rep->cm_rep.responder_resources = req->responder_resources; rep->cm_rep.initiator_depth = req->initiator_depth; @@ -1794,22 +1793,22 @@ static int request_received(ibcm_listen_cm_id_t *cmh, if (0 != (rc = ib_cm_send_rep(event->cm_id, &(rep->cm_rep)))) { /* JMS */ - opal_output(-1, "ibcm req handler: failed to send reply for qp index %d", + orte_output(-1, "ibcm req handler: failed to send reply for qp index %d", qp_index); OBJ_RELEASE(rep); rej_reason = REJ_PASSIVE_SIDE_ERROR; - opal_output(-1, "failed to send request -- reject"); + orte_output(-1, "failed to send request -- reject"); goto reject; } opal_list_append(&ibcm_pending_replies, &(rep->super.super)); - opal_output(-1, "ibcm req handler: sent reply for qp index %d", + orte_output(-1, "ibcm req handler: sent reply for qp index %d", qp_index); return OMPI_SUCCESS; reject: /* Reject the request */ - opal_output(-1, "rejecting request"); + orte_output(-1, "rejecting request"); ib_cm_send_rej(event->cm_id, IB_CM_REJ_CONSUMER_DEFINED, &rej_reason, sizeof(rej_reason), event->private_data, sizeof(ibcm_req_data_t)); @@ -1837,9 +1836,9 @@ static void *callback_set_endpoint_connected(void *context) { mca_btl_openib_endpoint_t *endpoint = (mca_btl_openib_endpoint_t*) context; - opal_output(-1, "ibcm: calling endpoint_connected"); + orte_output(-1, "ibcm: calling endpoint_connected"); mca_btl_openib_endpoint_connected(endpoint); - opal_output(-1, "ibcm: *** CONNECTED endpoint_connected done!"); + orte_output(-1, "ibcm: *** CONNECTED endpoint_connected done!"); return NULL; } @@ -1878,7 +1877,7 @@ static int reply_received(ibcm_listen_cm_id_t *cmh, struct ib_cm_event *event) ibcm_endpoint_t *ie; ibcm_rtu_data_t rtu_data; - opal_output(-1, "ibcm handler: got reply! (qp index %d) endpoint: %p", + orte_output(-1, "ibcm handler: got reply! (qp index %d) endpoint: %p", p->irepd_qp_index, (void*) endpoint); ie = (ibcm_endpoint_t*) endpoint->endpoint_local_cpc_data; @@ -1889,13 +1888,13 @@ static int reply_received(ibcm_listen_cm_id_t *cmh, struct ib_cm_event *event) /* Move the QP to RTR and RTS */ if (OMPI_SUCCESS != (rc = qp_to_rtr(p->irepd_qp_index, event->cm_id, endpoint))) { - opal_output(-1, "ib cm req handler: failed move to RTR"); + orte_output(-1, "ib cm req handler: failed move to RTR"); return rc; } if (OMPI_SUCCESS != (rc = qp_to_rts(p->irepd_qp_index, event->cm_id, endpoint))) { - opal_output(-1, "ib cm req handler: failed move to RTS"); + orte_output(-1, "ib cm req handler: failed move to RTS"); return rc; } @@ -1908,7 +1907,7 @@ static int reply_received(ibcm_listen_cm_id_t *cmh, struct ib_cm_event *event) if (!ie->ie_recv_buffers_posted) { if (OMPI_SUCCESS != (rc = mca_btl_openib_endpoint_post_recvs(endpoint))) { - opal_output(-1, "ib cm: failed to post recv buffers"); + orte_output(-1, "ib cm: failed to post recv buffers"); return rc; } ie->ie_recv_buffers_posted = true; @@ -1918,13 +1917,13 @@ static int reply_received(ibcm_listen_cm_id_t *cmh, struct ib_cm_event *event) rtu_data.irtud_reply = reply; rtu_data.irtud_qp_index = p->irepd_qp_index; if (0 != ib_cm_send_rtu(event->cm_id, &rtu_data, sizeof(rtu_data))) { - opal_output(-1, "ib cm rep handler: failed to send RTU"); + orte_output(-1, "ib cm rep handler: failed to send RTU"); return OMPI_ERR_IN_ERRNO; } /* Remove the pending request because we won't need to handle errors for it */ - opal_output(-1, "reply received cm id %p -- original cached req %p", + orte_output(-1, "reply received cm id %p -- original cached req %p", (void*)cmh->listen_cm_id, (void*)request); opal_list_remove_item(&ibcm_pending_requests, &(request->super.super)); OBJ_RELEASE(request); @@ -1932,7 +1931,7 @@ static int reply_received(ibcm_listen_cm_id_t *cmh, struct ib_cm_event *event) /* Have all the QP's been connected? If so, tell the main BTL that we're done. */ if (0 == --(ie->ie_qps_to_connect)) { - opal_output(-1, "ib cm rep handler: REPLY telling main BTL we're connected"); + orte_output(-1, "ib cm rep handler: REPLY telling main BTL we're connected"); ompi_btl_openib_fd_schedule(callback_set_endpoint_connected, endpoint); } @@ -1951,19 +1950,19 @@ static int ready_to_use_received(ibcm_listen_cm_id_t *h, mca_btl_openib_endpoint_t *endpoint = reply->endpoint; ibcm_endpoint_t *ie = (ibcm_endpoint_t*) endpoint->endpoint_local_cpc_data; - opal_output(-1, "ibcm handler: got RTU! (index %d)", p->irtud_qp_index); + orte_output(-1, "ibcm handler: got RTU! (index %d)", p->irtud_qp_index); /* Move the QP to RTS */ if (OMPI_SUCCESS != (rc = qp_to_rts(p->irtud_qp_index, event->cm_id, endpoint))) { - opal_output(-1, "ib cm rtu handler: failed move to RTS (index %d)", + orte_output(-1, "ib cm rtu handler: failed move to RTS (index %d)", p->irtud_qp_index); return rc; } /* Remove the pending reply because we won't need to handle errors for it */ - opal_output(-1, "RTU received cm id %p -- original cached reply %p", + orte_output(-1, "RTU received cm id %p -- original cached reply %p", (void*)event->cm_id, (void*)reply); opal_list_remove_item(&ibcm_pending_replies, &(reply->super.super)); OBJ_RELEASE(reply); @@ -1971,11 +1970,11 @@ static int ready_to_use_received(ibcm_listen_cm_id_t *h, /* Have all the QP's been connected? If so, tell the main BTL that we're done. */ if (0 == --(ie->ie_qps_to_connect)) { - opal_output(-1, "ib cm rtu handler: RTU telling main BTL we're connected"); + orte_output(-1, "ib cm rtu handler: RTU telling main BTL we're connected"); ompi_btl_openib_fd_schedule(callback_set_endpoint_connected, endpoint); } - opal_output(-1, "ib cm rtu handler: all done"); + orte_output(-1, "ib cm rtu handler: all done"); return OMPI_SUCCESS; } @@ -1983,7 +1982,7 @@ static int ready_to_use_received(ibcm_listen_cm_id_t *h, static int disconnect_request_received(ibcm_listen_cm_id_t *cmh, struct ib_cm_event *event) { - opal_output(-1, "ibcm handler: disconnect request received"); + orte_output(-1, "ibcm handler: disconnect request received"); return OMPI_SUCCESS; } @@ -1991,7 +1990,7 @@ static int disconnect_request_received(ibcm_listen_cm_id_t *cmh, static int disconnect_reply_received(ibcm_listen_cm_id_t *cmd, struct ib_cm_event *event) { - opal_output(-1, "ibcm handler: disconnect reply received"); + orte_output(-1, "ibcm handler: disconnect reply received"); #if 0 ib_cm_send_drep(event->cm_id, NULL, 0); #endif @@ -2005,7 +2004,7 @@ static int reject_received(ibcm_listen_cm_id_t *cmh, struct ib_cm_event *event) ibcm_reject_reason_t *rej_reason = (ibcm_reject_reason_t *) event->param.rej_rcvd.ari; - opal_output(-1, "ibcm handler: reject received: reason %d, official reason: %d", + orte_output(-1, "ibcm handler: reject received: reason %d, official reason: %d", reason, *rej_reason); /* Determine if we expected this reject or not */ @@ -2019,18 +2018,18 @@ static int reject_received(ibcm_listen_cm_id_t *cmh, struct ib_cm_event *event) ibcm_endpoint_t *ie = (ibcm_endpoint_t*) endpoint->endpoint_local_cpc_data; - opal_output(-1, "ibcm rej handler: got WRONG_DIRECTION reject, endpoint: %p, pid %d, ep_index %d, qp_index %d", + orte_output(-1, "ibcm rej handler: got WRONG_DIRECTION reject, endpoint: %p, pid %d, ep_index %d, qp_index %d", (void*)my_private_data->ireqd_request->endpoint, my_private_data->ireqd_pid, my_private_data->ireqd_ep_index, my_private_data->ireqd_qp_index); if (NULL == ie->ie_bogus_qp) { - opal_output(-1, "ibcm rej handler: WRONG_DIRECTION unexpected!"); + orte_output(-1, "ibcm rej handler: WRONG_DIRECTION unexpected!"); } else { /* Remove from the global pending_requests list because we no longer need to handle errors for it */ - opal_output(-1, "reply received cm id %p -- original cached req %p", + orte_output(-1, "reply received cm id %p -- original cached req %p", (void*)cmh->listen_cm_id, (void*)request); opal_list_remove_item(&ibcm_pending_requests, @@ -2039,13 +2038,13 @@ static int reject_received(ibcm_listen_cm_id_t *cmh, struct ib_cm_event *event) /* We ack the event and then destroy the CM ID (you *must* ACK it first -- the destroy will block until all outstand events on this ID are complete) */ - opal_output(-1, "ibcm rej handler: destroying bogus CM ID: %p", + orte_output(-1, "ibcm rej handler: destroying bogus CM ID: %p", (void*)request->super.cm_id); ib_cm_ack_event(event); ib_cm_destroy_id(request->super.cm_id); /* Destroy the QP */ - opal_output(-1, "ibcm rej handler: destroying bogus qp"); + orte_output(-1, "ibcm rej handler: destroying bogus qp"); ibv_destroy_qp(ie->ie_bogus_qp); ie->ie_bogus_qp = NULL; @@ -2056,7 +2055,7 @@ static int reject_received(ibcm_listen_cm_id_t *cmh, struct ib_cm_event *event) return OMPI_SUCCESS; } - opal_output(-1, "ibcm rej handler: got unexpected reject type: %d", + orte_output(-1, "ibcm rej handler: got unexpected reject type: %d", reason); return OMPI_ERR_NOT_FOUND; } @@ -2064,22 +2063,22 @@ static int reject_received(ibcm_listen_cm_id_t *cmh, struct ib_cm_event *event) static int request_error(ibcm_listen_cm_id_t *cmh, struct ib_cm_event *event) { ibcm_request_t *req; - opal_output(-1, "ibcm handler: request error!"); + orte_output(-1, "ibcm handler: request error!"); if (IBV_WC_RESP_TIMEOUT_ERR != event->param.send_status) { - opal_show_help("help-mpi-btl-openib-cpc-ibcm.txt", + orte_show_help("help-mpi-btl-openib-cpc-ibcm.txt", "unhandled error", true, "request", orte_process_info.nodename, event->param.send_status); return OMPI_ERROR; } - opal_output(-1, "Got timeout in IBCM request (CM ID: %p)", + orte_output(-1, "Got timeout in IBCM request (CM ID: %p)", (void*)event->cm_id); req = (ibcm_request_t*) find_cm_id(event->cm_id, &ibcm_pending_requests); if (NULL == req) { - opal_show_help("help-mpi-btl-openib-cpc-ibcm.txt", + orte_show_help("help-mpi-btl-openib-cpc-ibcm.txt", "timeout not found", true, "request", orte_process_info.nodename); return OMPI_ERR_NOT_FOUND; @@ -2093,22 +2092,22 @@ static int request_error(ibcm_listen_cm_id_t *cmh, struct ib_cm_event *event) static int reply_error(ibcm_listen_cm_id_t *cmh, struct ib_cm_event *event) { ibcm_reply_t *rep; - opal_output(-1, "ibcm handler: reply error!"); + orte_output(-1, "ibcm handler: reply error!"); if (IBV_WC_RESP_TIMEOUT_ERR != event->param.send_status) { - opal_show_help("help-mpi-btl-openib-cpc-ibcm.txt", + orte_show_help("help-mpi-btl-openib-cpc-ibcm.txt", "unhandled error", true, "reply", orte_process_info.nodename, event->param.send_status); return OMPI_ERROR; } - opal_output(-1, "Got timeout in IBCM reply (id: %p) -- aborting because resend is not written yet...", + orte_output(-1, "Got timeout in IBCM reply (id: %p) -- aborting because resend is not written yet...", (void*)event->cm_id); rep = (ibcm_reply_t*) find_cm_id(event->cm_id, &ibcm_pending_replies); if (NULL == rep) { - opal_show_help("help-mpi-btl-openib-cpc-ibcm.txt", + orte_show_help("help-mpi-btl-openib-cpc-ibcm.txt", "timeout not found", true, "reply", orte_process_info.nodename); return OMPI_ERR_NOT_FOUND; @@ -2122,14 +2121,14 @@ static int reply_error(ibcm_listen_cm_id_t *cmh, struct ib_cm_event *event) static int disconnect_request_error(ibcm_listen_cm_id_t *cmh, struct ib_cm_event *e) { - opal_output(-1, "ibcm handler: disconnect request error!"); + orte_output(-1, "ibcm handler: disconnect request error!"); return OMPI_SUCCESS; } static int unhandled_event(ibcm_listen_cm_id_t *cmh, struct ib_cm_event *e) { - opal_output(-1, "ibcm handler: unhandled event error (%p, %d)", + orte_output(-1, "ibcm handler: unhandled event error (%p, %d)", (void*) e, e->event); return OMPI_ERR_NOT_FOUND; } @@ -2204,7 +2203,7 @@ static void *ibcm_event_dispatch(int fd, int flags, void *context) } if (OMPI_SUCCESS != rc) { - opal_output(-1, "An error occurred handling an IBCM event. Bad things are likely to happen."); + orte_output(-1, "An error occurred handling an IBCM event. Bad things are likely to happen."); } } diff --git a/ompi/mca/btl/openib/connect/btl_openib_connect_oob.c b/ompi/mca/btl/openib/connect/btl_openib_connect_oob.c index 075975b983..8320550947 100644 --- a/ompi/mca/btl/openib/connect/btl_openib_connect_oob.c +++ b/ompi/mca/btl/openib/connect/btl_openib_connect_oob.c @@ -23,7 +23,7 @@ #include "ompi_config.h" #include "opal/dss/dss.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "opal/util/error.h" #include "orte/mca/oob/base/base.h" #include "orte/mca/rml/rml.h" @@ -117,7 +117,7 @@ static int oob_component_query(mca_btl_openib_module_t *btl, therefore we must be IB. */ #if defined(HAVE_STRUCT_IBV_DEVICE_TRANSPORT_TYPE) if (IBV_TRANSPORT_IB != btl->hca->ib_dev->transport_type) { - opal_output_verbose(5, mca_btl_base_output, + orte_output_verbose(5, mca_btl_base_output, "openib BTL: oob CPC only supported on InfiniBand; skipped on device %s", ibv_get_device_name(btl->hca->ib_dev)); return OMPI_ERR_NOT_SUPPORTED; @@ -134,7 +134,7 @@ static int oob_component_query(mca_btl_openib_module_t *btl, rml_recv_cb, NULL); if (ORTE_SUCCESS != rc) { - opal_output_verbose(5, mca_btl_base_output, + orte_output_verbose(5, mca_btl_base_output, "openib BTL: oob CPC system error %d (%s)", rc, opal_strerror(rc)); return rc; @@ -146,7 +146,7 @@ static int oob_component_query(mca_btl_openib_module_t *btl, if (NULL == *cpc) { orte_rml.recv_cancel(ORTE_NAME_WILDCARD, OMPI_RML_TAG_OPENIB); rml_recv_posted = false; - opal_output_verbose(5, mca_btl_base_output, + orte_output_verbose(5, mca_btl_base_output, "openib BTL: oob CPC system error (malloc failed)"); return OMPI_ERR_OUT_OF_RESOURCE; } @@ -160,7 +160,7 @@ static int oob_component_query(mca_btl_openib_module_t *btl, (*cpc)->cbm_endpoint_finalize = NULL; (*cpc)->cbm_finalize = NULL; - opal_output_verbose(5, mca_btl_base_output, + orte_output_verbose(5, mca_btl_base_output, "openib BTL: oob CPC available for use on %s", ibv_get_device_name(btl->hca->ib_dev)); return OMPI_SUCCESS; diff --git a/ompi/mca/btl/openib/connect/btl_openib_connect_rdmacm.c b/ompi/mca/btl/openib/connect/btl_openib_connect_rdmacm.c index 22c82a8ade..89f222dc7f 100644 --- a/ompi/mca/btl/openib/connect/btl_openib_connect_rdmacm.c +++ b/ompi/mca/btl/openib/connect/btl_openib_connect_rdmacm.c @@ -28,9 +28,8 @@ #include #include "opal/util/argv.h" -#include "opal/util/show_help.h" #include "opal/util/error.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "btl_openib_fd.h" #include "btl_openib_proc.h" @@ -953,7 +952,7 @@ static int ipaddrcheck(struct rdmacm_contents *server, mca_btl_openib_module_t * rc = ibv_query_device(openib_btl->hca->ib_dev_context, &attr); if (-1 == rc) { - opal_output_verbose(5, mca_btl_base_output, + orte_output_verbose(5, mca_btl_base_output, "openib BTL: rdmacm CPC system error (verbs failure)"); goto out; } @@ -983,7 +982,7 @@ static int ipaddrcheck(struct rdmacm_contents *server, mca_btl_openib_module_t * supported on this HCA. So just gracefully return "sorry, Charlie" */ if (0 == server->ipaddr) { - opal_output_verbose(5, mca_btl_base_output, "openib BTL: rdmacm CPC unable to find IP address for %s", ibv_get_device_name(openib_btl->hca->ib_dev)); + orte_output_verbose(5, mca_btl_base_output, "openib BTL: rdmacm CPC unable to find IP address for %s", ibv_get_device_name(openib_btl->hca->ib_dev)); goto out; } @@ -1029,7 +1028,8 @@ static int rdmacm_component_query(mca_btl_openib_module_t *openib_btl, ompi_btl_ /* RDMACM is not supported if we have any XRC QPs */ if (mca_btl_openib_component.num_xrc_qps > 0) { - opal_output_verbose(5, mca_btl_base_output, "openib BTL: rdmacm CPC not supported with XRC receive queues; skipped"); + orte_output_verbose(5, mca_btl_base_output, + "openib BTL: rdmacm CPC not supported with XRC receive queues; skipped"); rc = OMPI_ERR_NOT_SUPPORTED; goto out; } @@ -1066,7 +1066,7 @@ static int rdmacm_component_query(mca_btl_openib_module_t *openib_btl, ompi_btl_ context = malloc(sizeof(struct id_contexts)); if (NULL == context) { - opal_output_verbose(5, mca_btl_base_output, + orte_output_verbose(5, mca_btl_base_output, "openib BTL: rdmacm CPC system error (malloc failed)"); rc = OMPI_ERR_OUT_OF_RESOURCE; goto out3; @@ -1077,7 +1077,7 @@ static int rdmacm_component_query(mca_btl_openib_module_t *openib_btl, ompi_btl_ rc = rdma_create_id(event_channel, &server->id[0], context, RDMA_PS_TCP); if (0 != rc) { - opal_output_verbose(5, mca_btl_base_output, + orte_output_verbose(5, mca_btl_base_output, "openib BTL: rdmacm CPC failed to create ID"); rc = OMPI_ERR_OUT_OF_RESOURCE; goto out4; @@ -1093,7 +1093,7 @@ static int rdmacm_component_query(mca_btl_openib_module_t *openib_btl, ompi_btl_ */ rc = rdma_bind_addr(server->id[0], (struct sockaddr *)&sin); if (0 != rc) { - opal_output_verbose(5, mca_btl_base_output, + orte_output_verbose(5, mca_btl_base_output, "openib BTL: rdmacm CPC unable to bind to address"); rc = OMPI_ERR_UNREACH; goto out5; @@ -1102,7 +1102,7 @@ static int rdmacm_component_query(mca_btl_openib_module_t *openib_btl, ompi_btl_ /* Verify that the HCA has a valid IP address on it, or we cannot use the cpc */ rc = ipaddrcheck(server, openib_btl); if (0 != rc) { - opal_output_verbose(5, mca_btl_base_output, + orte_output_verbose(5, mca_btl_base_output, "openib BTL: rdmacm IP address not found on port"); rc = OMPI_ERR_NOT_SUPPORTED; goto out5; @@ -1112,7 +1112,7 @@ static int rdmacm_component_query(mca_btl_openib_module_t *openib_btl, ompi_btl_ /* FIXME - 1024 should be (num of connectors * mca_btl_openib_component.num_qps) */ rc = rdma_listen(server->id[0], 1024); if (0 != rc) { - opal_output_verbose(5, mca_btl_base_output, + orte_output_verbose(5, mca_btl_base_output, "openib BTL: rdmacm CPC unable to listen"); rc = OMPI_ERR_UNREACH; goto out5; @@ -1120,7 +1120,7 @@ static int rdmacm_component_query(mca_btl_openib_module_t *openib_btl, ompi_btl_ rc = create_message(server, openib_btl, &(*cpc)->data); if (0 != rc) { - opal_output_verbose(5, mca_btl_base_output, + orte_output_verbose(5, mca_btl_base_output, "openib BTL: rdmacm CPC unable to create message"); rc = OMPI_ERR_OUT_OF_RESOURCE; goto out5; @@ -1128,7 +1128,7 @@ static int rdmacm_component_query(mca_btl_openib_module_t *openib_btl, ompi_btl_ li = OBJ_NEW(list_item_t); if (NULL== li) { - opal_output_verbose(5, mca_btl_base_output, + orte_output_verbose(5, mca_btl_base_output, "openib BTL: rdmacm CPC unable to add to list"); rc = OMPI_ERR_OUT_OF_RESOURCE; goto out6; @@ -1136,7 +1136,7 @@ static int rdmacm_component_query(mca_btl_openib_module_t *openib_btl, ompi_btl_ li->item = server; opal_list_append(&server_list, &(li->super)); - opal_output_verbose(5, mca_btl_base_output, + orte_output_verbose(5, mca_btl_base_output, "openib BTL: rdmacm CPC available for use on %s", ibv_get_device_name(openib_btl->hca->ib_dev)); return OMPI_SUCCESS; @@ -1155,11 +1155,11 @@ out1: free(*cpc); out: if (OMPI_ERR_NOT_SUPPORTED == rc) { - opal_output_verbose(5, mca_btl_base_output, + orte_output_verbose(5, mca_btl_base_output, "openib BTL: rdmacm CPC unavailable for use on %s; skipped", ibv_get_device_name(openib_btl->hca->ib_dev)); } else { - opal_output_verbose(5, mca_btl_base_output, + orte_output_verbose(5, mca_btl_base_output, "openib BTL: rmacm CPC unavailable for use on %s; fatal error %d (%s)", ibv_get_device_name(openib_btl->hca->ib_dev), rc, opal_strerror(rc)); @@ -1216,14 +1216,14 @@ static int rdmacm_component_init(void) rc = build_rdma_addr_list(); if (-1 == rc) { - opal_output_verbose(5, mca_btl_base_output, + orte_output_verbose(5, mca_btl_base_output, "openib BTL: rdmacm CPC unable to find any valid IP address"); return OMPI_ERR_NOT_SUPPORTED; } event_channel = rdma_create_event_channel(); if (NULL == event_channel) { - opal_output_verbose(5, mca_btl_base_output, + orte_output_verbose(5, mca_btl_base_output, "openib BTL: rdmacm CPC failed to create channel"); return OMPI_ERR_UNREACH; } diff --git a/ompi/mca/btl/openib/connect/btl_openib_connect_xoob.c b/ompi/mca/btl/openib/connect/btl_openib_connect_xoob.c index 8e53af2dd8..b449a5c490 100644 --- a/ompi/mca/btl/openib/connect/btl_openib_connect_xoob.c +++ b/ompi/mca/btl/openib/connect/btl_openib_connect_xoob.c @@ -13,7 +13,7 @@ #include "opal/dss/dss.h" #include "opal/util/error.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "orte/util/name_fns.h" #include "orte/mca/rml/rml.h" #include "orte/mca/errmgr/errmgr.h" @@ -923,7 +923,7 @@ static int xoob_component_query(mca_btl_openib_module_t *openib_btl, int rc; if (mca_btl_openib_component.num_xrc_qps <= 0) { - opal_output_verbose(5, mca_btl_base_output, + orte_output_verbose(5, mca_btl_base_output, "openib BTL: xoob CPC only supported with XRC receive queues; skipped on device %s", ibv_get_device_name(openib_btl->hca->ib_dev)); return OMPI_ERR_NOT_SUPPORTED; @@ -931,7 +931,7 @@ static int xoob_component_query(mca_btl_openib_module_t *openib_btl, *cpc = malloc(sizeof(ompi_btl_openib_connect_base_module_t)); if (NULL == *cpc) { - opal_output_verbose(5, mca_btl_base_output, + orte_output_verbose(5, mca_btl_base_output, "openib BTL: xoob CPC system error (malloc failed)"); return OMPI_ERR_OUT_OF_RESOURCE; } @@ -946,7 +946,7 @@ static int xoob_component_query(mca_btl_openib_module_t *openib_btl, xoob_rml_recv_cb, NULL); if (ORTE_SUCCESS != rc) { - opal_output_verbose(5, mca_btl_base_output, + orte_output_verbose(5, mca_btl_base_output, "openib BTL: xoob CPC system error %d (%s)", rc, opal_strerror(rc)); return rc; @@ -964,7 +964,7 @@ static int xoob_component_query(mca_btl_openib_module_t *openib_btl, (*cpc)->cbm_endpoint_finalize = NULL; (*cpc)->cbm_finalize = NULL; - opal_output_verbose(5, mca_btl_base_output, + orte_output_verbose(5, mca_btl_base_output, "openib BTL: xoob CPC available for use on %s", ibv_get_device_name(openib_btl->hca->ib_dev)); return OMPI_SUCCESS; diff --git a/ompi/mca/btl/portals/btl_portals.c b/ompi/mca/btl/portals/btl_portals.c index 58e7626185..e125035859 100644 --- a/ompi/mca/btl/portals/btl_portals.c +++ b/ompi/mca/btl/portals/btl_portals.c @@ -26,7 +26,7 @@ #include #include "ompi/constants.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "ompi/mca/pml/pml.h" #include "ompi/mca/btl/btl.h" #include "ompi/datatype/convertor.h" @@ -91,7 +91,7 @@ mca_btl_portals_add_procs(struct mca_btl_base_module_t* btl_base, bool accel; assert(&mca_btl_portals_module == (mca_btl_portals_module_t*) btl_base); - opal_output_verbose(50, mca_btl_portals_component.portals_output, + orte_output_verbose(50, mca_btl_portals_component.portals_output, "Adding %d procs (%d)", (int) nprocs, (int) mca_btl_portals_module.portals_num_procs); @@ -130,7 +130,7 @@ mca_btl_portals_add_procs(struct mca_btl_base_module_t* btl_base, portals_procs[i], &distance); if (ret != PTL_OK) { - opal_output_verbose(10, mca_btl_portals_component.portals_output, + orte_output_verbose(10, mca_btl_portals_component.portals_output, "Could not find distance to process %d", (int) i); continue; } @@ -147,7 +147,7 @@ mca_btl_portals_add_procs(struct mca_btl_base_module_t* btl_base, /* create eqs */ int i; - opal_output_verbose(50, mca_btl_portals_component.portals_output, + orte_output_verbose(50, mca_btl_portals_component.portals_output, "Enabling progress"); for (i = 0 ; i < OMPI_BTL_PORTALS_EQ_SIZE ; ++i) { @@ -156,7 +156,7 @@ mca_btl_portals_add_procs(struct mca_btl_base_module_t* btl_base, PTL_EQ_HANDLER_NONE, &(mca_btl_portals_module.portals_eq_handles[i])); if (PTL_OK != ptl_ret) { - opal_output(mca_btl_portals_component.portals_output, + orte_output(mca_btl_portals_component.portals_output, "Error creating EQ %d: %d", i, ptl_ret); /* BWB - better error code? */ return OMPI_ERROR; @@ -192,7 +192,7 @@ mca_btl_portals_del_procs(struct mca_btl_base_module_t *btl_base, int ret = OMPI_SUCCESS; assert(&mca_btl_portals_module == (mca_btl_portals_module_t*) btl_base); - opal_output_verbose(50, mca_btl_portals_component.portals_output, + orte_output_verbose(50, mca_btl_portals_component.portals_output, "Removing %d procs (%d)", (int) nprocs, (int) mca_btl_portals_module.portals_num_procs); @@ -204,7 +204,7 @@ mca_btl_portals_del_procs(struct mca_btl_base_module_t *btl_base, if (0 == mca_btl_portals_module.portals_num_procs) { int i; - opal_output_verbose(50, mca_btl_portals_component.portals_output, + orte_output_verbose(50, mca_btl_portals_component.portals_output, "Disabling progress"); ret = mca_btl_portals_recv_disable(&mca_btl_portals_module); @@ -213,7 +213,7 @@ mca_btl_portals_del_procs(struct mca_btl_base_module_t *btl_base, for (i = 0 ; i < OMPI_BTL_PORTALS_EQ_SIZE ; ++i) { int ptl_ret = PtlEQFree(mca_btl_portals_module.portals_eq_handles[i]); if (PTL_OK != ptl_ret) { - opal_output(mca_btl_portals_component.portals_output, + orte_output(mca_btl_portals_component.portals_output, "Error freeing EQ %d: %d", i, ptl_ret); } } @@ -362,7 +362,7 @@ mca_btl_portals_prepare_src(struct mca_btl_base_module_t* btl_base, frag->base.des_src_cnt = 1; /* either a put or get. figure out which later */ - OPAL_OUTPUT_VERBOSE((90, mca_btl_portals_component.portals_output, + ORTE_OUTPUT_VERBOSE((90, mca_btl_portals_component.portals_output, "rdma src posted for frag 0x%lx, callback 0x%lx, bits %"PRIu64", flags say %d" , (unsigned long) frag, (unsigned long) frag->base.des_cbfunc, @@ -378,7 +378,7 @@ mca_btl_portals_prepare_src(struct mca_btl_base_module_t* btl_base, PTL_INS_AFTER, &me_h); if (PTL_OK != ret) { - opal_output(mca_btl_portals_component.portals_output, + orte_output(mca_btl_portals_component.portals_output, "Error creating rdma src ME: %d", ret); OMPI_BTL_PORTALS_FRAG_RETURN_USER(&mca_btl_portals_module.super, frag); OPAL_THREAD_ADD32(&mca_btl_portals_module.portals_outstanding_ops, -1); @@ -399,7 +399,7 @@ mca_btl_portals_prepare_src(struct mca_btl_base_module_t* btl_base, PTL_UNLINK, &(frag->md_h)); if (PTL_OK != ret) { - opal_output(mca_btl_portals_component.portals_output, + orte_output(mca_btl_portals_component.portals_output, "Error creating rdma src MD: %d", ret); PtlMEUnlink(me_h); OMPI_BTL_PORTALS_FRAG_RETURN_USER(&mca_btl_portals_module.super, frag); @@ -457,7 +457,7 @@ mca_btl_portals_prepare_dst(struct mca_btl_base_module_t* btl_base, frag->base.des_dst_cnt = 1; frag->base.des_flags = flags; - OPAL_OUTPUT_VERBOSE((90, mca_btl_portals_component.portals_output, + ORTE_OUTPUT_VERBOSE((90, mca_btl_portals_component.portals_output, "rdma dest posted for frag 0x%lx, callback 0x%lx, bits %" PRIu64 " flags %d", (unsigned long) frag, (unsigned long) frag->base.des_cbfunc, @@ -474,7 +474,7 @@ mca_btl_portals_prepare_dst(struct mca_btl_base_module_t* btl_base, PTL_INS_AFTER, &me_h); if (PTL_OK != ret) { - opal_output(mca_btl_portals_component.portals_output, + orte_output(mca_btl_portals_component.portals_output, "Error creating rdma dest ME: %d", ret); OPAL_THREAD_ADD32(&mca_btl_portals_module.portals_outstanding_ops, -1); OMPI_BTL_PORTALS_FRAG_RETURN_USER(&mca_btl_portals_module.super, frag); @@ -495,7 +495,7 @@ mca_btl_portals_prepare_dst(struct mca_btl_base_module_t* btl_base, PTL_UNLINK, &(frag->md_h)); if (PTL_OK != ret) { - opal_output(mca_btl_portals_component.portals_output, + orte_output(mca_btl_portals_component.portals_output, "Error creating rdma dest MD: %d", ret); PtlMEUnlink(me_h); OPAL_THREAD_ADD32(&mca_btl_portals_module.portals_outstanding_ops, -1); @@ -513,7 +513,7 @@ mca_btl_portals_finalize(struct mca_btl_base_module_t *btl_base) int ret; assert(&mca_btl_portals_module == (mca_btl_portals_module_t*) btl_base); - OPAL_OUTPUT_VERBOSE((90, mca_btl_portals_component.portals_output, + ORTE_OUTPUT_VERBOSE((90, mca_btl_portals_component.portals_output, "in mca_btl_portals_finalize")); /* sanity check */ @@ -521,7 +521,7 @@ mca_btl_portals_finalize(struct mca_btl_base_module_t *btl_base) /* finalize all communication */ while (mca_btl_portals_module.portals_outstanding_ops > 0) { - OPAL_OUTPUT_VERBOSE((90, mca_btl_portals_component.portals_output, + ORTE_OUTPUT_VERBOSE((90, mca_btl_portals_component.portals_output, "portals_outstanding_ops: %d", mca_btl_portals_module.portals_outstanding_ops)); @@ -543,7 +543,7 @@ mca_btl_portals_finalize(struct mca_btl_base_module_t *btl_base) /* The PML isn't great about cleaning up after itself. Ignore related errors. */ #endif - opal_output(mca_btl_portals_component.portals_output, + orte_output(mca_btl_portals_component.portals_output, "Error freeing EQ %d: %d", i, ptl_ret); #if (OMPI_PORTALS_CRAYXT3 || OMPI_PORTALS_CRAYXT3_MODEX) } @@ -562,7 +562,7 @@ mca_btl_portals_finalize(struct mca_btl_base_module_t *btl_base) ompi_common_portals_ni_finalize(); ompi_common_portals_finalize(); - opal_output_verbose(20, mca_btl_portals_component.portals_output, + orte_output_verbose(20, mca_btl_portals_component.portals_output, "successfully finalized module"); return OMPI_SUCCESS; diff --git a/ompi/mca/btl/portals/btl_portals_component.c b/ompi/mca/btl/portals/btl_portals_component.c index 4d6d73eec8..725b6b37c2 100644 --- a/ompi/mca/btl/portals/btl_portals_component.c +++ b/ompi/mca/btl/portals/btl_portals_component.c @@ -25,9 +25,12 @@ #include "ompi/constants.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "opal/threads/threads.h" #include "opal/mca/base/mca_base_param.h" + +#include "orte/util/output.h" + #include "ompi/mca/common/portals/common_portals.h" #include "btl_portals.h" @@ -67,7 +70,7 @@ mca_btl_portals_component_t mca_btl_portals_component = { }; -static opal_output_stream_t portals_output_stream; +static orte_output_stream_t portals_output_stream; int mca_btl_portals_component_open(void) @@ -81,7 +84,7 @@ mca_btl_portals_component_open(void) */ /* start up debugging output */ - OBJ_CONSTRUCT(&portals_output_stream, opal_output_stream_t); + OBJ_CONSTRUCT(&portals_output_stream, orte_output_stream_t); portals_output_stream.lds_is_debugging = true; portals_output_stream.lds_want_stdout = true; portals_output_stream.lds_file_suffix = "btl-portals"; @@ -95,7 +98,7 @@ mca_btl_portals_component_open(void) asprintf(&(portals_output_stream.lds_prefix), "btl: portals (%s): ", ompi_common_portals_nodeid()); mca_btl_portals_component.portals_output = - opal_output_open(&portals_output_stream); + orte_output_open(&portals_output_stream, "BTL", "PORTALS", "DEBUG", NULL); mca_base_param_reg_int(&mca_btl_portals_component.super.btl_version, "free_list_init_num", @@ -226,7 +229,7 @@ mca_btl_portals_component_close(void) } /* close debugging stream */ - opal_output_close(mca_btl_portals_component.portals_output); + orte_output_close(mca_btl_portals_component.portals_output); mca_btl_portals_component.portals_output = -1; return OMPI_SUCCESS; @@ -243,7 +246,7 @@ mca_btl_portals_component_init(int *num_btls, btls[0] = (mca_btl_base_module_t*) &mca_btl_portals_module; if (enable_progress_threads || enable_mpi_threads) { - opal_output_verbose(20, mca_btl_portals_component.portals_output, + orte_output_verbose(20, mca_btl_portals_component.portals_output, "disabled because threads enabled"); return NULL; } @@ -251,7 +254,7 @@ mca_btl_portals_component_init(int *num_btls, /* initialize portals btl. note that this is in the compat code because it's fairly non-portable between implementations */ if (OMPI_SUCCESS != ompi_common_portals_initialize(&mca_btl_portals_module.portals_ni_h, &accel)) { - opal_output_verbose(20, mca_btl_portals_component.portals_output, + orte_output_verbose(20, mca_btl_portals_component.portals_output, "disabled because compatibility init failed"); return NULL; } @@ -308,7 +311,7 @@ mca_btl_portals_component_init(int *num_btls, *num_btls = 1; - opal_output_verbose(20, mca_btl_portals_component.portals_output, + orte_output_verbose(20, mca_btl_portals_component.portals_output, "initialized Portals module"); return btls; @@ -344,7 +347,7 @@ mca_btl_portals_component_progress(void) switch (ev.type) { case PTL_EVENT_GET_START: /* generated on source (target) when a get from memory starts */ - OPAL_OUTPUT_VERBOSE((90, mca_btl_portals_component.portals_output, + ORTE_OUTPUT_VERBOSE((90, mca_btl_portals_component.portals_output, "PTL_EVENT_GET_START for 0x%lx, %d", (unsigned long) frag, (int) ev.hdr_data)); @@ -352,13 +355,13 @@ mca_btl_portals_component_progress(void) case PTL_EVENT_GET_END: /* generated on source (target) when a get from memory ends */ - OPAL_OUTPUT_VERBOSE((90, mca_btl_portals_component.portals_output, + ORTE_OUTPUT_VERBOSE((90, mca_btl_portals_component.portals_output, "PTL_EVENT_GET_END for 0x%lx, %d, flags %d", (unsigned long) frag, (int) ev.hdr_data, frag->base.des_flags)); if( btl_ownership ) { - OPAL_OUTPUT_VERBOSE((90, mca_btl_portals_component.portals_output, + ORTE_OUTPUT_VERBOSE((90, mca_btl_portals_component.portals_output, "in PTL_EVENT_GET_END received a frag with btl_ownership!")); mca_btl_portals_free(&mca_btl_portals_module.super, &frag->base); @@ -366,13 +369,13 @@ mca_btl_portals_component_progress(void) break; case PTL_EVENT_PUT_START: /* generated on destination (target) when a put into memory starts */ - OPAL_OUTPUT_VERBOSE((90, mca_btl_portals_component.portals_output, + ORTE_OUTPUT_VERBOSE((90, mca_btl_portals_component.portals_output, "PTL_EVENT_PUT_START for 0x%lx, %d", (unsigned long) frag, (int) ev.hdr_data)); #if OMPI_ENABLE_DEBUG if (ev.ni_fail_type != PTL_NI_OK) { - opal_output(mca_btl_portals_component.portals_output, + orte_output(mca_btl_portals_component.portals_output, "Failure to start event\n"); return OMPI_ERROR; } @@ -387,13 +390,13 @@ mca_btl_portals_component_progress(void) case PTL_EVENT_PUT_END: /* generated on destination (target) when a put into memory ends */ - OPAL_OUTPUT_VERBOSE((90, mca_btl_portals_component.portals_output, + ORTE_OUTPUT_VERBOSE((90, mca_btl_portals_component.portals_output, "PTL_EVENT_PUT_END for 0x%lx, %d", (unsigned long) frag, (int) ev.hdr_data)); #if OMPI_ENABLE_DEBUG if (ev.ni_fail_type != PTL_NI_OK) { - opal_output(mca_btl_portals_component.portals_output, + orte_output(mca_btl_portals_component.portals_output, "Failure to end event\n"); mca_btl_portals_return_block_part(&mca_btl_portals_module, block); @@ -411,7 +414,7 @@ mca_btl_portals_component_progress(void) frag->segments[0].seg_addr.pval = (((char*) ev.md.start) + ev.offset); frag->segments[0].seg_len = ev.mlength; - OPAL_OUTPUT_VERBOSE((90, mca_btl_portals_component.portals_output, + ORTE_OUTPUT_VERBOSE((90, mca_btl_portals_component.portals_output, "received send fragment 0x%lx (thresh: %d, length %d)", (unsigned long) frag, ev.md.threshold, (int) ev.mlength)); @@ -422,7 +425,7 @@ mca_btl_portals_component_progress(void) can't start it up again until everyone is done with it. The actual reactivation and all that will happen after the free completes the last operation... */ - OPAL_OUTPUT_VERBOSE((90, mca_btl_portals_component.portals_output, + ORTE_OUTPUT_VERBOSE((90, mca_btl_portals_component.portals_output, "marking block 0x%lx as full", (unsigned long) block->start)); block->full = true; @@ -441,7 +444,7 @@ mca_btl_portals_component_progress(void) /* generated on destination (origin) when a get starts returning data */ - OPAL_OUTPUT_VERBOSE((90, mca_btl_portals_component.portals_output, + ORTE_OUTPUT_VERBOSE((90, mca_btl_portals_component.portals_output, "PTL_EVENT_REPLY_START for 0x%lx, %d", (unsigned long) frag, (int) ev.hdr_data)); @@ -451,7 +454,7 @@ mca_btl_portals_component_progress(void) /* generated on destination (origin) when a get is done returning data */ - OPAL_OUTPUT_VERBOSE((90, mca_btl_portals_component.portals_output, + ORTE_OUTPUT_VERBOSE((90, mca_btl_portals_component.portals_output, "PTL_EVENT_REPLY_END for 0x%lx", (unsigned long) frag)); @@ -461,7 +464,7 @@ mca_btl_portals_component_progress(void) &frag->base, OMPI_SUCCESS); if( btl_ownership ) { - OPAL_OUTPUT_VERBOSE((90, mca_btl_portals_component.portals_output, + ORTE_OUTPUT_VERBOSE((90, mca_btl_portals_component.portals_output, "in PTL_EVENT_REPLY_END received a frag with btl_ownership!")); mca_btl_portals_free(&mca_btl_portals_module.super, &frag->base); @@ -473,12 +476,12 @@ mca_btl_portals_component_progress(void) /* generated on source (origin) when put starts sending */ #if OMPI_ENABLE_DEBUG - OPAL_OUTPUT_VERBOSE((90, mca_btl_portals_component.portals_output, + ORTE_OUTPUT_VERBOSE((90, mca_btl_portals_component.portals_output, "PTL_EVENT_SEND_START for 0x%lx, %d", (unsigned long) frag, (int) ev.hdr_data)); if (ev.ni_fail_type != PTL_NI_OK) { - opal_output(mca_btl_portals_component.portals_output, + orte_output(mca_btl_portals_component.portals_output, "Failure to start send event\n"); frag->base.des_cbfunc(&mca_btl_portals_module.super, frag->endpoint, @@ -495,12 +498,12 @@ mca_btl_portals_component_progress(void) case PTL_EVENT_SEND_END: /* generated on source (origin) when put stops sending */ #if OMPI_ENABLE_DEBUG - OPAL_OUTPUT_VERBOSE((90, mca_btl_portals_component.portals_output, + ORTE_OUTPUT_VERBOSE((90, mca_btl_portals_component.portals_output, "PTL_EVENT_SEND_END for 0x%lx, %d", (unsigned long) frag, (int) ev.hdr_data)); if (ev.ni_fail_type != PTL_NI_OK) { - opal_output(mca_btl_portals_component.portals_output, + orte_output(mca_btl_portals_component.portals_output, "Failure to end send event\n"); frag->base.des_cbfunc(&mca_btl_portals_module.super, frag->endpoint, @@ -537,18 +540,18 @@ mca_btl_portals_component_progress(void) just call the callback function on goodness. Requeue the put on badness */ - OPAL_OUTPUT_VERBOSE((90, mca_btl_portals_component.portals_output, + ORTE_OUTPUT_VERBOSE((90, mca_btl_portals_component.portals_output, "PTL_EVENT_ACK for 0x%lx", (unsigned long) frag)); #if OMPI_ENABLE_DEBUG if(!mca_btl_portals_component.portals_need_ack) { - opal_output(mca_btl_portals_component.portals_output, + orte_output(mca_btl_portals_component.portals_output, "Received PTL_EVENT_ACK but ACK's are disabled!\n"); abort(); } if (ev.ni_fail_type != PTL_NI_OK) { - opal_output(mca_btl_portals_component.portals_output, + orte_output(mca_btl_portals_component.portals_output, "Failure to ack event\n"); frag->base.des_cbfunc(&mca_btl_portals_module.super, frag->endpoint, @@ -566,7 +569,7 @@ mca_btl_portals_component_progress(void) This should only happen for unexpected messages, and only when the other side has no buffer space available for receiving */ - opal_output_verbose(50, + orte_output_verbose(50, mca_btl_portals_component.portals_output, "message was dropped. Trying again"); @@ -611,15 +614,15 @@ mca_btl_portals_component_progress(void) case PTL_EQ_DROPPED: /* not sure how we could deal with this more gracefully */ - opal_output(mca_btl_portals_component.portals_output, + orte_output(mca_btl_portals_component.portals_output, "WARNING: EQ events dropped. Too many messages pending."); - opal_output(mca_btl_portals_component.portals_output, + orte_output(mca_btl_portals_component.portals_output, "WARNING: Giving up in dispair"); abort(); break; default: - opal_output(mca_btl_portals_component.portals_output, + orte_output(mca_btl_portals_component.portals_output, "WARNING: Error in PtlEQPoll (%d). This shouldn't happen", ret); abort(); diff --git a/ompi/mca/btl/portals/btl_portals_rdma.c b/ompi/mca/btl/portals/btl_portals_rdma.c index f1a060e6e6..05106ad5ae 100644 --- a/ompi/mca/btl/portals/btl_portals_rdma.c +++ b/ompi/mca/btl/portals/btl_portals_rdma.c @@ -23,7 +23,7 @@ #include #include "ompi/constants.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "btl_portals.h" #include "btl_portals_frag.h" @@ -36,7 +36,7 @@ mca_btl_portals_put(struct mca_btl_base_module_t* btl_base, mca_btl_portals_frag_t *frag = (mca_btl_portals_frag_t*) descriptor; int ret; - OPAL_OUTPUT_VERBOSE((90, mca_btl_portals_component.portals_output, + ORTE_OUTPUT_VERBOSE((90, mca_btl_portals_component.portals_output, "PtlPut (rdma) fragment %lx, bits %" PRIx64, (unsigned long) frag, frag->base.des_dst[0].seg_key.key64)); @@ -59,7 +59,7 @@ mca_btl_portals_put(struct mca_btl_base_module_t* btl_base, 0, /* remote offset - not used */ MCA_BTL_TAG_MAX); /* hdr_data - invalid tag */ if (ret != PTL_OK) { - opal_output(mca_btl_portals_component.portals_output, + orte_output(mca_btl_portals_component.portals_output, "PtlPut failed with error %d", ret); return OMPI_ERROR; } @@ -76,7 +76,7 @@ mca_btl_portals_get(struct mca_btl_base_module_t* btl_base, mca_btl_portals_frag_t *frag = (mca_btl_portals_frag_t*) descriptor; int ret; - OPAL_OUTPUT_VERBOSE((90, mca_btl_portals_component.portals_output, + ORTE_OUTPUT_VERBOSE((90, mca_btl_portals_component.portals_output, "PtlGet (rdma) fragment %lx, bits %" PRIx64, (unsigned long) frag, frag->base.des_src[0].seg_key.key64)); @@ -94,7 +94,7 @@ mca_btl_portals_get(struct mca_btl_base_module_t* btl_base, frag->base.des_src[0].seg_key.key64, /* match bits */ 0); /* remote offset - not used */ if (ret != PTL_OK) { - opal_output(mca_btl_portals_component.portals_output, + orte_output(mca_btl_portals_component.portals_output, "PtlGet failed with error %d", ret); return OMPI_ERROR; } diff --git a/ompi/mca/btl/portals/btl_portals_recv.c b/ompi/mca/btl/portals/btl_portals_recv.c index 44e2cd1dba..5f2f6738b7 100644 --- a/ompi/mca/btl/portals/btl_portals_recv.c +++ b/ompi/mca/btl/portals/btl_portals_recv.c @@ -20,7 +20,7 @@ #include "ompi_config.h" #include "ompi/constants.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "btl_portals.h" #include "btl_portals_recv.h" @@ -49,7 +49,7 @@ mca_btl_portals_recv_enable(mca_btl_portals_module_t *btl) md.user_ptr = NULL; md.eq_handle = PTL_EQ_NONE; - opal_output_verbose(90, mca_btl_portals_component.portals_output, + orte_output_verbose(90, mca_btl_portals_component.portals_output, "About to create reject entry"); ret = PtlMEAttach(btl->portals_ni_h, OMPI_BTL_PORTALS_SEND_TABLE_ID, @@ -60,7 +60,7 @@ mca_btl_portals_recv_enable(mca_btl_portals_module_t *btl) PTL_INS_BEFORE, &(btl->portals_recv_reject_me_h)); if (PTL_OK != ret) { - opal_output(mca_btl_portals_component.portals_output, + orte_output(mca_btl_portals_component.portals_output, "Error creating recv reject ME: %d", ret); return OMPI_ERROR; } @@ -70,7 +70,7 @@ mca_btl_portals_recv_enable(mca_btl_portals_module_t *btl) PTL_RETAIN, &md_h); if (PTL_OK != ret) { - opal_output(mca_btl_portals_component.portals_output, + orte_output(mca_btl_portals_component.portals_output, "Error attaching recv reject MD: %d", ret); mca_btl_portals_recv_disable(btl); return OMPI_ERROR; diff --git a/ompi/mca/btl/portals/btl_portals_send.c b/ompi/mca/btl/portals/btl_portals_send.c index 87afd487f1..79a454305f 100644 --- a/ompi/mca/btl/portals/btl_portals_send.c +++ b/ompi/mca/btl/portals/btl_portals_send.c @@ -23,7 +23,7 @@ #include #include "ompi/constants.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "btl_portals.h" #include "btl_portals_send.h" @@ -43,14 +43,14 @@ mca_btl_portals_send(struct mca_btl_base_module_t* btl_base, frag->endpoint = endpoint; frag->hdr.tag = tag; - OPAL_OUTPUT_VERBOSE((90, mca_btl_portals_component.portals_output, + ORTE_OUTPUT_VERBOSE((90, mca_btl_portals_component.portals_output, "PtlPut (send) fragment %lx", (unsigned long) frag)); if (OPAL_THREAD_ADD32(&mca_btl_portals_module.portals_outstanding_ops, 1) > mca_btl_portals_module.portals_max_outstanding_ops) { /* no space - queue and continute */ - opal_output_verbose(50, mca_btl_portals_component.portals_output, + orte_output_verbose(50, mca_btl_portals_component.portals_output, "no space for message 0x%lx. Adding to back of queue", (unsigned long) frag); OPAL_THREAD_ADD32(&mca_btl_portals_module.portals_outstanding_ops, -1); @@ -81,13 +81,13 @@ mca_btl_portals_send(struct mca_btl_base_module_t* btl_base, PTL_UNLINK, &frag->md_h); if (ret != PTL_OK) { - opal_output(mca_btl_portals_component.portals_output, + orte_output(mca_btl_portals_component.portals_output, "PtlMDBind failed with error %d", ret); return OMPI_ERROR; } } - OPAL_OUTPUT_VERBOSE((90, mca_btl_portals_component.portals_output, + ORTE_OUTPUT_VERBOSE((90, mca_btl_portals_component.portals_output, "fragment info:\n" "\tstart: 0x%lx\n" "\tlen: %d", @@ -105,7 +105,7 @@ mca_btl_portals_send(struct mca_btl_base_module_t* btl_base, 0, /* remote offset - not used */ frag->hdr.tag); /* hdr_data: tag */ if (ret != PTL_OK) { - opal_output(mca_btl_portals_component.portals_output, + orte_output(mca_btl_portals_component.portals_output, "send: PtlPut failed with error %d", ret); return OMPI_ERROR; } diff --git a/ompi/mca/btl/portals/btl_portals_send.h b/ompi/mca/btl/portals/btl_portals_send.h index 136db256ad..6be7818fe3 100644 --- a/ompi/mca/btl/portals/btl_portals_send.h +++ b/ompi/mca/btl/portals/btl_portals_send.h @@ -28,7 +28,7 @@ mca_btl_portals_module.portals_max_outstanding_ops)) { \ mca_btl_portals_frag_t *qfrag = (mca_btl_portals_frag_t*) \ opal_list_remove_first(&(mca_btl_portals_module.portals_queued_sends)); \ - OPAL_OUTPUT_VERBOSE((90, mca_btl_portals_component.portals_output, \ + ORTE_OUTPUT_VERBOSE((90, mca_btl_portals_component.portals_output, \ "retransmit for frag 0x%lx, 0x%lx", \ (unsigned long) qfrag, \ (unsigned long) qfrag->base.des_cbfunc)); \ diff --git a/ompi/mca/btl/sctp/btl_sctp.c b/ompi/mca/btl/sctp/btl_sctp.c index 7f1dcba3b0..ba10e7a928 100644 --- a/ompi/mca/btl/sctp/btl_sctp.c +++ b/ompi/mca/btl/sctp/btl_sctp.c @@ -18,7 +18,7 @@ #include "ompi_config.h" #include -#include "opal/util/output.h" +#include "orte/util/output.h" #include "opal/util/if.h" #include "ompi/mca/pml/pml.h" #include "ompi/mca/btl/btl.h" diff --git a/ompi/mca/btl/sctp/btl_sctp.h b/ompi/mca/btl/sctp/btl_sctp.h index 2e7cf7fa38..80239eebe6 100644 --- a/ompi/mca/btl/sctp/btl_sctp.h +++ b/ompi/mca/btl/sctp/btl_sctp.h @@ -35,7 +35,7 @@ /* Open MPI includes */ #include "opal/event/event.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "ompi/class/ompi_bitmap.h" #include "ompi/class/ompi_free_list.h" #include "ompi/mca/pml/pml.h" diff --git a/ompi/mca/btl/sctp/btl_sctp_component.c b/ompi/mca/btl/sctp/btl_sctp_component.c index e30f1e5e6e..9af2d5d3fc 100644 --- a/ompi/mca/btl/sctp/btl_sctp_component.c +++ b/ompi/mca/btl/sctp/btl_sctp_component.c @@ -46,7 +46,7 @@ #include "opal/event/event.h" #include "opal/util/if.h" #include "opal/util/argv.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "orte/mca/oob/base/base.h" #include "ompi/mca/pml/pml.h" #include "ompi/mca/btl/btl.h" diff --git a/ompi/mca/btl/sctp/btl_sctp_frag.c b/ompi/mca/btl/sctp/btl_sctp_frag.c index 46e17d65f4..a38a35a85d 100644 --- a/ompi/mca/btl/sctp/btl_sctp_frag.c +++ b/ompi/mca/btl/sctp/btl_sctp_frag.c @@ -398,11 +398,11 @@ repeat11: case EWOULDBLOCK: return false; case EFAULT: - opal_output( 0, "mca_btl_sctp_frag_recv: readv error (%p, %d)\n\t%s(%d)\n", + orte_output( 0, "mca_btl_sctp_frag_recv: readv error (%p, %d)\n\t%s(%d)\n", frag->iov_ptr[0].iov_base, (int) frag->iov_ptr[0].iov_len, strerror(opal_socket_errno), (int) frag->iov_cnt ); default: - opal_output(0, "mca_btl_sctp_frag_recv: readv failed with errno=%d", + orte_output(0, "mca_btl_sctp_frag_recv: readv failed with errno=%d", opal_socket_errno); mca_btl_sctp_endpoint_close(btl_endpoint); return false; @@ -542,11 +542,11 @@ repeat: case EWOULDBLOCK: return false; case EFAULT: - opal_output( 0, "mca_btl_sctp_frag_recv: error (%p, %d)\n\t%s(%d)\n", + orte_output( 0, "mca_btl_sctp_frag_recv: error (%p, %d)\n\t%s(%d)\n", frag->iov_ptr[0].iov_base, (int) frag->iov_ptr[0].iov_len, strerror(opal_socket_errno), (int) frag->iov_cnt ); default: - opal_output(0, "mca_btl_sctp_frag_recv: failed with errno=%d", + orte_output(0, "mca_btl_sctp_frag_recv: failed with errno=%d", opal_socket_errno); mca_btl_sctp_endpoint_close(btl_endpoint); return false; diff --git a/ompi/mca/btl/sctp/btl_sctp_recv_handler.c b/ompi/mca/btl/sctp/btl_sctp_recv_handler.c index 5007e00c1a..db1a7ec53d 100644 --- a/ompi/mca/btl/sctp/btl_sctp_recv_handler.c +++ b/ompi/mca/btl/sctp/btl_sctp_recv_handler.c @@ -41,7 +41,7 @@ #include "opal/event/event.h" #include "opal/util/if.h" #include "opal/util/argv.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "orte/mca/oob/base/base.h" #include "ompi/mca/pml/pml.h" #include "ompi/mca/btl/btl.h" diff --git a/ompi/mca/btl/self/btl_self.c b/ompi/mca/btl/self/btl_self.c index de9f889974..33af21db4d 100644 --- a/ompi/mca/btl/self/btl_self.c +++ b/ompi/mca/btl/self/btl_self.c @@ -29,7 +29,7 @@ #include "ompi/datatype/convertor.h" #include "ompi/datatype/datatype.h" #include "opal/sys/atomic.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "opal/util/if.h" #include "orte/util/proc_info.h" #include "opal/util/printf.h" diff --git a/ompi/mca/btl/self/btl_self_component.c b/ompi/mca/btl/self/btl_self_component.c index 64ce92c44c..96d34cba3a 100644 --- a/ompi/mca/btl/self/btl_self_component.c +++ b/ompi/mca/btl/self/btl_self_component.c @@ -31,7 +31,7 @@ #include "opal/event/event.h" #include "opal/util/if.h" #include "opal/util/argv.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "orte/util/proc_info.h" #include "ompi/mca/pml/pml.h" #include "opal/mca/base/mca_base_param.h" diff --git a/ompi/mca/btl/sm/btl_sm.c b/ompi/mca/btl/sm/btl_sm.c index f633db0f7f..d158595881 100644 --- a/ompi/mca/btl/sm/btl_sm.c +++ b/ompi/mca/btl/sm/btl_sm.c @@ -29,7 +29,7 @@ #include "opal/threads/mutex.h" #include "ompi/datatype/convertor.h" #include "opal/sys/atomic.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "opal/util/if.h" #include "orte/util/proc_info.h" #include "opal/util/printf.h" @@ -177,7 +177,7 @@ static int sm_btl_first_time_init(mca_btl_sm_t *sm_btl, int n) mca_common_sm_mmap_init(size, sm_ctl_file, sizeof(mca_common_sm_file_header_t), CACHE_LINE_SIZE))) { - opal_output(0, "mca_btl_sm_add_procs: unable to create shared memory " + orte_output(0, "mca_btl_sm_add_procs: unable to create shared memory " "BTL coordinating strucure :: size %lu \n", (unsigned long)size); free(sm_ctl_file); @@ -311,7 +311,7 @@ create_sm_endpoint(int local_proc, struct ompi_proc_t *proc) (unsigned long)proc->proc_name.vpid); ep->fifo_fd = open(path, O_WRONLY); if(ep->fifo_fd < 0) { - opal_output(0, "mca_btl_sm_add_procs: open(%s) failed with errno=%d\n", + orte_output(0, "mca_btl_sm_add_procs: open(%s) failed with errno=%d\n", path, errno); free(ep); return NULL; diff --git a/ompi/mca/btl/sm/btl_sm.h b/ompi/mca/btl/sm/btl_sm.h index 1066dddf69..a338ff6671 100644 --- a/ompi/mca/btl/sm/btl_sm.h +++ b/ompi/mca/btl/sm/btl_sm.h @@ -299,7 +299,7 @@ void mca_btl_sm_component_event_thread(opal_object_t*); { \ unsigned char cmd = DATA; \ if(write(peer->fifo_fd, &cmd, sizeof(cmd)) != sizeof(cmd)) { \ - opal_output(0, "mca_btl_sm_send: write fifo failed: errno=%d\n", errno); \ + orte_output(0, "mca_btl_sm_send: write fifo failed: errno=%d\n", errno); \ } \ } #else diff --git a/ompi/mca/btl/sm/btl_sm_component.c b/ompi/mca/btl/sm/btl_sm_component.c index a8bf02c99a..73f8f18df8 100644 --- a/ompi/mca/btl/sm/btl_sm_component.c +++ b/ompi/mca/btl/sm/btl_sm_component.c @@ -42,7 +42,7 @@ #include "opal/event/event.h" #include "opal/util/if.h" #include "opal/util/argv.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "orte/util/proc_info.h" #include "orte/runtime/orte_globals.h" @@ -207,7 +207,7 @@ int mca_btl_sm_component_close(void) return_value = mca_common_sm_mmap_fini( mca_btl_sm_component.mmap_file ); if( OMPI_SUCCESS != return_value ) { return_value=OMPI_ERROR; - opal_output(0," munmap failed :: file - %s :: errno - %d \n", + orte_output(0," munmap failed :: file - %s :: errno - %d \n", mca_btl_sm_component.mmap_file->map_addr, errno); goto CLEANUP; @@ -228,7 +228,7 @@ int mca_btl_sm_component_close(void) unsigned char cmd = DONE; if( write(mca_btl_sm_component.sm_fifo_fd,&cmd,sizeof(cmd)) != sizeof(cmd)){ - opal_output(0, "mca_btl_sm_component_close: write fifo failed: errno=%d\n", + orte_output(0, "mca_btl_sm_component_close: write fifo failed: errno=%d\n", errno); } opal_thread_join(&mca_btl_sm_component.sm_fifo_thread, NULL); @@ -266,12 +266,12 @@ mca_btl_base_module_t** mca_btl_sm_component_init( "%s"OPAL_PATH_SEP"sm_fifo.%lu", orte_process_info.job_session_dir, (unsigned long)ORTE_PROC_MY_NAME->vpid ); if(mkfifo(mca_btl_sm_component.sm_fifo_path, 0660) < 0) { - opal_output(0, "mca_btl_sm_component_init: mkfifo failed with errno=%d\n",errno); + orte_output(0, "mca_btl_sm_component_init: mkfifo failed with errno=%d\n",errno); return NULL; } mca_btl_sm_component.sm_fifo_fd = open(mca_btl_sm_component.sm_fifo_path, O_RDWR); if(mca_btl_sm_component.sm_fifo_fd < 0) { - opal_output(0, "mca_btl_sm_component_init: open(%s) failed with errno=%d\n", + orte_output(0, "mca_btl_sm_component_init: open(%s) failed with errno=%d\n", mca_btl_sm_component.sm_fifo_path, errno); return NULL; } diff --git a/ompi/mca/btl/tcp/btl_tcp.c b/ompi/mca/btl/tcp/btl_tcp.c index 343e7398c3..bbb73db9c8 100644 --- a/ompi/mca/btl/tcp/btl_tcp.c +++ b/ompi/mca/btl/tcp/btl_tcp.c @@ -21,7 +21,7 @@ #include "ompi_config.h" #include -#include "opal/util/output.h" +#include "orte/util/output.h" #include "opal/util/if.h" #include "ompi/mca/pml/pml.h" #include "ompi/mca/btl/btl.h" diff --git a/ompi/mca/btl/tcp/btl_tcp.h b/ompi/mca/btl/tcp/btl_tcp.h index 93f88312df..c6fe3b4d51 100644 --- a/ompi/mca/btl/tcp/btl_tcp.h +++ b/ompi/mca/btl/tcp/btl_tcp.h @@ -36,7 +36,7 @@ /* Open MPI includes */ #include "opal/event/event.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "ompi/class/ompi_bitmap.h" #include "ompi/class/ompi_free_list.h" #include "ompi/mca/pml/pml.h" diff --git a/ompi/mca/btl/tcp/btl_tcp_component.c b/ompi/mca/btl/tcp/btl_tcp_component.c index d477be7014..b5a07b8903 100644 --- a/ompi/mca/btl/tcp/btl_tcp_component.c +++ b/ompi/mca/btl/tcp/btl_tcp_component.c @@ -48,7 +48,7 @@ #include "opal/event/event.h" #include "opal/util/if.h" #include "opal/util/argv.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "orte/mca/oob/base/base.h" #include "orte/types.h" #include "ompi/mca/pml/pml.h" @@ -532,7 +532,7 @@ static int mca_btl_tcp_component_create_listen(uint16_t af_family) hints.ai_flags = AI_PASSIVE; if ((error = getaddrinfo(NULL, "0", &hints, &res))) { - opal_output (0, + orte_output (0, "mca_btl_tcp_create_listen: unable to resolve. %s\n", gai_strerror (error)); CLOSE_THE_SOCKET(sd); @@ -549,7 +549,7 @@ static int mca_btl_tcp_component_create_listen(uint16_t af_family) int flg = 0; if (setsockopt (sd, IPPROTO_IPV6, IPV6_V6ONLY, &flg, sizeof (flg)) < 0) { - opal_output(0, + orte_output(0, "mca_btl_tcp_create_listen: unable to disable v4-mapped addresses\n"); } } @@ -724,7 +724,7 @@ static int mca_btl_tcp_component_exchange(void) if (OPAL_SUCCESS != opal_ifindextoaddr(index, (struct sockaddr*) &my_ss, sizeof (my_ss))) { - opal_output (0, + orte_output (0, "btl_tcp_component: problems getting address for index %i (kernel index %i)\n", index, opal_ifindextokindex (index)); continue; @@ -829,7 +829,7 @@ mca_btl_base_module_t** mca_btl_tcp_component_init(int *num_btl_modules, #if OPAL_WANT_IPV6 if((ret = mca_btl_tcp_component_create_listen(AF_INET6)) != OMPI_SUCCESS) { if (!(OMPI_ERR_IN_ERRNO == ret && EAFNOSUPPORT == opal_socket_errno)) { - opal_output (0, "mca_btl_tcp_component: IPv6 listening socket failed\n"); + orte_output (0, "mca_btl_tcp_component: IPv6 listening socket failed\n"); return 0; } } diff --git a/ompi/mca/btl/tcp/btl_tcp_ft.h b/ompi/mca/btl/tcp/btl_tcp_ft.h index bbff06d31f..1a4c7d48fe 100644 --- a/ompi/mca/btl/tcp/btl_tcp_ft.h +++ b/ompi/mca/btl/tcp/btl_tcp_ft.h @@ -24,7 +24,7 @@ #ifdef HAVE_SYS_TYPES_H #include #endif -#include "opal/util/output.h" +#include "orte/util/output.h" #if defined(c_plusplus) || defined(__cplusplus) extern "C" { diff --git a/ompi/mca/btl/tcp/btl_tcp_proc.c b/ompi/mca/btl/tcp/btl_tcp_proc.c index 84aa9aa005..230fc27f45 100644 --- a/ompi/mca/btl/tcp/btl_tcp_proc.c +++ b/ompi/mca/btl/tcp/btl_tcp_proc.c @@ -326,7 +326,7 @@ int mca_btl_tcp_proc_insert( mca_btl_tcp_proc_t* btl_proc, sizeof(int)); break; default: - opal_output(0, "unknown address family for tcp: %d\n", + orte_output(0, "unknown address family for tcp: %d\n", local_addr.ss_family); } } @@ -376,7 +376,7 @@ int mca_btl_tcp_proc_insert( mca_btl_tcp_proc_t* btl_proc, &endpoint_addr_ss, sizeof(endpoint_addr_ss)); break; default: - opal_output(0, "unknown address family for tcp: %d\n", + orte_output(0, "unknown address family for tcp: %d\n", local_addr.ss_family); /* * return OMPI_UNREACH or some error, as this is not @@ -647,7 +647,7 @@ bool mca_btl_tcp_proc_tosocks(mca_btl_tcp_addr_t* proc_addr, break; #endif default: - opal_output( 0, "mca_btl_tcp_proc: unknown af_family received: %d\n", + orte_output( 0, "mca_btl_tcp_proc: unknown af_family received: %d\n", proc_addr->addr_family ); return false; } diff --git a/ompi/mca/btl/template/btl_template.c b/ompi/mca/btl/template/btl_template.c index c0520e38fa..f35737d635 100644 --- a/ompi/mca/btl/template/btl_template.c +++ b/ompi/mca/btl/template/btl_template.c @@ -18,7 +18,7 @@ #include "ompi_config.h" #include -#include "opal/util/output.h" +#include "orte/util/output.h" #include "opal/util/if.h" #include "ompi/mca/pml/pml.h" #include "ompi/mca/btl/btl.h" diff --git a/ompi/mca/btl/template/btl_template.h b/ompi/mca/btl/template/btl_template.h index 0602837ced..541e97727d 100644 --- a/ompi/mca/btl/template/btl_template.h +++ b/ompi/mca/btl/template/btl_template.h @@ -33,7 +33,7 @@ #include "ompi/mca/pml/pml.h" #include "ompi/mca/btl/btl.h" #include "ompi/mca/btl/base/base.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "ompi/mca/mpool/mpool.h" #include "ompi/mca/btl/btl.h" diff --git a/ompi/mca/btl/template/btl_template_component.c b/ompi/mca/btl/template/btl_template_component.c index d37ff92ce0..69c32ea3e2 100644 --- a/ompi/mca/btl/template/btl_template_component.c +++ b/ompi/mca/btl/template/btl_template_component.c @@ -22,7 +22,7 @@ #include "opal/event/event.h" #include "opal/util/if.h" #include "opal/util/argv.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "ompi/mca/pml/pml.h" #include "ompi/mca/btl/btl.h" diff --git a/ompi/mca/btl/udapl/btl_udapl.c b/ompi/mca/btl/udapl/btl_udapl.c index db4cbdea82..58e2ee4af6 100644 --- a/ompi/mca/btl/udapl/btl_udapl.c +++ b/ompi/mca/btl/udapl/btl_udapl.c @@ -24,9 +24,9 @@ #include "ompi_config.h" #include #include -#include "opal/util/output.h" +#include "orte/util/output.h" #include "opal/util/if.h" -#include "opal/util/show_help.h" +#include "orte/util/show_help.h" #include "ompi/mca/pml/pml.h" #include "ompi/mca/btl/btl.h" diff --git a/ompi/mca/btl/udapl/btl_udapl.h b/ompi/mca/btl/udapl/btl_udapl.h index 2dee1a8d2c..e17e2c4c63 100644 --- a/ompi/mca/btl/udapl/btl_udapl.h +++ b/ompi/mca/btl/udapl/btl_udapl.h @@ -38,7 +38,7 @@ #include "ompi/mca/pml/pml.h" #include "ompi/mca/btl/btl.h" #include "ompi/mca/btl/base/base.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "ompi/mca/mpool/mpool.h" #include "ompi/mca/btl/btl.h" #include "btl_udapl_endpoint.h" @@ -236,7 +236,7 @@ do { \ #define BTL_UDAPL_VERBOSE_HELP(verbose_level, args) \ do { \ if (verbose_level <= mca_btl_udapl_component.udapl_verbosity) { \ - opal_show_help args; \ + orte_show_help args; \ } \ } while(0); diff --git a/ompi/mca/btl/udapl/btl_udapl_component.c b/ompi/mca/btl/udapl/btl_udapl_component.c index f8c379cb61..973327c6df 100644 --- a/ompi/mca/btl/udapl/btl_udapl_component.c +++ b/ompi/mca/btl/udapl/btl_udapl_component.c @@ -28,8 +28,8 @@ #include "opal/event/event.h" #include "opal/util/if.h" #include "opal/util/argv.h" -#include "opal/util/output.h" -#include "opal/util/show_help.h" +#include "orte/util/output.h" +#include "orte/util/show_help.h" #include "ompi/mca/pml/pml.h" #include "ompi/mca/btl/btl.h" #include "ompi/runtime/params.h" @@ -183,7 +183,7 @@ mca_btl_udapl_error(DAT_RETURN ret, char* str) exit(-1); } - OPAL_OUTPUT((0, "ERROR: %s %s %s\n", str, major, minor)); + ORTE_OUTPUT((0, "ERROR: %s %s %s\n", str, major, minor)); } #endif diff --git a/ompi/mca/btl/udapl/btl_udapl_endpoint.c b/ompi/mca/btl/udapl/btl_udapl_endpoint.c index 5ce0f6c104..70ea573e52 100644 --- a/ompi/mca/btl/udapl/btl_udapl_endpoint.c +++ b/ompi/mca/btl/udapl/btl_udapl_endpoint.c @@ -27,7 +27,7 @@ #include #include "ompi/types.h" #include "opal/include/opal/align.h" -#include "opal/util/show_help.h" +#include "orte/util/show_help.h" #include "orte/mca/oob/base/base.h" #include "orte/mca/rml/rml.h" diff --git a/ompi/mca/btl/udapl/btl_udapl_mca.c b/ompi/mca/btl/udapl/btl_udapl_mca.c index 61fb526ad2..356e4ae36c 100644 --- a/ompi/mca/btl/udapl/btl_udapl_mca.c +++ b/ompi/mca/btl/udapl/btl_udapl_mca.c @@ -19,7 +19,7 @@ */ #include "ompi_config.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "opal/mca/base/mca_base_param.h" #include "btl_udapl.h" #include "btl_udapl_mca.h" diff --git a/ompi/mca/btl/udapl/btl_udapl_proc.c b/ompi/mca/btl/udapl/btl_udapl_proc.c index b94789bd62..25426fb81b 100644 --- a/ompi/mca/btl/udapl/btl_udapl_proc.c +++ b/ompi/mca/btl/udapl/btl_udapl_proc.c @@ -22,7 +22,7 @@ #include "ompi_config.h" #include "opal/class/opal_hash_table.h" -#include "opal/util/show_help.h" +#include "orte/util/show_help.h" #include "ompi/runtime/ompi_module_exchange.h" #include "opal/util/net.h" #include "btl_udapl.h" diff --git a/ompi/mca/coll/base/base.h b/ompi/mca/coll/base/base.h index e469e053d1..ea672e6bcb 100644 --- a/ompi/mca/coll/base/base.h +++ b/ompi/mca/coll/base/base.h @@ -173,8 +173,8 @@ OMPI_DECLSPEC int mca_coll_base_close(void); */ OMPI_DECLSPEC extern int mca_coll_base_param; /** - * Coll framework debugging stream ID used with opal_output() and - * opal_output_verbose(). + * Coll framework debugging stream ID used with orte_output() and + * orte_output_verbose(). */ OMPI_DECLSPEC extern int mca_coll_base_output; diff --git a/ompi/mca/coll/base/coll_base_comm_select.c b/ompi/mca/coll/base/coll_base_comm_select.c index 979ee1feb4..181b7b684a 100644 --- a/ompi/mca/coll/base/coll_base_comm_select.c +++ b/ompi/mca/coll/base/coll_base_comm_select.c @@ -27,7 +27,7 @@ #include "mpi.h" #include "ompi/communicator/communicator.h" #include "opal/util/argv.h" -#include "opal/util/show_help.h" +#include "orte/util/output.h" #include "opal/class/opal_list.h" #include "opal/class/opal_object.h" #include "opal/mca/mca.h" @@ -108,7 +108,7 @@ int mca_coll_base_comm_select(ompi_communicator_t *comm) snprintf(name, sizeof(name), "%s (cid %d)", comm->c_name, comm->c_contextid); name[sizeof(name) - 1] = '\0'; - opal_output_verbose(10, mca_coll_base_output, + orte_output_verbose(10, mca_coll_base_output, "coll:base:comm_select: new communicator: %s", name); @@ -126,7 +126,7 @@ int mca_coll_base_comm_select(ompi_communicator_t *comm) name_array = opal_argv_split(names, ','); num_names = opal_argv_count(name_array); - opal_output_verbose(10, mca_coll_base_output, + orte_output_verbose(10, mca_coll_base_output, "coll:base:comm_select: Checking specific modules: %s", names); selectable = check_components(&mca_coll_base_components_available, @@ -134,7 +134,7 @@ int mca_coll_base_comm_select(ompi_communicator_t *comm) opal_argv_free(name_array); } else { /* no specific components given -- try all */ - opal_output_verbose(10, mca_coll_base_output, + orte_output_verbose(10, mca_coll_base_output, "coll:base:comm_select: Checking all available modules"); selectable = check_components(&mca_coll_base_components_available, comm, NULL, 0); @@ -145,7 +145,7 @@ int mca_coll_base_comm_select(ompi_communicator_t *comm) collective modules available, then use the basic component */ if (NULL == selectable) { /* There's no modules available */ - opal_show_help("help-mca-coll-base", + orte_show_help("help-mca-coll-base", "comm-select:none-available", true); return OMPI_ERROR; } @@ -321,13 +321,13 @@ static int check_one_component(ompi_communicator_t *comm, if (OMPI_SUCCESS == err) { priority = (priority < 100) ? priority : 100; - opal_output_verbose(10, mca_coll_base_output, + orte_output_verbose(10, mca_coll_base_output, "coll:base:comm_select: component available: %s, priority: %d", component->mca_component_name, priority); } else { priority = -1; - opal_output_verbose(10, mca_coll_base_output, + orte_output_verbose(10, mca_coll_base_output, "coll:base:comm_select: component not available: %s", component->mca_component_name); } diff --git a/ompi/mca/coll/base/coll_base_comm_unselect.c b/ompi/mca/coll/base/coll_base_comm_unselect.c index e67eece8f0..c405a66834 100644 --- a/ompi/mca/coll/base/coll_base_comm_unselect.c +++ b/ompi/mca/coll/base/coll_base_comm_unselect.c @@ -24,7 +24,7 @@ #include "mpi.h" #include "ompi/communicator/communicator.h" -#include "opal/util/show_help.h" +#include "orte/util/output.h" #include "opal/mca/mca.h" #include "opal/mca/base/base.h" #include "ompi/mca/coll/coll.h" diff --git a/ompi/mca/coll/base/coll_base_find_available.c b/ompi/mca/coll/base/coll_base_find_available.c index 7362ba8e27..70895b90d5 100644 --- a/ompi/mca/coll/base/coll_base_find_available.c +++ b/ompi/mca/coll/base/coll_base_find_available.c @@ -25,8 +25,7 @@ #include "mpi.h" #include "ompi/constants.h" #include "opal/class/opal_list.h" -#include "opal/util/output.h" -#include "opal/util/show_help.h" +#include "orte/util/output.h" #include "opal/mca/mca.h" #include "opal/mca/base/base.h" #include "opal/mca/base/mca_base_component_repository.h" @@ -127,9 +126,9 @@ int mca_coll_base_find_available(bool enable_progress_threads, /* Need to free all items in the list */ OBJ_DESTRUCT(&mca_coll_base_components_available); mca_coll_base_components_available_valid = false; - opal_output_verbose(10, mca_coll_base_output, + orte_output_verbose(10, mca_coll_base_output, "coll:find_available: no coll components available!"); - opal_show_help("help-mca-base", "find-available:none-found", true, + orte_show_help("help-mca-base", "find-available:none-found", true, "coll"); return OMPI_ERROR; } @@ -151,7 +150,7 @@ static int init_query(const mca_base_component_t *m, { int ret; - opal_output_verbose(10, mca_coll_base_output, + orte_output_verbose(10, mca_coll_base_output, "coll:find_available: querying coll component %s", m->mca_component_name); @@ -166,7 +165,7 @@ static int init_query(const mca_base_component_t *m, } else { /* Unrecognized coll API version */ - opal_output_verbose(10, mca_coll_base_output, + orte_output_verbose(10, mca_coll_base_output, "coll:find_available: unrecognized coll API version (%d.%d.%d, ignored)", m->mca_type_major_version, m->mca_type_minor_version, @@ -177,14 +176,14 @@ static int init_query(const mca_base_component_t *m, /* Query done -- look at the return value to see what happened */ if (OMPI_SUCCESS != ret) { - opal_output_verbose(10, mca_coll_base_output, + orte_output_verbose(10, mca_coll_base_output, "coll:find_available: coll component %s is not available", m->mca_component_name); if (NULL != m->mca_close_component) { m->mca_close_component(); } } else { - opal_output_verbose(10, mca_coll_base_output, + orte_output_verbose(10, mca_coll_base_output, "coll:find_available: coll component %s is available", m->mca_component_name); } diff --git a/ompi/mca/coll/base/coll_base_open.c b/ompi/mca/coll/base/coll_base_open.c index 1f5987a3a6..69d9077914 100644 --- a/ompi/mca/coll/base/coll_base_open.c +++ b/ompi/mca/coll/base/coll_base_open.c @@ -21,10 +21,13 @@ #include #include "ompi/constants.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "opal/mca/mca.h" #include "opal/mca/base/base.h" #include "opal/mca/base/mca_base_param.h" + +#include "orte/util/output.h" + #include "ompi/mca/coll/coll.h" #include "ompi/mca/coll/base/base.h" @@ -61,7 +64,7 @@ int mca_coll_base_open(void) { /* Open an output stream for this framework */ - mca_coll_base_output = opal_output_open(NULL); + mca_coll_base_output = orte_output_open(NULL, "COLL", "DEBUG", NULL); /* Open up all available components */ diff --git a/ompi/mca/coll/demo/coll_demo_allgather.c b/ompi/mca/coll/demo/coll_demo_allgather.c index 7213605090..500db7c49d 100644 --- a/ompi/mca/coll/demo/coll_demo_allgather.c +++ b/ompi/mca/coll/demo/coll_demo_allgather.c @@ -20,7 +20,7 @@ #include "mpi.h" #include "ompi/constants.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "ompi/mca/coll/coll.h" #include "ompi/mca/coll/base/base.h" #include "coll_demo.h" @@ -40,7 +40,7 @@ int mca_coll_demo_allgather_intra(void *sbuf, int scount, struct mca_coll_base_module_1_1_0_t *module) { mca_coll_demo_module_t *demo_module = (mca_coll_demo_module_t*) module; - opal_output_verbose(10, mca_coll_base_output, "In demo allgather_intra"); + orte_output_verbose(10, mca_coll_base_output, "In demo allgather_intra"); return demo_module->underlying.coll_allgather(sbuf, scount, sdtype, rbuf, rcount, rdtype, comm, demo_module->underlying.coll_allgather_module); @@ -62,7 +62,7 @@ int mca_coll_demo_allgather_inter(void *sbuf, int scount, struct mca_coll_base_module_1_1_0_t *module) { mca_coll_demo_module_t *demo_module = (mca_coll_demo_module_t*) module; - opal_output_verbose(10, mca_coll_base_output, "In demo allgather_inter"); + orte_output_verbose(10, mca_coll_base_output, "In demo allgather_inter"); return demo_module->underlying.coll_allgather(sbuf, scount, sdtype, rbuf, rcount, rdtype, comm, demo_module->underlying.coll_allgather_module); diff --git a/ompi/mca/coll/demo/coll_demo_allgatherv.c b/ompi/mca/coll/demo/coll_demo_allgatherv.c index ada7b9dec5..180e885b16 100644 --- a/ompi/mca/coll/demo/coll_demo_allgatherv.c +++ b/ompi/mca/coll/demo/coll_demo_allgatherv.c @@ -20,7 +20,7 @@ #include "mpi.h" #include "ompi/constants.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "ompi/mca/coll/coll.h" #include "ompi/mca/coll/base/base.h" #include "coll_demo.h" @@ -41,7 +41,7 @@ int mca_coll_demo_allgatherv_intra(void *sbuf, int scount, struct mca_coll_base_module_1_1_0_t *module) { mca_coll_demo_module_t *demo_module = (mca_coll_demo_module_t*) module; - opal_output_verbose(10, mca_coll_base_output, "In demo allgatherv_intra"); + orte_output_verbose(10, mca_coll_base_output, "In demo allgatherv_intra"); return demo_module->underlying.coll_allgatherv(sbuf, scount, sdtype, rbuf, rcounts, disps, rdtype, comm, @@ -64,7 +64,7 @@ int mca_coll_demo_allgatherv_inter(void *sbuf, int scount, struct mca_coll_base_module_1_1_0_t *module) { mca_coll_demo_module_t *demo_module = (mca_coll_demo_module_t*) module; - opal_output_verbose(10, mca_coll_base_output, "In demo allgatherv_inter"); + orte_output_verbose(10, mca_coll_base_output, "In demo allgatherv_inter"); return demo_module->underlying.coll_allgatherv(sbuf, scount, sdtype, rbuf, rcounts, disps, rdtype, comm, diff --git a/ompi/mca/coll/demo/coll_demo_allreduce.c b/ompi/mca/coll/demo/coll_demo_allreduce.c index d7de6c88df..905d33332b 100644 --- a/ompi/mca/coll/demo/coll_demo_allreduce.c +++ b/ompi/mca/coll/demo/coll_demo_allreduce.c @@ -20,7 +20,7 @@ #include "mpi.h" #include "ompi/constants.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "ompi/mca/coll/coll.h" #include "ompi/mca/coll/base/base.h" #include "coll_demo.h" @@ -40,7 +40,7 @@ int mca_coll_demo_allreduce_intra(void *sbuf, void *rbuf, int count, struct mca_coll_base_module_1_1_0_t *module) { mca_coll_demo_module_t *demo_module = (mca_coll_demo_module_t*) module; - opal_output_verbose(10, mca_coll_base_output, "In demo allreduce_intra"); + orte_output_verbose(10, mca_coll_base_output, "In demo allreduce_intra"); return demo_module->underlying.coll_allreduce(sbuf, rbuf, count, dtype, op, comm, demo_module->underlying.coll_allreduce_module); @@ -61,7 +61,7 @@ int mca_coll_demo_allreduce_inter(void *sbuf, void *rbuf, int count, struct mca_coll_base_module_1_1_0_t *module) { mca_coll_demo_module_t *demo_module = (mca_coll_demo_module_t*) module; - opal_output_verbose(10, mca_coll_base_output, "In demo allreduce_inter"); + orte_output_verbose(10, mca_coll_base_output, "In demo allreduce_inter"); return demo_module->underlying.coll_allreduce(sbuf, rbuf, count, dtype, op, comm, demo_module->underlying.coll_allreduce_module); diff --git a/ompi/mca/coll/demo/coll_demo_alltoall.c b/ompi/mca/coll/demo/coll_demo_alltoall.c index 576f59d07e..b72a6d08b4 100644 --- a/ompi/mca/coll/demo/coll_demo_alltoall.c +++ b/ompi/mca/coll/demo/coll_demo_alltoall.c @@ -20,7 +20,7 @@ #include "mpi.h" #include "ompi/constants.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "ompi/mca/coll/coll.h" #include "ompi/mca/coll/base/base.h" #include "coll_demo.h" @@ -41,7 +41,7 @@ int mca_coll_demo_alltoall_intra(void *sbuf, int scount, struct mca_coll_base_module_1_1_0_t *module) { mca_coll_demo_module_t *demo_module = (mca_coll_demo_module_t*) module; - opal_output_verbose(10, mca_coll_base_output, "In demo alltoall_intra\n"); + orte_output_verbose(10, mca_coll_base_output, "In demo alltoall_intra\n"); return demo_module->underlying.coll_alltoall(sbuf, scount, sdtype, rbuf, rcount, rdtype, comm, @@ -64,7 +64,7 @@ int mca_coll_demo_alltoall_inter(void *sbuf, int scount, struct mca_coll_base_module_1_1_0_t *module) { mca_coll_demo_module_t *demo_module = (mca_coll_demo_module_t*) module; - opal_output_verbose(10, mca_coll_base_output, "In demo alltoall_inter\n"); + orte_output_verbose(10, mca_coll_base_output, "In demo alltoall_inter\n"); return demo_module->underlying.coll_alltoall(sbuf, scount, sdtype, rbuf, rcount, rdtype, comm, diff --git a/ompi/mca/coll/demo/coll_demo_alltoallv.c b/ompi/mca/coll/demo/coll_demo_alltoallv.c index f5a13fc6d8..4c974b3518 100644 --- a/ompi/mca/coll/demo/coll_demo_alltoallv.c +++ b/ompi/mca/coll/demo/coll_demo_alltoallv.c @@ -20,7 +20,7 @@ #include "mpi.h" #include "ompi/constants.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "ompi/mca/coll/coll.h" #include "ompi/mca/coll/base/base.h" #include "coll_demo.h" @@ -42,7 +42,7 @@ mca_coll_demo_alltoallv_intra(void *sbuf, int *scounts, int *sdisps, struct mca_coll_base_module_1_1_0_t *module) { mca_coll_demo_module_t *demo_module = (mca_coll_demo_module_t*) module; - opal_output_verbose(10, mca_coll_base_output, "In demo alltoallv_intra"); + orte_output_verbose(10, mca_coll_base_output, "In demo alltoallv_intra"); return demo_module->underlying.coll_alltoallv(sbuf, scounts, sdisps, sdtype, rbuf, rcounts, rdisps, rdtype, comm, @@ -66,7 +66,7 @@ mca_coll_demo_alltoallv_inter(void *sbuf, int *scounts, int *sdisps, struct mca_coll_base_module_1_1_0_t *module) { mca_coll_demo_module_t *demo_module = (mca_coll_demo_module_t*) module; - opal_output_verbose(10, mca_coll_base_output, "In demo alltoallv_inter"); + orte_output_verbose(10, mca_coll_base_output, "In demo alltoallv_inter"); return demo_module->underlying.coll_alltoallv(sbuf, scounts, sdisps, sdtype, rbuf, rcounts, rdisps, rdtype, comm, diff --git a/ompi/mca/coll/demo/coll_demo_alltoallw.c b/ompi/mca/coll/demo/coll_demo_alltoallw.c index 0413a78348..5a8e99925c 100644 --- a/ompi/mca/coll/demo/coll_demo_alltoallw.c +++ b/ompi/mca/coll/demo/coll_demo_alltoallw.c @@ -20,7 +20,7 @@ #include "mpi.h" #include "ompi/constants.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "ompi/mca/coll/coll.h" #include "ompi/mca/coll/base/base.h" #include "coll_demo.h" @@ -41,7 +41,7 @@ int mca_coll_demo_alltoallw_intra(void *sbuf, int *scounts, int *sdisps, struct mca_coll_base_module_1_1_0_t *module) { mca_coll_demo_module_t *demo_module = (mca_coll_demo_module_t*) module; - opal_output_verbose(10, mca_coll_base_output, "In demo alltoallw_intra"); + orte_output_verbose(10, mca_coll_base_output, "In demo alltoallw_intra"); return demo_module->underlying.coll_alltoallw(sbuf, scounts, sdisps, sdtypes, rbuf, rcounts, rdisps, rdtypes, comm, @@ -64,7 +64,7 @@ int mca_coll_demo_alltoallw_inter(void *sbuf, int *scounts, int *sdisps, struct mca_coll_base_module_1_1_0_t *module) { mca_coll_demo_module_t *demo_module = (mca_coll_demo_module_t*) module; - opal_output_verbose(10, mca_coll_base_output, "In demo alltoallw_inter"); + orte_output_verbose(10, mca_coll_base_output, "In demo alltoallw_inter"); return demo_module->underlying.coll_alltoallw(sbuf, scounts, sdisps, sdtypes, rbuf, rcounts, rdisps, rdtypes, comm, diff --git a/ompi/mca/coll/demo/coll_demo_barrier.c b/ompi/mca/coll/demo/coll_demo_barrier.c index 3d1bb316b2..53f4c8da2f 100644 --- a/ompi/mca/coll/demo/coll_demo_barrier.c +++ b/ompi/mca/coll/demo/coll_demo_barrier.c @@ -20,7 +20,7 @@ #include "mpi.h" #include "ompi/constants.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "ompi/mca/coll/coll.h" #include "ompi/mca/coll/base/base.h" #include "coll_demo.h" @@ -37,7 +37,7 @@ int mca_coll_demo_barrier_intra(struct ompi_communicator_t *comm, struct mca_coll_base_module_1_1_0_t *module) { mca_coll_demo_module_t *demo_module = (mca_coll_demo_module_t*) module; - opal_output_verbose(10, mca_coll_base_output, "In demo barrier_intra"); + orte_output_verbose(10, mca_coll_base_output, "In demo barrier_intra"); return demo_module->underlying.coll_barrier(comm, demo_module->underlying.coll_barrier_module); } @@ -54,7 +54,7 @@ int mca_coll_demo_barrier_inter(struct ompi_communicator_t *comm, struct mca_coll_base_module_1_1_0_t *module) { mca_coll_demo_module_t *demo_module = (mca_coll_demo_module_t*) module; - opal_output_verbose(10, mca_coll_base_output, "In demo barrier_inter"); + orte_output_verbose(10, mca_coll_base_output, "In demo barrier_inter"); return demo_module->underlying.coll_barrier(comm, demo_module->underlying.coll_barrier_module); } diff --git a/ompi/mca/coll/demo/coll_demo_bcast.c b/ompi/mca/coll/demo/coll_demo_bcast.c index fb2b61025c..a423134401 100644 --- a/ompi/mca/coll/demo/coll_demo_bcast.c +++ b/ompi/mca/coll/demo/coll_demo_bcast.c @@ -20,7 +20,7 @@ #include "mpi.h" #include "ompi/constants.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "ompi/mca/coll/coll.h" #include "ompi/mca/coll/base/base.h" #include "coll_demo.h" @@ -39,7 +39,7 @@ int mca_coll_demo_bcast_intra(void *buff, int count, struct mca_coll_base_module_1_1_0_t *module) { mca_coll_demo_module_t *demo_module = (mca_coll_demo_module_t*) module; - opal_output_verbose(10, mca_coll_base_output, "In demo bcast_intra"); + orte_output_verbose(10, mca_coll_base_output, "In demo bcast_intra"); return demo_module->underlying.coll_bcast(buff, count, datatype, root, comm, demo_module->underlying.coll_bcast_module); @@ -59,7 +59,7 @@ int mca_coll_demo_bcast_inter(void *buff, int count, struct mca_coll_base_module_1_1_0_t *module) { mca_coll_demo_module_t *demo_module = (mca_coll_demo_module_t*) module; - opal_output_verbose(10, mca_coll_base_output, "In demo bcast_inter"); + orte_output_verbose(10, mca_coll_base_output, "In demo bcast_inter"); return demo_module->underlying.coll_bcast(buff, count, datatype, root, comm, demo_module->underlying.coll_bcast_module); diff --git a/ompi/mca/coll/demo/coll_demo_exscan.c b/ompi/mca/coll/demo/coll_demo_exscan.c index cc02194977..a2f821e5a0 100644 --- a/ompi/mca/coll/demo/coll_demo_exscan.c +++ b/ompi/mca/coll/demo/coll_demo_exscan.c @@ -20,7 +20,7 @@ #include "mpi.h" #include "ompi/constants.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "ompi/mca/coll/coll.h" #include "ompi/mca/coll/base/base.h" #include "coll_demo.h" @@ -40,7 +40,7 @@ int mca_coll_demo_exscan_intra(void *sbuf, void *rbuf, int count, struct mca_coll_base_module_1_1_0_t *module) { mca_coll_demo_module_t *demo_module = (mca_coll_demo_module_t*) module; - opal_output_verbose(10, mca_coll_base_output, "In demo exscan_intra"); + orte_output_verbose(10, mca_coll_base_output, "In demo exscan_intra"); return demo_module->underlying.coll_exscan(sbuf, rbuf, count, dtype, op, comm, demo_module->underlying.coll_exscan_module); diff --git a/ompi/mca/coll/demo/coll_demo_gather.c b/ompi/mca/coll/demo/coll_demo_gather.c index 3ed3b4cc73..833f79fc5a 100644 --- a/ompi/mca/coll/demo/coll_demo_gather.c +++ b/ompi/mca/coll/demo/coll_demo_gather.c @@ -20,7 +20,7 @@ #include "mpi.h" #include "ompi/constants.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "ompi/mca/coll/coll.h" #include "ompi/mca/coll/base/base.h" #include "coll_demo.h" @@ -40,7 +40,7 @@ int mca_coll_demo_gather_intra(void *sbuf, int scount, struct mca_coll_base_module_1_1_0_t *module) { mca_coll_demo_module_t *demo_module = (mca_coll_demo_module_t*) module; - opal_output_verbose(10, mca_coll_base_output, "In demo gather_intra"); + orte_output_verbose(10, mca_coll_base_output, "In demo gather_intra"); return demo_module->underlying.coll_gather(sbuf, scount, sdtype, rbuf, rcount, rdtype, root, comm, @@ -63,7 +63,7 @@ int mca_coll_demo_gather_inter(void *sbuf, int scount, struct mca_coll_base_module_1_1_0_t *module) { mca_coll_demo_module_t *demo_module = (mca_coll_demo_module_t*) module; - opal_output_verbose(10, mca_coll_base_output, "In demo gather_inter"); + orte_output_verbose(10, mca_coll_base_output, "In demo gather_inter"); return demo_module->underlying.coll_gather(sbuf, scount, sdtype, rbuf, rcount, rdtype, root, comm, diff --git a/ompi/mca/coll/demo/coll_demo_gatherv.c b/ompi/mca/coll/demo/coll_demo_gatherv.c index ec8444e1ec..4c5e84972d 100644 --- a/ompi/mca/coll/demo/coll_demo_gatherv.c +++ b/ompi/mca/coll/demo/coll_demo_gatherv.c @@ -20,7 +20,7 @@ #include "mpi.h" #include "ompi/constants.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "ompi/mca/coll/coll.h" #include "ompi/mca/coll/base/base.h" #include "coll_demo.h" @@ -41,7 +41,7 @@ int mca_coll_demo_gatherv_intra(void *sbuf, int scount, struct mca_coll_base_module_1_1_0_t *module) { mca_coll_demo_module_t *demo_module = (mca_coll_demo_module_t*) module; - opal_output_verbose(10, mca_coll_base_output, "In demo gatherv_intra"); + orte_output_verbose(10, mca_coll_base_output, "In demo gatherv_intra"); return demo_module->underlying.coll_gatherv(sbuf, scount, sdtype, rbuf, rcounts, disps, rdtype, root, comm, @@ -64,7 +64,7 @@ int mca_coll_demo_gatherv_inter(void *sbuf, int scount, struct mca_coll_base_module_1_1_0_t *module) { mca_coll_demo_module_t *demo_module = (mca_coll_demo_module_t*) module; - opal_output_verbose(10, mca_coll_base_output, "In demo gatherv_inter"); + orte_output_verbose(10, mca_coll_base_output, "In demo gatherv_inter"); return demo_module->underlying.coll_gatherv(sbuf, scount, sdtype, rbuf, rcounts, disps, rdtype, root, comm, diff --git a/ompi/mca/coll/demo/coll_demo_reduce.c b/ompi/mca/coll/demo/coll_demo_reduce.c index cf88704a2f..09bba89c69 100644 --- a/ompi/mca/coll/demo/coll_demo_reduce.c +++ b/ompi/mca/coll/demo/coll_demo_reduce.c @@ -20,7 +20,7 @@ #include "mpi.h" #include "ompi/constants.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "ompi/mca/coll/coll.h" #include "ompi/mca/coll/base/base.h" #include "coll_demo.h" @@ -40,7 +40,7 @@ int mca_coll_demo_reduce_intra(void *sbuf, void *rbuf, int count, struct mca_coll_base_module_1_1_0_t *module) { mca_coll_demo_module_t *demo_module = (mca_coll_demo_module_t*) module; - opal_output_verbose(10, mca_coll_base_output, "In demo reduce_intra"); + orte_output_verbose(10, mca_coll_base_output, "In demo reduce_intra"); return demo_module->underlying.coll_reduce(sbuf, rbuf, count, dtype, op, root, comm, demo_module->underlying.coll_reduce_module); @@ -61,7 +61,7 @@ int mca_coll_demo_reduce_inter(void *sbuf, void *rbuf, int count, struct mca_coll_base_module_1_1_0_t *module) { mca_coll_demo_module_t *demo_module = (mca_coll_demo_module_t*) module; - opal_output_verbose(10, mca_coll_base_output, "In demo reduce_inter"); + orte_output_verbose(10, mca_coll_base_output, "In demo reduce_inter"); return demo_module->underlying.coll_reduce(sbuf, rbuf, count, dtype, op, root, comm, demo_module->underlying.coll_reduce_module); diff --git a/ompi/mca/coll/demo/coll_demo_reduce_scatter.c b/ompi/mca/coll/demo/coll_demo_reduce_scatter.c index eaaea17a51..ab42fa7f24 100644 --- a/ompi/mca/coll/demo/coll_demo_reduce_scatter.c +++ b/ompi/mca/coll/demo/coll_demo_reduce_scatter.c @@ -20,7 +20,7 @@ #include "mpi.h" #include "ompi/constants.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "ompi/mca/coll/coll.h" #include "ompi/mca/coll/base/base.h" #include "coll_demo.h" @@ -40,7 +40,7 @@ int mca_coll_demo_reduce_scatter_intra(void *sbuf, void *rbuf, int *rcounts, struct mca_coll_base_module_1_1_0_t *module) { mca_coll_demo_module_t *demo_module = (mca_coll_demo_module_t*) module; - opal_output_verbose(10, mca_coll_base_output, "In demo scatter_intra"); + orte_output_verbose(10, mca_coll_base_output, "In demo scatter_intra"); return demo_module->underlying.coll_reduce_scatter(sbuf, rbuf, rcounts, dtype, op, comm, demo_module->underlying.coll_reduce_scatter_module); @@ -61,7 +61,7 @@ int mca_coll_demo_reduce_scatter_inter(void *sbuf, void *rbuf, int *rcounts, struct mca_coll_base_module_1_1_0_t *module) { mca_coll_demo_module_t *demo_module = (mca_coll_demo_module_t*) module; - opal_output_verbose(10, mca_coll_base_output, "In demo scatter_inter"); + orte_output_verbose(10, mca_coll_base_output, "In demo scatter_inter"); return demo_module->underlying.coll_reduce_scatter(sbuf, rbuf, rcounts, dtype, op, comm, demo_module->underlying.coll_reduce_scatter_module); diff --git a/ompi/mca/coll/demo/coll_demo_scan.c b/ompi/mca/coll/demo/coll_demo_scan.c index f4eac23615..175e96d94b 100644 --- a/ompi/mca/coll/demo/coll_demo_scan.c +++ b/ompi/mca/coll/demo/coll_demo_scan.c @@ -20,7 +20,7 @@ #include "mpi.h" #include "ompi/constants.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "ompi/mca/coll/coll.h" #include "ompi/mca/coll/base/base.h" #include "coll_demo.h" @@ -40,7 +40,7 @@ int mca_coll_demo_scan_intra(void *sbuf, void *rbuf, int count, struct mca_coll_base_module_1_1_0_t *module) { mca_coll_demo_module_t *demo_module = (mca_coll_demo_module_t*) module; - opal_output_verbose(10, mca_coll_base_output, "In demo scan_intra"); + orte_output_verbose(10, mca_coll_base_output, "In demo scan_intra"); return demo_module->underlying.coll_scan(sbuf, rbuf, count, dtype, op, comm, demo_module->underlying.coll_scan_module); diff --git a/ompi/mca/coll/demo/coll_demo_scatter.c b/ompi/mca/coll/demo/coll_demo_scatter.c index 00cbafcaaa..7fa1f3a6df 100644 --- a/ompi/mca/coll/demo/coll_demo_scatter.c +++ b/ompi/mca/coll/demo/coll_demo_scatter.c @@ -20,7 +20,7 @@ #include "mpi.h" #include "ompi/constants.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "ompi/mca/coll/coll.h" #include "ompi/mca/coll/base/base.h" #include "coll_demo.h" @@ -42,7 +42,7 @@ int mca_coll_demo_scatter_intra(void *sbuf, int scount, struct mca_coll_base_module_1_1_0_t *module) { mca_coll_demo_module_t *demo_module = (mca_coll_demo_module_t*) module; - opal_output_verbose(10, mca_coll_base_output, "In demo scatter_intra"); + orte_output_verbose(10, mca_coll_base_output, "In demo scatter_intra"); return demo_module->underlying.coll_scatter(sbuf, scount, sdtype, rbuf, rcount, rdtype, root, comm, @@ -66,7 +66,7 @@ int mca_coll_demo_scatter_inter(void *sbuf, int scount, struct mca_coll_base_module_1_1_0_t *module) { mca_coll_demo_module_t *demo_module = (mca_coll_demo_module_t*) module; - opal_output_verbose(10, mca_coll_base_output, "In demo scatter_inter"); + orte_output_verbose(10, mca_coll_base_output, "In demo scatter_inter"); return demo_module->underlying.coll_scatter(sbuf, scount, sdtype, rbuf, rcount, rdtype, root, comm, diff --git a/ompi/mca/coll/demo/coll_demo_scatterv.c b/ompi/mca/coll/demo/coll_demo_scatterv.c index f380fc30a1..beceb8a897 100644 --- a/ompi/mca/coll/demo/coll_demo_scatterv.c +++ b/ompi/mca/coll/demo/coll_demo_scatterv.c @@ -20,7 +20,7 @@ #include "mpi.h" #include "ompi/constants.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "ompi/mca/coll/coll.h" #include "ompi/mca/coll/base/base.h" #include "coll_demo.h" @@ -41,7 +41,7 @@ int mca_coll_demo_scatterv_intra(void *sbuf, int *scounts, struct mca_coll_base_module_1_1_0_t *module) { mca_coll_demo_module_t *demo_module = (mca_coll_demo_module_t*) module; - opal_output_verbose(10, mca_coll_base_output, "In demo scatterv_intra"); + orte_output_verbose(10, mca_coll_base_output, "In demo scatterv_intra"); return demo_module->underlying.coll_scatterv(sbuf, scounts, disps, sdtype, rbuf, rcount, rdtype, root, comm, @@ -64,7 +64,7 @@ int mca_coll_demo_scatterv_inter(void *sbuf, int *scounts, struct mca_coll_base_module_1_1_0_t *module) { mca_coll_demo_module_t *demo_module = (mca_coll_demo_module_t*) module; - opal_output_verbose(10, mca_coll_base_output, "In demo scatterv_inter"); + orte_output_verbose(10, mca_coll_base_output, "In demo scatterv_inter"); return demo_module->underlying.coll_scatterv(sbuf, scounts, disps, sdtype, rbuf, rcount, rdtype, root, comm, diff --git a/ompi/mca/coll/hierarch/coll_hierarch_allreduce.c b/ompi/mca/coll/hierarch/coll_hierarch_allreduce.c index 34e362dd3c..05c29dde45 100644 --- a/ompi/mca/coll/hierarch/coll_hierarch_allreduce.c +++ b/ompi/mca/coll/hierarch/coll_hierarch_allreduce.c @@ -24,7 +24,7 @@ #include "mpi.h" #include "ompi/constants.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "ompi/communicator/communicator.h" #include "ompi/datatype/datatype.h" #include "ompi/mca/coll/coll.h" diff --git a/ompi/mca/coll/hierarch/coll_hierarch_barrier.c b/ompi/mca/coll/hierarch/coll_hierarch_barrier.c index ce46f0a383..37704e2647 100644 --- a/ompi/mca/coll/hierarch/coll_hierarch_barrier.c +++ b/ompi/mca/coll/hierarch/coll_hierarch_barrier.c @@ -23,7 +23,7 @@ #include "mpi.h" #include "ompi/constants.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "ompi/communicator/communicator.h" #include "ompi/mca/coll/coll.h" diff --git a/ompi/mca/coll/hierarch/coll_hierarch_bcast.c b/ompi/mca/coll/hierarch/coll_hierarch_bcast.c index 979744f20b..320e08e85f 100644 --- a/ompi/mca/coll/hierarch/coll_hierarch_bcast.c +++ b/ompi/mca/coll/hierarch/coll_hierarch_bcast.c @@ -22,7 +22,7 @@ #include "mpi.h" #include "ompi/constants.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "ompi/communicator/communicator.h" #include "ompi/mca/coll/coll.h" diff --git a/ompi/mca/coll/hierarch/coll_hierarch_reduce.c b/ompi/mca/coll/hierarch/coll_hierarch_reduce.c index 2239e3534f..53534471b4 100644 --- a/ompi/mca/coll/hierarch/coll_hierarch_reduce.c +++ b/ompi/mca/coll/hierarch/coll_hierarch_reduce.c @@ -24,7 +24,7 @@ #include "mpi.h" #include "ompi/constants.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "ompi/communicator/communicator.h" #include "ompi/datatype/datatype.h" #include "ompi/mca/coll/coll.h" diff --git a/ompi/mca/coll/inter/coll_inter_bcast.c b/ompi/mca/coll/inter/coll_inter_bcast.c index 596e6ec991..71d1abca91 100644 --- a/ompi/mca/coll/inter/coll_inter_bcast.c +++ b/ompi/mca/coll/inter/coll_inter_bcast.c @@ -22,7 +22,7 @@ #include "mpi.h" #include "ompi/constants.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "ompi/communicator/communicator.h" #include "ompi/mca/coll/coll.h" #include "ompi/mca/coll/base/coll_tags.h" diff --git a/ompi/mca/coll/sm/coll_sm_component.c b/ompi/mca/coll/sm/coll_sm_component.c index f241f19451..f4c1c34896 100644 --- a/ompi/mca/coll/sm/coll_sm_component.c +++ b/ompi/mca/coll/sm/coll_sm_component.c @@ -27,7 +27,7 @@ #include "ompi/constants.h" #include "ompi/communicator/communicator.h" #include "ompi/mca/coll/coll.h" -#include "opal/util/show_help.h" +#include "orte/util/output.h" #include "coll_sm.h" @@ -223,13 +223,13 @@ static int sm_open(void) cs->sm_tree_degree, &cs->sm_tree_degree); if (cs->sm_tree_degree > cs->sm_control_size) { - opal_show_help("help-coll-sm.txt", + orte_show_help("help-coll-sm.txt", "tree-degree-larger-than-control", true, cs->sm_tree_degree, cs->sm_control_size); cs->sm_tree_degree = cs->sm_control_size; } if (cs->sm_tree_degree > 255) { - opal_show_help("help-coll-sm.txt", + orte_show_help("help-coll-sm.txt", "tree-degree-larger-than-255", true, cs->sm_tree_degree); cs->sm_tree_degree = 255; diff --git a/ompi/mca/coll/sm2/coll_sm2_component.c b/ompi/mca/coll/sm2/coll_sm2_component.c index a6ddf0e833..759ea8a9db 100644 --- a/ompi/mca/coll/sm2/coll_sm2_component.c +++ b/ompi/mca/coll/sm2/coll_sm2_component.c @@ -31,7 +31,7 @@ #include "ompi/constants.h" #include "ompi/communicator/communicator.h" #include "ompi/mca/coll/coll.h" -#include "opal/util/show_help.h" +#include "orte/util/show_help.h" #include "coll_sm2.h" #include "ompi/mca/coll/base/base.h" #include "orte/mca/rml/rml.h" diff --git a/ompi/mca/coll/sm2/coll_sm2_module.c b/ompi/mca/coll/sm2/coll_sm2_module.c index a8013e1d37..9865715fa7 100644 --- a/ompi/mca/coll/sm2/coll_sm2_module.c +++ b/ompi/mca/coll/sm2/coll_sm2_module.c @@ -31,7 +31,7 @@ #include "ompi/constants.h" #include "ompi/communicator/communicator.h" #include "ompi/mca/coll/coll.h" -#include "opal/util/show_help.h" +#include "orte/util/show_help.h" #include "coll_sm2.h" #include "ompi/mca/coll/base/base.h" #include "ompi/mca/dpm/dpm.h" @@ -238,7 +238,7 @@ static int allocate_shared_file(size_t size, char **file_name, /* process initializing the file */ fd = open(*file_name, O_CREAT|O_RDWR, 0600); if (fd < 0) { - opal_output(0,"mca_common_sm_mmap_init: open %s len %ld failed with errno=%d\n", + orte_output(0,"mca_common_sm_mmap_init: open %s len %ld failed with errno=%d\n", *file_name, len, errno); goto file_opened; } @@ -246,14 +246,14 @@ static int allocate_shared_file(size_t size, char **file_name, *sm_backing_file = (char *) mmap(NULL, size, PROT_READ|PROT_WRITE, MAP_SHARED, fd, 0); if( (void*)-1 == sm_backing_file ) { - opal_output(0, "mca_common_sm_mmap_init: mmap failed with errno=%d\n", + orte_output(0, "mca_common_sm_mmap_init: mmap failed with errno=%d\n", errno); goto file_opened; } /* truncate the file to the requested size */ if(ftruncate(fd, size) != 0) { - opal_output(0, + orte_output(0, "mca_common_sm_mmap_init: ftruncate failed with errno=%d\n", errno); goto file_opened; @@ -279,7 +279,7 @@ static int allocate_shared_file(size_t size, char **file_name, rc=orte_rml.send(&(comm_proc_list[p]->proc_name),iov,3, OMPI_RML_TAG_COLL_SM2_BACK_FILE_CREATED,0); if( rc < 0 ) { - opal_output(0, + orte_output(0, "allocate_shared_file: orte_rml.send failed to %lu with errno=%d\n", (unsigned long)p, errno); goto return_error; @@ -301,7 +301,7 @@ static int allocate_shared_file(size_t size, char **file_name, rc=orte_rml.recv(&(comm_proc_list[0]->proc_name),iov,3, OMPI_RML_TAG_COLL_SM2_BACK_FILE_CREATED,0); if( rc < 0 ) { - opal_output(0, "allocate_shared_file: orte_rml.recv failed from %ld with errno=%d\n", + orte_output(0, "allocate_shared_file: orte_rml.recv failed from %ld with errno=%d\n", 0L, errno); goto return_error; } @@ -323,7 +323,7 @@ static int allocate_shared_file(size_t size, char **file_name, /* open backing file */ fd = open(*file_name, O_RDWR, 0600); if (fd < 0) { - opal_output(0,"mca_common_sm_mmap_init: open %s len %ld failed with errno=%d\n", + orte_output(0,"mca_common_sm_mmap_init: open %s len %ld failed with errno=%d\n", *file_name, len, errno); goto return_error; } @@ -332,7 +332,7 @@ static int allocate_shared_file(size_t size, char **file_name, *sm_backing_file = (char *) mmap(NULL, size, PROT_READ|PROT_WRITE, MAP_SHARED, fd, 0); if( (void*)-1 == sm_backing_file ) { - opal_output(0, "mca_common_sm_mmap_init: mmap failed with errno=%d\n", + orte_output(0, "mca_common_sm_mmap_init: mmap failed with errno=%d\n", errno); goto return_error; } @@ -387,7 +387,7 @@ int barrier( struct ompi_communicator_t *comm , rc=orte_rml.recv(&(comm_proc_list[child_rank]->proc_name),&iov,1, OMPI_RML_TAG_COLL_SM2_BACK_FILE_CREATED,0); if( rc < 0 ) { - opal_output(0, + orte_output(0, "sm barrier fan-in: orte_rml.recv failed to %lu with errno=%d\n", (unsigned long)child_rank, errno); goto return_error; @@ -400,7 +400,7 @@ int barrier( struct ompi_communicator_t *comm , rc=orte_rml.send(&(comm_proc_list[my_fanout_parent]->proc_name),&iov,1, OMPI_RML_TAG_COLL_SM2_BACK_FILE_CREATED,0); if( rc < 0 ) { - opal_output(0, + orte_output(0, "sm barrier fan-in: orte_rml.send failed to %lu with errno=%d\n", (unsigned long)my_fanout_parent, errno); goto return_error; @@ -417,7 +417,7 @@ int barrier( struct ompi_communicator_t *comm , rc=orte_rml.recv(&(comm_proc_list[my_fanout_parent]->proc_name),&iov,1, OMPI_RML_TAG_COLL_SM2_BACK_FILE_CREATED,0); if( rc < 0 ) { - opal_output(0, + orte_output(0, "sm barrier fan-out: orte_rml.recv failed to %lu with errno=%d\n", (unsigned long)my_fanout_parent, errno); goto return_error; @@ -432,7 +432,7 @@ int barrier( struct ompi_communicator_t *comm , rc=orte_rml.send(&(comm_proc_list[child_rank]->proc_name),&iov,1, OMPI_RML_TAG_COLL_SM2_BACK_FILE_CREATED,0); if( rc < 0 ) { - opal_output(0, + orte_output(0, "sm barrier fan-out: orte_rml.send failed to %lu with errno=%d\n", (unsigned long)child_rank, errno); goto return_error; @@ -1205,7 +1205,7 @@ sm2_module_enable(struct mca_coll_base_module_1_1_0_t *module, memset(&output_buffer[0],0,sizeof(output_buffer)); snprintf(output_buffer,sizeof(output_buffer),"%s (cid %d)", comm->c_name, comm->c_contextid); - opal_output_verbose(10, mca_coll_base_output, + orte_output_verbose(10, mca_coll_base_output, "coll:sm2:enable: new communicator: %s", output_buffer); /* All done */ diff --git a/ompi/mca/coll/sm2/coll_sm2_service.c b/ompi/mca/coll/sm2/coll_sm2_service.c index 832f07772f..a4d31f0a78 100644 --- a/ompi/mca/coll/sm2/coll_sm2_service.c +++ b/ompi/mca/coll/sm2/coll_sm2_service.c @@ -31,7 +31,7 @@ #include "ompi/constants.h" #include "ompi/communicator/communicator.h" #include "ompi/mca/coll/coll.h" -#include "opal/util/show_help.h" +#include "orte/util/show_help.h" #include "coll_sm2.h" #include "ompi/mca/coll/base/base.h" #include "orte/mca/rml/rml.h" diff --git a/ompi/mca/coll/tuned/coll_tuned_allgather.c b/ompi/mca/coll/tuned/coll_tuned_allgather.c index d7d0209c78..d81fd13be1 100644 --- a/ompi/mca/coll/tuned/coll_tuned_allgather.c +++ b/ompi/mca/coll/tuned/coll_tuned_allgather.c @@ -96,7 +96,7 @@ int ompi_coll_tuned_allgather_intra_bruck(void *sbuf, int scount, size = ompi_comm_size(comm); rank = ompi_comm_rank(comm); - OPAL_OUTPUT((ompi_coll_tuned_stream, + ORTE_OUTPUT((ompi_coll_tuned_stream, "coll:tuned:allgather_intra_bruck rank %d", rank)); err = ompi_ddt_get_extent (sdtype, &slb, &sext); @@ -204,7 +204,7 @@ int ompi_coll_tuned_allgather_intra_bruck(void *sbuf, int scount, return OMPI_SUCCESS; err_hndl: - OPAL_OUTPUT((ompi_coll_tuned_stream, "%s:%4d\tError occurred %d, rank %2d", + ORTE_OUTPUT((ompi_coll_tuned_stream, "%s:%4d\tError occurred %d, rank %2d", __FILE__, line, err, rank)); return err; } @@ -280,7 +280,7 @@ ompi_coll_tuned_allgather_intra_recursivedoubling(void *sbuf, int scount, print warning and call bruck allgather algorithm with same parameters. */ if (pow2size != size) { - OPAL_OUTPUT((ompi_coll_tuned_stream, + ORTE_OUTPUT((ompi_coll_tuned_stream, "coll:tuned:allgather_intra_recursivedoubling WARNING: non-pow-2 size %d, switching to bruck algorithm", size)); @@ -289,7 +289,7 @@ ompi_coll_tuned_allgather_intra_recursivedoubling(void *sbuf, int scount, comm, module); } - OPAL_OUTPUT((ompi_coll_tuned_stream, + ORTE_OUTPUT((ompi_coll_tuned_stream, "coll:tuned:allgather_intra_recursivedoubling rank %d, size %d", rank, size)); @@ -342,7 +342,7 @@ ompi_coll_tuned_allgather_intra_recursivedoubling(void *sbuf, int scount, return OMPI_SUCCESS; err_hndl: - OPAL_OUTPUT((ompi_coll_tuned_stream, "%s:%4d\tError occurred %d, rank %2d", + ORTE_OUTPUT((ompi_coll_tuned_stream, "%s:%4d\tError occurred %d, rank %2d", __FILE__, line, err, rank)); return err; } @@ -381,7 +381,7 @@ int ompi_coll_tuned_allgather_intra_ring(void *sbuf, int scount, size = ompi_comm_size(comm); rank = ompi_comm_rank(comm); - OPAL_OUTPUT((ompi_coll_tuned_stream, + ORTE_OUTPUT((ompi_coll_tuned_stream, "coll:tuned:allgather_intra_ring rank %d", rank)); err = ompi_ddt_get_extent (sdtype, &slb, &sext); @@ -432,7 +432,7 @@ int ompi_coll_tuned_allgather_intra_ring(void *sbuf, int scount, return OMPI_SUCCESS; err_hndl: - OPAL_OUTPUT((ompi_coll_tuned_stream, "%s:%4d\tError occurred %d, rank %2d", + ORTE_OUTPUT((ompi_coll_tuned_stream, "%s:%4d\tError occurred %d, rank %2d", __FILE__, line, err, rank)); return err; } @@ -514,7 +514,7 @@ ompi_coll_tuned_allgather_intra_neighborexchange(void *sbuf, int scount, rank = ompi_comm_rank(comm); if (size % 2) { - OPAL_OUTPUT((ompi_coll_tuned_stream, + ORTE_OUTPUT((ompi_coll_tuned_stream, "coll:tuned:allgather_intra_neighborexchange WARNING: odd size %d, switching to ring algorithm", size)); return ompi_coll_tuned_allgather_intra_ring(sbuf, scount, sdtype, @@ -522,7 +522,7 @@ ompi_coll_tuned_allgather_intra_neighborexchange(void *sbuf, int scount, comm, module); } - OPAL_OUTPUT((ompi_coll_tuned_stream, + ORTE_OUTPUT((ompi_coll_tuned_stream, "coll:tuned:allgather_intra_neighborexchange rank %d", rank)); err = ompi_ddt_get_extent (sdtype, &slb, &sext); @@ -608,7 +608,7 @@ ompi_coll_tuned_allgather_intra_neighborexchange(void *sbuf, int scount, return OMPI_SUCCESS; err_hndl: - OPAL_OUTPUT((ompi_coll_tuned_stream, "%s:%4d\tError occurred %d, rank %2d", + ORTE_OUTPUT((ompi_coll_tuned_stream, "%s:%4d\tError occurred %d, rank %2d", __FILE__, line, err, rank)); return err; } @@ -629,7 +629,7 @@ int ompi_coll_tuned_allgather_intra_two_procs(void *sbuf, int scount, rank = ompi_comm_rank(comm); - OPAL_OUTPUT((ompi_coll_tuned_stream, + ORTE_OUTPUT((ompi_coll_tuned_stream, "ompi_coll_tuned_allgather_intra_two_procs rank %d", rank)); err = ompi_ddt_get_extent (sdtype, &lb, &sext); @@ -669,7 +669,7 @@ int ompi_coll_tuned_allgather_intra_two_procs(void *sbuf, int scount, return MPI_SUCCESS; err_hndl: - OPAL_OUTPUT((ompi_coll_tuned_stream, "%s:%4d\tError occurred %d, rank %2d", + ORTE_OUTPUT((ompi_coll_tuned_stream, "%s:%4d\tError occurred %d, rank %2d", __FILE__, line, err, rank)); return err; } @@ -769,7 +769,7 @@ ompi_coll_tuned_allgather_intra_check_forced_init(coll_tuned_force_algorithm_mca &(requested_alg)); if( requested_alg > max_alg ) { if( 0 == ompi_comm_rank( MPI_COMM_WORLD ) ) { - opal_output( 0, "Allgather algorithm #%d is not available (range [0..%d]). Switching back to ignore(0)\n", + orte_output( 0, "Allgather algorithm #%d is not available (range [0..%d]). Switching back to ignore(0)\n", requested_alg, max_alg ); } mca_base_param_set_int( mca_param_indices->algorithm_param_index, 0); @@ -810,7 +810,7 @@ int ompi_coll_tuned_allgather_intra_do_forced(void *sbuf, int scount, mca_coll_tuned_module_t *tuned_module = (mca_coll_tuned_module_t*) module; mca_coll_tuned_comm_t *data = tuned_module->tuned_data; - OPAL_OUTPUT((ompi_coll_tuned_stream, + ORTE_OUTPUT((ompi_coll_tuned_stream, "coll:tuned:allgather_intra_do_forced selected algorithm %d", data->user_forced[ALLGATHER].algorithm)); @@ -844,7 +844,7 @@ int ompi_coll_tuned_allgather_intra_do_forced(void *sbuf, int scount, rbuf, rcount, rdtype, comm, module); default: - OPAL_OUTPUT((ompi_coll_tuned_stream, + ORTE_OUTPUT((ompi_coll_tuned_stream, "coll:tuned:allgather_intra_do_forced attempt to select algorithm %d when only 0-%d is valid?", data->user_forced[ALLGATHER].algorithm, ompi_coll_tuned_forced_max_algorithms[ALLGATHER])); @@ -862,7 +862,7 @@ int ompi_coll_tuned_allgather_intra_do_this(void *sbuf, int scount, struct mca_coll_base_module_1_1_0_t *module, int algorithm, int faninout, int segsize) { - OPAL_OUTPUT((ompi_coll_tuned_stream, + ORTE_OUTPUT((ompi_coll_tuned_stream, "coll:tuned:allgather_intra_do_this selected algorithm %d topo faninout %d segsize %d", algorithm, faninout, segsize)); @@ -896,7 +896,7 @@ int ompi_coll_tuned_allgather_intra_do_this(void *sbuf, int scount, rbuf, rcount, rdtype, comm, module); default: - OPAL_OUTPUT((ompi_coll_tuned_stream, + ORTE_OUTPUT((ompi_coll_tuned_stream, "coll:tuned:allgather_intra_do_this attempt to select algorithm %d when only 0-%d is valid?", algorithm, ompi_coll_tuned_forced_max_algorithms[ALLGATHER])); diff --git a/ompi/mca/coll/tuned/coll_tuned_allgatherv.c b/ompi/mca/coll/tuned/coll_tuned_allgatherv.c index e112283d01..d85f5f4b39 100644 --- a/ompi/mca/coll/tuned/coll_tuned_allgatherv.c +++ b/ompi/mca/coll/tuned/coll_tuned_allgatherv.c @@ -105,7 +105,7 @@ int ompi_coll_tuned_allgatherv_intra_bruck(void *sbuf, int scount, size = ompi_comm_size(comm); rank = ompi_comm_rank(comm); - OPAL_OUTPUT((ompi_coll_tuned_stream, + ORTE_OUTPUT((ompi_coll_tuned_stream, "coll:tuned:allgather_intra_bruck rank %d", rank)); err = ompi_ddt_get_extent (sdtype, &slb, &sext); @@ -205,7 +205,7 @@ int ompi_coll_tuned_allgatherv_intra_bruck(void *sbuf, int scount, if( NULL != new_scounts ) free(new_scounts); if( NULL != new_sdispls ) free(new_sdispls); - OPAL_OUTPUT((ompi_coll_tuned_stream, "%s:%4d\tError occurred %d, rank %2d", + ORTE_OUTPUT((ompi_coll_tuned_stream, "%s:%4d\tError occurred %d, rank %2d", __FILE__, line, err, rank)); return err; } @@ -243,7 +243,7 @@ int ompi_coll_tuned_allgatherv_intra_ring(void *sbuf, int scount, size = ompi_comm_size(comm); rank = ompi_comm_rank(comm); - OPAL_OUTPUT((ompi_coll_tuned_stream, + ORTE_OUTPUT((ompi_coll_tuned_stream, "coll:tuned:allgatherv_intra_ring rank %d", rank)); err = ompi_ddt_get_extent (sdtype, &slb, &sext); @@ -295,7 +295,7 @@ int ompi_coll_tuned_allgatherv_intra_ring(void *sbuf, int scount, return OMPI_SUCCESS; err_hndl: - OPAL_OUTPUT((ompi_coll_tuned_stream, "%s:%4d\tError occurred %d, rank %2d", + ORTE_OUTPUT((ompi_coll_tuned_stream, "%s:%4d\tError occurred %d, rank %2d", __FILE__, line, err, rank)); return err; } @@ -380,7 +380,7 @@ ompi_coll_tuned_allgatherv_intra_neighborexchange(void *sbuf, int scount, rank = ompi_comm_rank(comm); if (size % 2) { - OPAL_OUTPUT((ompi_coll_tuned_stream, + ORTE_OUTPUT((ompi_coll_tuned_stream, "coll:tuned:allgatherv_intra_neighborexchange WARNING: odd size %d, switching to ring algorithm", size)); return ompi_coll_tuned_allgatherv_intra_ring(sbuf, scount, sdtype, @@ -389,7 +389,7 @@ ompi_coll_tuned_allgatherv_intra_neighborexchange(void *sbuf, int scount, comm, module); } - OPAL_OUTPUT((ompi_coll_tuned_stream, + ORTE_OUTPUT((ompi_coll_tuned_stream, "coll:tuned:allgatherv_intra_neighborexchange rank %d", rank)); err = ompi_ddt_get_extent (sdtype, &slb, &sext); @@ -503,7 +503,7 @@ ompi_coll_tuned_allgatherv_intra_neighborexchange(void *sbuf, int scount, return OMPI_SUCCESS; err_hndl: - OPAL_OUTPUT((ompi_coll_tuned_stream, "%s:%4d\tError occurred %d, rank %2d", + ORTE_OUTPUT((ompi_coll_tuned_stream, "%s:%4d\tError occurred %d, rank %2d", __FILE__, line, err, rank)); return err; } @@ -525,7 +525,7 @@ int ompi_coll_tuned_allgatherv_intra_two_procs(void *sbuf, int scount, rank = ompi_comm_rank(comm); - OPAL_OUTPUT((ompi_coll_tuned_stream, + ORTE_OUTPUT((ompi_coll_tuned_stream, "ompi_coll_tuned_allgatherv_intra_two_procs rank %d", rank)); err = ompi_ddt_get_extent (sdtype, &lb, &sext); @@ -566,7 +566,7 @@ int ompi_coll_tuned_allgatherv_intra_two_procs(void *sbuf, int scount, return MPI_SUCCESS; err_hndl: - OPAL_OUTPUT((ompi_coll_tuned_stream, "%s:%4d\tError occurred %d, rank %2d", + ORTE_OUTPUT((ompi_coll_tuned_stream, "%s:%4d\tError occurred %d, rank %2d", __FILE__, line, err, rank)); return err; } @@ -617,7 +617,7 @@ ompi_coll_tuned_allgatherv_intra_basic_default(void *sbuf, int scount, * to process with rank 0 (OMPI convention) */ - OPAL_OUTPUT((ompi_coll_tuned_stream, + ORTE_OUTPUT((ompi_coll_tuned_stream, "ompi_coll_tuned_allgatherv_intra_basic_default rank %d", rank)); @@ -705,7 +705,7 @@ ompi_coll_tuned_allgatherv_intra_check_forced_init(coll_tuned_force_algorithm_mc &(requested_alg)); if( requested_alg > max_alg ) { if( 0 == ompi_comm_rank( MPI_COMM_WORLD ) ) { - opal_output( 0, "Allgather algorithm #%d is not available (range [0..%d]). Switching back to ignore(0)\n", + orte_output( 0, "Allgather algorithm #%d is not available (range [0..%d]). Switching back to ignore(0)\n", requested_alg, max_alg ); } mca_base_param_set_int( mca_param_indices->algorithm_param_index, 0); @@ -747,7 +747,7 @@ int ompi_coll_tuned_allgatherv_intra_do_forced(void *sbuf, int scount, mca_coll_tuned_module_t *tuned_module = (mca_coll_tuned_module_t*) module; mca_coll_tuned_comm_t *data = tuned_module->tuned_data; - OPAL_OUTPUT((ompi_coll_tuned_stream, + ORTE_OUTPUT((ompi_coll_tuned_stream, "coll:tuned:allgatherv_intra_do_forced selected algorithm %d", data->user_forced[ALLGATHERV].algorithm)); @@ -777,7 +777,7 @@ int ompi_coll_tuned_allgatherv_intra_do_forced(void *sbuf, int scount, rbuf, rcounts, rdispls, rdtype, comm, module); default: - OPAL_OUTPUT((ompi_coll_tuned_stream, + ORTE_OUTPUT((ompi_coll_tuned_stream, "coll:tuned:allgatherv_intra_do_forced attempt to select algorithm %d when only 0-%d is valid?", data->user_forced[ALLGATHERV].algorithm, ompi_coll_tuned_forced_max_algorithms[ALLGATHERV])); @@ -797,7 +797,7 @@ int ompi_coll_tuned_allgatherv_intra_do_this(void *sbuf, int scount, int algorithm, int faninout, int segsize) { - OPAL_OUTPUT((ompi_coll_tuned_stream, + ORTE_OUTPUT((ompi_coll_tuned_stream, "coll:tuned:allgatherv_intra_do_this selected algorithm %d topo faninout %d segsize %d", algorithm, faninout, segsize)); @@ -827,7 +827,7 @@ int ompi_coll_tuned_allgatherv_intra_do_this(void *sbuf, int scount, rbuf, rcounts, rdispls, rdtype, comm, module); default: - OPAL_OUTPUT((ompi_coll_tuned_stream, + ORTE_OUTPUT((ompi_coll_tuned_stream, "coll:tuned:allgatherv_intra_do_this attempt to select algorithm %d when only 0-%d is valid?", algorithm, ompi_coll_tuned_forced_max_algorithms[ALLGATHERV])); diff --git a/ompi/mca/coll/tuned/coll_tuned_allreduce.c b/ompi/mca/coll/tuned/coll_tuned_allreduce.c index d8958723fb..43b3bfdaeb 100644 --- a/ompi/mca/coll/tuned/coll_tuned_allreduce.c +++ b/ompi/mca/coll/tuned/coll_tuned_allreduce.c @@ -53,7 +53,7 @@ ompi_coll_tuned_allreduce_intra_nonoverlapping(void *sbuf, void *rbuf, int count rank = ompi_comm_rank(comm); - OPAL_OUTPUT((ompi_coll_tuned_stream,"coll:tuned:allreduce_intra_nonoverlapping rank %d", rank)); + ORTE_OUTPUT((ompi_coll_tuned_stream,"coll:tuned:allreduce_intra_nonoverlapping rank %d", rank)); /* Reduce to 0 and broadcast. */ @@ -134,7 +134,7 @@ ompi_coll_tuned_allreduce_intra_recursivedoubling(void *sbuf, void *rbuf, size = ompi_comm_size(comm); rank = ompi_comm_rank(comm); - OPAL_OUTPUT((ompi_coll_tuned_stream, + ORTE_OUTPUT((ompi_coll_tuned_stream, "coll:tuned:allreduce_intra_recursivedoubling rank %d", rank)); /* Special case for size == 1 */ @@ -263,7 +263,7 @@ ompi_coll_tuned_allreduce_intra_recursivedoubling(void *sbuf, void *rbuf, return MPI_SUCCESS; error_hndl: - OPAL_OUTPUT((ompi_coll_tuned_stream, "%s:%4d\tRank %d Error occurred %d\n", + ORTE_OUTPUT((ompi_coll_tuned_stream, "%s:%4d\tRank %d Error occurred %d\n", __FILE__, line, rank, ret)); if (NULL != inplacebuf) free(inplacebuf); return ret; @@ -354,7 +354,7 @@ ompi_coll_tuned_allreduce_intra_ring(void *sbuf, void *rbuf, int count, size = ompi_comm_size(comm); rank = ompi_comm_rank(comm); - OPAL_OUTPUT((ompi_coll_tuned_stream, + ORTE_OUTPUT((ompi_coll_tuned_stream, "coll:tuned:allreduce_intra_ring rank %d, count %d", rank, count)); /* Special case for size == 1 */ @@ -368,7 +368,7 @@ ompi_coll_tuned_allreduce_intra_ring(void *sbuf, void *rbuf, int count, /* Special case for count less than size - use recursive doubling */ if (count < size) { - OPAL_OUTPUT((ompi_coll_tuned_stream, "coll:tuned:allreduce_ring rank %d/%d, count %d, switching to recursive doubling", rank, size, count)); + ORTE_OUTPUT((ompi_coll_tuned_stream, "coll:tuned:allreduce_ring rank %d/%d, count %d, switching to recursive doubling", rank, size, count)); return (ompi_coll_tuned_allreduce_intra_recursivedoubling(sbuf, rbuf, count, dtype, op, @@ -525,7 +525,7 @@ ompi_coll_tuned_allreduce_intra_ring(void *sbuf, void *rbuf, int count, return MPI_SUCCESS; error_hndl: - OPAL_OUTPUT((ompi_coll_tuned_stream, "%s:%4d\tRank %d Error occurred %d\n", + ORTE_OUTPUT((ompi_coll_tuned_stream, "%s:%4d\tRank %d Error occurred %d\n", __FILE__, line, rank, ret)); if (NULL != inbuf[0]) free(inbuf[0]); if (NULL != inbuf[1]) free(inbuf[1]); @@ -635,7 +635,7 @@ ompi_coll_tuned_allreduce_intra_ring_segmented(void *sbuf, void *rbuf, int count size = ompi_comm_size(comm); rank = ompi_comm_rank(comm); - OPAL_OUTPUT((ompi_coll_tuned_stream, + ORTE_OUTPUT((ompi_coll_tuned_stream, "coll:tuned:allreduce_intra_ring_segmented rank %d, count %d", rank, count)); /* Special case for size == 1 */ @@ -659,7 +659,7 @@ ompi_coll_tuned_allreduce_intra_ring_segmented(void *sbuf, void *rbuf, int count /* Special case for count less than size * segcount - use regular ring */ if (count < size * segcount) { - OPAL_OUTPUT((ompi_coll_tuned_stream, "coll:tuned:allreduce_ring_segmented rank %d/%d, count %d, switching to regular ring", rank, size, count)); + ORTE_OUTPUT((ompi_coll_tuned_stream, "coll:tuned:allreduce_ring_segmented rank %d/%d, count %d, switching to regular ring", rank, size, count)); return (ompi_coll_tuned_allreduce_intra_ring(sbuf, rbuf, count, dtype, op, comm, module)); } @@ -848,7 +848,7 @@ ompi_coll_tuned_allreduce_intra_ring_segmented(void *sbuf, void *rbuf, int count return MPI_SUCCESS; error_hndl: - OPAL_OUTPUT((ompi_coll_tuned_stream, "%s:%4d\tRank %d Error occurred %d\n", + ORTE_OUTPUT((ompi_coll_tuned_stream, "%s:%4d\tRank %d Error occurred %d\n", __FILE__, line, rank, ret)); if (NULL != inbuf[0]) free(inbuf[0]); if (NULL != inbuf[1]) free(inbuf[1]); @@ -889,7 +889,7 @@ ompi_coll_tuned_allreduce_intra_basic_linear(void *sbuf, void *rbuf, int count, rank = ompi_comm_rank(comm); - OPAL_OUTPUT((ompi_coll_tuned_stream,"coll:tuned:allreduce_intra_basic_linear rank %d", rank)); + ORTE_OUTPUT((ompi_coll_tuned_stream,"coll:tuned:allreduce_intra_basic_linear rank %d", rank)); /* Reduce to 0 and broadcast. */ @@ -943,7 +943,7 @@ int ompi_coll_tuned_allreduce_intra_check_forced_init (coll_tuned_force_algorith mca_base_param_lookup_int( mca_param_indices->algorithm_param_index, &(requested_alg)); if( requested_alg > max_alg ) { if( 0 == ompi_comm_rank( MPI_COMM_WORLD ) ) { - opal_output( 0, "Allreduce algorithm #%d is not available (range [0..%d]). Switching back to ignore(0)\n", + orte_output( 0, "Allreduce algorithm #%d is not available (range [0..%d]). Switching back to ignore(0)\n", requested_alg, max_alg ); } mca_base_param_set_int( mca_param_indices->algorithm_param_index, 0); @@ -983,7 +983,7 @@ int ompi_coll_tuned_allreduce_intra_do_forced(void *sbuf, void *rbuf, int count, mca_coll_tuned_module_t *tuned_module = (mca_coll_tuned_module_t*) module; mca_coll_tuned_comm_t *data = tuned_module->tuned_data; - OPAL_OUTPUT((ompi_coll_tuned_stream,"coll:tuned:allreduce_intra_do_forced selected algorithm %d, segment size %d", + ORTE_OUTPUT((ompi_coll_tuned_stream,"coll:tuned:allreduce_intra_do_forced selected algorithm %d, segment size %d", data->user_forced[ALLREDUCE].algorithm, data->user_forced[ALLREDUCE].segsize)); @@ -995,7 +995,7 @@ int ompi_coll_tuned_allreduce_intra_do_forced(void *sbuf, void *rbuf, int count, case (4): return ompi_coll_tuned_allreduce_intra_ring (sbuf, rbuf, count, dtype, op, comm, module); case (5): return ompi_coll_tuned_allreduce_intra_ring_segmented (sbuf, rbuf, count, dtype, op, comm, module, data->user_forced[ALLREDUCE].segsize); default: - OPAL_OUTPUT((ompi_coll_tuned_stream,"coll:tuned:allreduce_intra_do_forced attempt to select algorithm %d when only 0-%d is valid?", + ORTE_OUTPUT((ompi_coll_tuned_stream,"coll:tuned:allreduce_intra_do_forced attempt to select algorithm %d when only 0-%d is valid?", data->user_forced[ALLREDUCE].algorithm, ompi_coll_tuned_forced_max_algorithms[ALLREDUCE])); return (MPI_ERR_ARG); @@ -1011,7 +1011,7 @@ int ompi_coll_tuned_allreduce_intra_do_this(void *sbuf, void *rbuf, int count, struct mca_coll_base_module_1_1_0_t *module, int algorithm, int faninout, int segsize) { - OPAL_OUTPUT((ompi_coll_tuned_stream,"coll:tuned:allreduce_intra_do_this algorithm %d topo fan in/out %d segsize %d", + ORTE_OUTPUT((ompi_coll_tuned_stream,"coll:tuned:allreduce_intra_do_this algorithm %d topo fan in/out %d segsize %d", algorithm, faninout, segsize)); switch (algorithm) { @@ -1022,7 +1022,7 @@ int ompi_coll_tuned_allreduce_intra_do_this(void *sbuf, void *rbuf, int count, case (4): return ompi_coll_tuned_allreduce_intra_ring (sbuf, rbuf, count, dtype, op, comm, module); case (5): return ompi_coll_tuned_allreduce_intra_ring_segmented (sbuf, rbuf, count, dtype, op, comm, module, segsize); default: - OPAL_OUTPUT((ompi_coll_tuned_stream,"coll:tuned:allreduce_intra_do_this attempt to select algorithm %d when only 0-%d is valid?", + ORTE_OUTPUT((ompi_coll_tuned_stream,"coll:tuned:allreduce_intra_do_this attempt to select algorithm %d when only 0-%d is valid?", algorithm, ompi_coll_tuned_forced_max_algorithms[ALLREDUCE])); return (MPI_ERR_ARG); } /* switch */ diff --git a/ompi/mca/coll/tuned/coll_tuned_alltoall.c b/ompi/mca/coll/tuned/coll_tuned_alltoall.c index d5c9af7e8d..9cf6a149dd 100644 --- a/ompi/mca/coll/tuned/coll_tuned_alltoall.c +++ b/ompi/mca/coll/tuned/coll_tuned_alltoall.c @@ -46,7 +46,7 @@ int ompi_coll_tuned_alltoall_intra_pairwise(void *sbuf, int scount, size = ompi_comm_size(comm); rank = ompi_comm_rank(comm); - OPAL_OUTPUT((ompi_coll_tuned_stream, + ORTE_OUTPUT((ompi_coll_tuned_stream, "coll:tuned:alltoall_intra_pairwise rank %d", rank)); err = ompi_ddt_get_extent (sdtype, &lb, &sext); @@ -78,7 +78,7 @@ int ompi_coll_tuned_alltoall_intra_pairwise(void *sbuf, int scount, return MPI_SUCCESS; err_hndl: - OPAL_OUTPUT((ompi_coll_tuned_stream, + ORTE_OUTPUT((ompi_coll_tuned_stream, "%s:%4d\tError occurred %d, rank %2d", __FILE__, line, err, rank)); return err; @@ -108,7 +108,7 @@ int ompi_coll_tuned_alltoall_intra_bruck(void *sbuf, int scount, size = ompi_comm_size(comm); rank = ompi_comm_rank(comm); - OPAL_OUTPUT((ompi_coll_tuned_stream, + ORTE_OUTPUT((ompi_coll_tuned_stream, "coll:tuned:alltoall_intra_bruck rank %d", rank)); err = ompi_ddt_get_extent (sdtype, &slb, &sext); @@ -221,7 +221,7 @@ int ompi_coll_tuned_alltoall_intra_bruck(void *sbuf, int scount, return OMPI_SUCCESS; err_hndl: - OPAL_OUTPUT((ompi_coll_tuned_stream, + ORTE_OUTPUT((ompi_coll_tuned_stream, "%s:%4d\tError occurred %d, rank %2d", __FILE__, line, err, rank)); if (tmpbuf != NULL) free(tmpbuf_free); @@ -274,7 +274,7 @@ int ompi_coll_tuned_alltoall_intra_linear_sync(void *sbuf, int scount, size = ompi_comm_size(comm); rank = ompi_comm_rank(comm); - OPAL_OUTPUT((ompi_coll_tuned_stream, + ORTE_OUTPUT((ompi_coll_tuned_stream, "ompi_coll_tuned_alltoall_intra_linear_sync rank %d", rank)); @@ -390,7 +390,7 @@ int ompi_coll_tuned_alltoall_intra_linear_sync(void *sbuf, int scount, return MPI_SUCCESS; error_hndl: - OPAL_OUTPUT((ompi_coll_tuned_stream, + ORTE_OUTPUT((ompi_coll_tuned_stream, "%s:%4d\tError occurred %d, rank %2d", __FILE__, line, error, rank)); if (NULL != reqs) free(reqs); @@ -413,7 +413,7 @@ int ompi_coll_tuned_alltoall_intra_two_procs(void *sbuf, int scount, rank = ompi_comm_rank(comm); - OPAL_OUTPUT((ompi_coll_tuned_stream, + ORTE_OUTPUT((ompi_coll_tuned_stream, "ompi_coll_tuned_alltoall_intra_two_procs rank %d", rank)); err = ompi_ddt_get_extent (sdtype, &lb, &sext); @@ -447,7 +447,7 @@ int ompi_coll_tuned_alltoall_intra_two_procs(void *sbuf, int scount, return MPI_SUCCESS; err_hndl: - OPAL_OUTPUT((ompi_coll_tuned_stream, + ORTE_OUTPUT((ompi_coll_tuned_stream, "%s:%4d\tError occurred %d, rank %2d", __FILE__, line, err, rank)); return err; @@ -499,7 +499,7 @@ int ompi_coll_tuned_alltoall_intra_basic_linear(void *sbuf, int scount, size = ompi_comm_size(comm); rank = ompi_comm_rank(comm); - OPAL_OUTPUT((ompi_coll_tuned_stream, + ORTE_OUTPUT((ompi_coll_tuned_stream, "ompi_coll_tuned_alltoall_intra_basic_linear rank %d", rank)); @@ -623,7 +623,7 @@ int ompi_coll_tuned_alltoall_intra_check_forced_init (coll_tuned_force_algorithm mca_base_param_lookup_int(mca_param_indices->algorithm_param_index, &(requested_alg)); if( requested_alg > max_alg ) { if( 0 == ompi_comm_rank( MPI_COMM_WORLD ) ) { - opal_output( 0, "Alltoall algorithm #%d is not available (range [0..%d]). Switching back to ignore(0)\n", + orte_output( 0, "Alltoall algorithm #%d is not available (range [0..%d]). Switching back to ignore(0)\n", requested_alg, max_alg ); } mca_base_param_set_int( mca_param_indices->algorithm_param_index, 0); @@ -661,7 +661,7 @@ int ompi_coll_tuned_alltoall_intra_check_forced_init (coll_tuned_force_algorithm mca_base_param_lookup_int(mca_param_indices->max_requests_param_index, &(max_requests)); if( max_requests <= 1 ) { if( 0 == ompi_comm_rank( MPI_COMM_WORLD ) ) { - opal_output( 0, "Maximum outstanding requests must be positive number greater than 1. Switching to system level default %d \n", + orte_output( 0, "Maximum outstanding requests must be positive number greater than 1. Switching to system level default %d \n", ompi_coll_tuned_init_max_requests ); } mca_base_param_set_int( mca_param_indices->max_requests_param_index, @@ -683,7 +683,7 @@ int ompi_coll_tuned_alltoall_intra_do_forced(void *sbuf, int scount, mca_coll_tuned_module_t *tuned_module = (mca_coll_tuned_module_t*) module; mca_coll_tuned_comm_t *data = tuned_module->tuned_data; - OPAL_OUTPUT((ompi_coll_tuned_stream,"coll:tuned:alltoall_intra_do_forced selected algorithm %d", + ORTE_OUTPUT((ompi_coll_tuned_stream,"coll:tuned:alltoall_intra_do_forced selected algorithm %d", data->user_forced[ALLTOALL].algorithm)); switch (data->user_forced[ALLTOALL].algorithm) { @@ -694,7 +694,7 @@ int ompi_coll_tuned_alltoall_intra_do_forced(void *sbuf, int scount, case (4): return ompi_coll_tuned_alltoall_intra_linear_sync (sbuf, scount, sdtype, rbuf, rcount, rdtype, comm, module, data->user_forced[ALLTOALL].max_requests); case (5): return ompi_coll_tuned_alltoall_intra_two_procs (sbuf, scount, sdtype, rbuf, rcount, rdtype, comm, module); default: - OPAL_OUTPUT((ompi_coll_tuned_stream,"coll:tuned:alltoall_intra_do_forced attempt to select algorithm %d when only 0-%d is valid?", + ORTE_OUTPUT((ompi_coll_tuned_stream,"coll:tuned:alltoall_intra_do_forced attempt to select algorithm %d when only 0-%d is valid?", data->user_forced[ALLTOALL].algorithm, ompi_coll_tuned_forced_max_algorithms[ALLTOALL])); return (MPI_ERR_ARG); } /* switch */ @@ -711,7 +711,7 @@ int ompi_coll_tuned_alltoall_intra_do_this(void *sbuf, int scount, int algorithm, int faninout, int segsize, int max_requests) { - OPAL_OUTPUT((ompi_coll_tuned_stream,"coll:tuned:alltoall_intra_do_this selected algorithm %d topo faninout %d segsize %d", + ORTE_OUTPUT((ompi_coll_tuned_stream,"coll:tuned:alltoall_intra_do_this selected algorithm %d topo faninout %d segsize %d", algorithm, faninout, segsize)); switch (algorithm) { @@ -722,7 +722,7 @@ int ompi_coll_tuned_alltoall_intra_do_this(void *sbuf, int scount, case (4): return ompi_coll_tuned_alltoall_intra_linear_sync (sbuf, scount, sdtype, rbuf, rcount, rdtype, comm, module, max_requests); case (5): return ompi_coll_tuned_alltoall_intra_two_procs (sbuf, scount, sdtype, rbuf, rcount, rdtype, comm, module); default: - OPAL_OUTPUT((ompi_coll_tuned_stream,"coll:tuned:alltoall_intra_do_this attempt to select algorithm %d when only 0-%d is valid?", + ORTE_OUTPUT((ompi_coll_tuned_stream,"coll:tuned:alltoall_intra_do_this attempt to select algorithm %d when only 0-%d is valid?", algorithm, ompi_coll_tuned_forced_max_algorithms[ALLTOALL])); return (MPI_ERR_ARG); } /* switch */ diff --git a/ompi/mca/coll/tuned/coll_tuned_alltoallv.c b/ompi/mca/coll/tuned/coll_tuned_alltoallv.c index 132ee7520a..28ebf3fac8 100644 --- a/ompi/mca/coll/tuned/coll_tuned_alltoallv.c +++ b/ompi/mca/coll/tuned/coll_tuned_alltoallv.c @@ -48,7 +48,7 @@ ompi_coll_tuned_alltoallv_intra_pairwise(void *sbuf, int *scounts, int *sdisps, size = ompi_comm_size(comm); rank = ompi_comm_rank(comm); - OPAL_OUTPUT((ompi_coll_tuned_stream, + ORTE_OUTPUT((ompi_coll_tuned_stream, "coll:tuned:alltoallv_intra_pairwise rank %d", rank)); ompi_ddt_type_extent(sdtype, &sext); @@ -93,7 +93,7 @@ ompi_coll_tuned_alltoallv_intra_pairwise(void *sbuf, int *scounts, int *sdisps, return MPI_SUCCESS; err_hndl: - OPAL_OUTPUT((ompi_coll_tuned_stream, + ORTE_OUTPUT((ompi_coll_tuned_stream, "%s:%4d\tError occurred %d, rank %2d", __FILE__, line, err, rank)); return err; @@ -124,7 +124,7 @@ ompi_coll_tuned_alltoallv_intra_basic_linear(void *sbuf, int *scounts, int *sdis mca_coll_tuned_module_t *tuned_module = (mca_coll_tuned_module_t*) module; mca_coll_tuned_comm_t *data = tuned_module->tuned_data; - OPAL_OUTPUT((ompi_coll_tuned_stream, + ORTE_OUTPUT((ompi_coll_tuned_stream, "coll:tuned:alltoallv_intra_basic_linear rank %d", rank)); size = ompi_comm_size(comm); @@ -237,7 +237,7 @@ int ompi_coll_tuned_alltoallv_intra_check_forced_init(coll_tuned_force_algorithm mca_base_param_lookup_int(mca_param_indices->algorithm_param_index, &(requested_alg)); if (requested_alg > max_alg) { if (0 == ompi_comm_rank( MPI_COMM_WORLD)) { - opal_output(0, "Alltoallv algorithm #%d is not available (range [0..%d]). " + orte_output(0, "Alltoallv algorithm #%d is not available (range [0..%d]). " "Switching back to ignore(0)\n", requested_alg, max_alg ); } @@ -259,7 +259,7 @@ int ompi_coll_tuned_alltoallv_intra_do_forced(void *sbuf, int *scounts, int *sdi mca_coll_tuned_module_t *tuned_module = (mca_coll_tuned_module_t*) module; mca_coll_tuned_comm_t *data = tuned_module->tuned_data; - OPAL_OUTPUT((ompi_coll_tuned_stream, + ORTE_OUTPUT((ompi_coll_tuned_stream, "coll:tuned:alltoallv_intra_do_forced selected algorithm %d", data->user_forced[ALLTOALLV].algorithm)); @@ -277,7 +277,7 @@ int ompi_coll_tuned_alltoallv_intra_do_forced(void *sbuf, int *scounts, int *sdi rbuf, rcounts, rdisps, rdtype, comm, module); default: - OPAL_OUTPUT((ompi_coll_tuned_stream, + ORTE_OUTPUT((ompi_coll_tuned_stream, "coll:tuned:alltoallv_intra_do_forced attempt to " "select algorithm %d when only 0-%d is valid.", data->user_forced[ALLTOALLV].algorithm, @@ -296,7 +296,7 @@ int ompi_coll_tuned_alltoallv_intra_do_this(void *sbuf, int *scounts, int *sdisp struct mca_coll_base_module_1_1_0_t *module, int algorithm) { - OPAL_OUTPUT((ompi_coll_tuned_stream, + ORTE_OUTPUT((ompi_coll_tuned_stream, "coll:tuned:alltoallv_intra_do_this selected algorithm %d ", algorithm)); @@ -314,7 +314,7 @@ int ompi_coll_tuned_alltoallv_intra_do_this(void *sbuf, int *scounts, int *sdisp rbuf, rcounts, rdisps, rdtype, comm, module); default: - OPAL_OUTPUT((ompi_coll_tuned_stream, + ORTE_OUTPUT((ompi_coll_tuned_stream, "coll:tuned:alltoall_intra_do_this attempt to select " "algorithm %d when only 0-%d is valid.", algorithm, ompi_coll_tuned_forced_max_algorithms[ALLTOALLV])); diff --git a/ompi/mca/coll/tuned/coll_tuned_barrier.c b/ompi/mca/coll/tuned/coll_tuned_barrier.c index 327f60882b..6a6a280253 100644 --- a/ompi/mca/coll/tuned/coll_tuned_barrier.c +++ b/ompi/mca/coll/tuned/coll_tuned_barrier.c @@ -60,7 +60,7 @@ int ompi_coll_tuned_barrier_intra_doublering(struct ompi_communicator_t *comm, rank = ompi_comm_rank(comm); size = ompi_comm_size(comm); - OPAL_OUTPUT((ompi_coll_tuned_stream,"ompi_coll_tuned_barrier_intra_doublering rank %d", rank)); + ORTE_OUTPUT((ompi_coll_tuned_stream,"ompi_coll_tuned_barrier_intra_doublering rank %d", rank)); left = ((rank-1)%size); right = ((rank+1)%size); @@ -111,7 +111,7 @@ int ompi_coll_tuned_barrier_intra_doublering(struct ompi_communicator_t *comm, return MPI_SUCCESS; err_hndl: - OPAL_OUTPUT((ompi_coll_tuned_stream,"%s:%4d\tError occurred %d, rank %2d", + ORTE_OUTPUT((ompi_coll_tuned_stream,"%s:%4d\tError occurred %d, rank %2d", __FILE__, line, err, rank)); return err; } @@ -130,7 +130,7 @@ int ompi_coll_tuned_barrier_intra_recursivedoubling(struct ompi_communicator_t * rank = ompi_comm_rank(comm); size = ompi_comm_size(comm); - OPAL_OUTPUT((ompi_coll_tuned_stream, + ORTE_OUTPUT((ompi_coll_tuned_stream, "ompi_coll_tuned_barrier_intra_recursivedoubling rank %d", rank)); @@ -195,7 +195,7 @@ int ompi_coll_tuned_barrier_intra_recursivedoubling(struct ompi_communicator_t * return MPI_SUCCESS; err_hndl: - OPAL_OUTPUT((ompi_coll_tuned_stream,"%s:%4d\tError occurred %d, rank %2d", + ORTE_OUTPUT((ompi_coll_tuned_stream,"%s:%4d\tError occurred %d, rank %2d", __FILE__, line, err, rank)); return err; } @@ -214,7 +214,7 @@ int ompi_coll_tuned_barrier_intra_bruck(struct ompi_communicator_t *comm, rank = ompi_comm_rank(comm); size = ompi_comm_size(comm); - OPAL_OUTPUT((ompi_coll_tuned_stream, + ORTE_OUTPUT((ompi_coll_tuned_stream, "ompi_coll_tuned_barrier_intra_bruck rank %d", rank)); /* exchange data with rank-2^k and rank+2^k */ @@ -234,7 +234,7 @@ int ompi_coll_tuned_barrier_intra_bruck(struct ompi_communicator_t *comm, return MPI_SUCCESS; err_hndl: - OPAL_OUTPUT((ompi_coll_tuned_stream,"%s:%4d\tError occurred %d, rank %2d", + ORTE_OUTPUT((ompi_coll_tuned_stream,"%s:%4d\tError occurred %d, rank %2d", __FILE__, line, err, rank)); return err; } @@ -250,7 +250,7 @@ int ompi_coll_tuned_barrier_intra_two_procs(struct ompi_communicator_t *comm, int remote, err; remote = ompi_comm_rank(comm); - OPAL_OUTPUT((ompi_coll_tuned_stream, + ORTE_OUTPUT((ompi_coll_tuned_stream, "ompi_coll_tuned_barrier_intra_two_procs rank %d", remote)); remote = (remote + 1) & 0x1; @@ -370,7 +370,7 @@ int ompi_coll_tuned_barrier_intra_check_forced_init (coll_tuned_force_algorithm_ &(requested_alg)); if( requested_alg > max_alg ) { if( 0 == ompi_comm_rank( MPI_COMM_WORLD ) ) { - opal_output( 0, "Barrier algorithm #%d is not available (range [0..%d]). Switching back to ignore(0)\n", + orte_output( 0, "Barrier algorithm #%d is not available (range [0..%d]). Switching back to ignore(0)\n", requested_alg, max_alg ); } mca_base_param_set_int( mca_param_indices->algorithm_param_index, 0); @@ -387,7 +387,7 @@ int ompi_coll_tuned_barrier_intra_do_forced(struct ompi_communicator_t *comm, mca_coll_tuned_module_t *tuned_module = (mca_coll_tuned_module_t*) module; mca_coll_tuned_comm_t *data = tuned_module->tuned_data; - OPAL_OUTPUT((ompi_coll_tuned_stream, + ORTE_OUTPUT((ompi_coll_tuned_stream, "coll:tuned:barrier_intra_do_forced selected algorithm %d", data->user_forced[BARRIER].algorithm)); @@ -399,7 +399,7 @@ int ompi_coll_tuned_barrier_intra_do_forced(struct ompi_communicator_t *comm, case (4): return ompi_coll_tuned_barrier_intra_bruck (comm, module); case (5): return ompi_coll_tuned_barrier_intra_two_procs (comm, module); default: - OPAL_OUTPUT((ompi_coll_tuned_stream,"coll:tuned:barrier_intra_do_forced attempt to select algorithm %d when only 0-%d is valid?", + ORTE_OUTPUT((ompi_coll_tuned_stream,"coll:tuned:barrier_intra_do_forced attempt to select algorithm %d when only 0-%d is valid?", data->user_forced[BARRIER].algorithm, ompi_coll_tuned_forced_max_algorithms[BARRIER])); return (MPI_ERR_ARG); @@ -412,7 +412,7 @@ int ompi_coll_tuned_barrier_intra_do_this (struct ompi_communicator_t *comm, struct mca_coll_base_module_1_1_0_t *module, int algorithm, int faninout, int segsize) { - OPAL_OUTPUT((ompi_coll_tuned_stream,"coll:tuned:barrier_intra_do_this selected algorithm %d topo fanin/out%d", algorithm, faninout)); + ORTE_OUTPUT((ompi_coll_tuned_stream,"coll:tuned:barrier_intra_do_this selected algorithm %d topo fanin/out%d", algorithm, faninout)); switch (algorithm) { case (0): return ompi_coll_tuned_barrier_intra_dec_fixed (comm, module); @@ -422,7 +422,7 @@ int ompi_coll_tuned_barrier_intra_do_this (struct ompi_communicator_t *comm, case (4): return ompi_coll_tuned_barrier_intra_bruck (comm, module); case (5): return ompi_coll_tuned_barrier_intra_two_procs (comm, module); default: - OPAL_OUTPUT((ompi_coll_tuned_stream,"coll:tuned:barrier_intra_do_this attempt to select algorithm %d when only 0-%d is valid?", + ORTE_OUTPUT((ompi_coll_tuned_stream,"coll:tuned:barrier_intra_do_this attempt to select algorithm %d when only 0-%d is valid?", algorithm, ompi_coll_tuned_forced_max_algorithms[BARRIER])); return (MPI_ERR_ARG); } /* switch */ diff --git a/ompi/mca/coll/tuned/coll_tuned_bcast.c b/ompi/mca/coll/tuned/coll_tuned_bcast.c index f1e9ad5b9a..42b86a7b6e 100644 --- a/ompi/mca/coll/tuned/coll_tuned_bcast.c +++ b/ompi/mca/coll/tuned/coll_tuned_bcast.c @@ -245,7 +245,7 @@ ompi_coll_tuned_bcast_intra_generic( void* buffer, return (MPI_SUCCESS); error_hndl: - OPAL_OUTPUT( (ompi_coll_tuned_stream,"%s:%4d\tError occurred %d, rank %2d", + ORTE_OUTPUT( (ompi_coll_tuned_stream,"%s:%4d\tError occurred %d, rank %2d", __FILE__, line, err, rank) ); #if !defined(COLL_TUNED_BCAST_USE_BLOCKING) if( NULL != send_reqs ) free(send_reqs); @@ -275,7 +275,7 @@ ompi_coll_tuned_bcast_intra_bintree ( void* buffer, ompi_ddt_type_size( datatype, &typelng ); COLL_TUNED_COMPUTED_SEGCOUNT( segsize, typelng, segcount ); - OPAL_OUTPUT((ompi_coll_tuned_stream,"coll:tuned:bcast_intra_binary rank %d ss %5d typelng %lu segcount %d", + ORTE_OUTPUT((ompi_coll_tuned_stream,"coll:tuned:bcast_intra_binary rank %d ss %5d typelng %lu segcount %d", ompi_comm_rank(comm), segsize, (unsigned long)typelng, segcount)); return ompi_coll_tuned_bcast_intra_generic( buffer, count, datatype, root, comm, module, @@ -304,7 +304,7 @@ ompi_coll_tuned_bcast_intra_pipeline( void* buffer, ompi_ddt_type_size( datatype, &typelng ); COLL_TUNED_COMPUTED_SEGCOUNT( segsize, typelng, segcount ); - OPAL_OUTPUT((ompi_coll_tuned_stream,"coll:tuned:bcast_intra_pipeline rank %d ss %5d typelng %lu segcount %d", + ORTE_OUTPUT((ompi_coll_tuned_stream,"coll:tuned:bcast_intra_pipeline rank %d ss %5d typelng %lu segcount %d", ompi_comm_rank(comm), segsize, (unsigned long)typelng, segcount)); return ompi_coll_tuned_bcast_intra_generic( buffer, count, datatype, root, comm, module, @@ -333,7 +333,7 @@ ompi_coll_tuned_bcast_intra_chain( void* buffer, ompi_ddt_type_size( datatype, &typelng ); COLL_TUNED_COMPUTED_SEGCOUNT( segsize, typelng, segcount ); - OPAL_OUTPUT((ompi_coll_tuned_stream,"coll:tuned:bcast_intra_chain rank %d fo %d ss %5d typelng %lu segcount %d", + ORTE_OUTPUT((ompi_coll_tuned_stream,"coll:tuned:bcast_intra_chain rank %d fo %d ss %5d typelng %lu segcount %d", ompi_comm_rank(comm), chains, segsize, (unsigned long)typelng, segcount)); return ompi_coll_tuned_bcast_intra_generic( buffer, count, datatype, root, comm, module, @@ -362,7 +362,7 @@ ompi_coll_tuned_bcast_intra_binomial( void* buffer, ompi_ddt_type_size( datatype, &typelng ); COLL_TUNED_COMPUTED_SEGCOUNT( segsize, typelng, segcount ); - OPAL_OUTPUT((ompi_coll_tuned_stream,"coll:tuned:bcast_intra_binomial rank %d ss %5d typelng %lu segcount %d", + ORTE_OUTPUT((ompi_coll_tuned_stream,"coll:tuned:bcast_intra_binomial rank %d ss %5d typelng %lu segcount %d", ompi_comm_rank(comm), segsize, (unsigned long)typelng, segcount)); return ompi_coll_tuned_bcast_intra_generic( buffer, count, datatype, root, comm, module, @@ -397,7 +397,7 @@ ompi_coll_tuned_bcast_intra_split_bintree ( void* buffer, size = ompi_comm_size(comm); rank = ompi_comm_rank(comm); - OPAL_OUTPUT((ompi_coll_tuned_stream,"ompi_coll_tuned_bcast_intra_split_bintree rank %d root %d ss %5d", rank, root, segsize)); + ORTE_OUTPUT((ompi_coll_tuned_stream,"ompi_coll_tuned_bcast_intra_split_bintree rank %d root %d ss %5d", rank, root, segsize)); if (size == 1) { return MPI_SUCCESS; @@ -613,7 +613,7 @@ ompi_coll_tuned_bcast_intra_split_bintree ( void* buffer, return (MPI_SUCCESS); error_hndl: - OPAL_OUTPUT((ompi_coll_tuned_stream,"%s:%4d\tError occurred %d, rank %2d", __FILE__,line,err,rank)); + ORTE_OUTPUT((ompi_coll_tuned_stream,"%s:%4d\tError occurred %d, rank %2d", __FILE__,line,err,rank)); return (err); } @@ -658,7 +658,7 @@ ompi_coll_tuned_bcast_intra_basic_linear (void *buff, int count, size = ompi_comm_size(comm); rank = ompi_comm_rank(comm); - OPAL_OUTPUT((ompi_coll_tuned_stream,"ompi_coll_tuned_bcast_intra_basic_linear rank %d root %d", rank, root)); + ORTE_OUTPUT((ompi_coll_tuned_stream,"ompi_coll_tuned_bcast_intra_basic_linear rank %d root %d", rank, root)); /* Non-root receive the data. */ @@ -739,7 +739,7 @@ int ompi_coll_tuned_bcast_intra_check_forced_init (coll_tuned_force_algorithm_mc mca_base_param_lookup_int(mca_param_indices->algorithm_param_index, &(requested_alg)); if( requested_alg > max_alg ) { if( 0 == ompi_comm_rank( MPI_COMM_WORLD ) ) { - opal_output( 0, "Broadcast algorithm #%d is not available (range [0..%d]). Switching back to ignore(0)\n", + orte_output( 0, "Broadcast algorithm #%d is not available (range [0..%d]). Switching back to ignore(0)\n", requested_alg, max_alg ); } mca_base_param_set_int( mca_param_indices->algorithm_param_index, 0); @@ -780,7 +780,7 @@ int ompi_coll_tuned_bcast_intra_do_forced(void *buf, int count, mca_coll_tuned_module_t *tuned_module = (mca_coll_tuned_module_t*) module; mca_coll_tuned_comm_t *data = tuned_module->tuned_data; - OPAL_OUTPUT((ompi_coll_tuned_stream,"coll:tuned:bcast_intra_do_forced algorithm %d", + ORTE_OUTPUT((ompi_coll_tuned_stream,"coll:tuned:bcast_intra_do_forced algorithm %d", data->user_forced[BCAST].algorithm)); switch (data->user_forced[BCAST].algorithm) { @@ -798,7 +798,7 @@ int ompi_coll_tuned_bcast_intra_do_forced(void *buf, int count, case (6): return ompi_coll_tuned_bcast_intra_binomial( buf, count, dtype, root, comm, module, data->user_forced[BCAST].segsize ); default: - OPAL_OUTPUT((ompi_coll_tuned_stream,"coll:tuned:bcast_intra_do_forced attempt to select algorithm %d when only 0-%d is valid?", + ORTE_OUTPUT((ompi_coll_tuned_stream,"coll:tuned:bcast_intra_do_forced attempt to select algorithm %d when only 0-%d is valid?", data->user_forced[BCAST].algorithm, ompi_coll_tuned_forced_max_algorithms[BCAST])); } /* switch */ return (MPI_ERR_ARG); @@ -813,7 +813,7 @@ int ompi_coll_tuned_bcast_intra_do_this(void *buf, int count, int algorithm, int faninout, int segsize) { - OPAL_OUTPUT((ompi_coll_tuned_stream,"coll:tuned:bcast_intra_do_this algorithm %d topo faninout %d segsize %d", + ORTE_OUTPUT((ompi_coll_tuned_stream,"coll:tuned:bcast_intra_do_this algorithm %d topo faninout %d segsize %d", algorithm, faninout, segsize)); switch (algorithm) { @@ -825,7 +825,7 @@ int ompi_coll_tuned_bcast_intra_do_this(void *buf, int count, case (5): return ompi_coll_tuned_bcast_intra_bintree( buf, count, dtype, root, comm, module, segsize ); case (6): return ompi_coll_tuned_bcast_intra_binomial( buf, count, dtype, root, comm, module, segsize ); default: - OPAL_OUTPUT((ompi_coll_tuned_stream,"coll:tuned:bcast_intra_do_this attempt to select algorithm %d when only 0-%d is valid?", + ORTE_OUTPUT((ompi_coll_tuned_stream,"coll:tuned:bcast_intra_do_this attempt to select algorithm %d when only 0-%d is valid?", algorithm, ompi_coll_tuned_forced_max_algorithms[BCAST])); } /* switch */ return (MPI_ERR_ARG); diff --git a/ompi/mca/coll/tuned/coll_tuned_component.c b/ompi/mca/coll/tuned/coll_tuned_component.c index 3c11674e92..47edcc237a 100644 --- a/ompi/mca/coll/tuned/coll_tuned_component.c +++ b/ompi/mca/coll/tuned/coll_tuned_component.c @@ -30,7 +30,9 @@ #include "ompi/mca/coll/coll.h" #include "coll_tuned.h" -#include "opal/util/output.h" +#include "orte/util/output.h" + +#include "orte/util/output.h" /* * Public string showing the coll ompi_tuned component version number @@ -128,7 +130,7 @@ static int tuned_open(void) int verbose; mca_base_param_lookup_int(param, &verbose); if (verbose > 0) { - ompi_coll_tuned_stream = opal_output_open(NULL); + ompi_coll_tuned_stream = orte_output_open(NULL, "COLL", "TUNED", "DEBUG", NULL); } } } @@ -195,7 +197,7 @@ static int tuned_open(void) ompi_coll_tuned_scatter_intra_check_forced_init(&ompi_coll_tuned_forced_params[SCATTER]); } - OPAL_OUTPUT((ompi_coll_tuned_stream, "coll:tuned:component_open: done!")); + ORTE_OUTPUT((ompi_coll_tuned_stream, "coll:tuned:component_open: done!")); return OMPI_SUCCESS; } @@ -204,12 +206,12 @@ static int tuned_open(void) /* i.e. alg table and dynamic changable rules if allocated etc */ static int tuned_close(void) { - OPAL_OUTPUT((ompi_coll_tuned_stream, "coll:tuned:component_close: called")); + ORTE_OUTPUT((ompi_coll_tuned_stream, "coll:tuned:component_close: called")); /* dealloc alg table if allocated */ /* dealloc dynamic changable rules if allocated */ - OPAL_OUTPUT((ompi_coll_tuned_stream, "coll:tuned:component_close: done!")); + ORTE_OUTPUT((ompi_coll_tuned_stream, "coll:tuned:component_close: done!")); return OMPI_SUCCESS; } diff --git a/ompi/mca/coll/tuned/coll_tuned_decision_dynamic.c b/ompi/mca/coll/tuned/coll_tuned_decision_dynamic.c index 0ebe0c5420..c8f5aa6bb1 100644 --- a/ompi/mca/coll/tuned/coll_tuned_decision_dynamic.c +++ b/ompi/mca/coll/tuned/coll_tuned_decision_dynamic.c @@ -63,7 +63,7 @@ ompi_coll_tuned_allreduce_intra_dec_dynamic (void *sbuf, void *rbuf, int count, mca_coll_tuned_module_t *tuned_module = (mca_coll_tuned_module_t*) module; mca_coll_tuned_comm_t *data = tuned_module->tuned_data; - OPAL_OUTPUT((ompi_coll_tuned_stream, "ompi_coll_tuned_allreduce_intra_dec_dynamic")); + ORTE_OUTPUT((ompi_coll_tuned_stream, "ompi_coll_tuned_allreduce_intra_dec_dynamic")); /* check to see if we have some filebased rules */ if (data->com_rules[ALLREDUCE]) { @@ -111,7 +111,7 @@ int ompi_coll_tuned_alltoall_intra_dec_dynamic(void *sbuf, int scount, mca_coll_tuned_module_t *tuned_module = (mca_coll_tuned_module_t*) module; mca_coll_tuned_comm_t *data = tuned_module->tuned_data; - OPAL_OUTPUT((ompi_coll_tuned_stream, "ompi_coll_tuned_alltoall_intra_dec_dynamic")); + ORTE_OUTPUT((ompi_coll_tuned_stream, "ompi_coll_tuned_alltoall_intra_dec_dynamic")); /* check to see if we have some filebased rules */ if (data->com_rules[ALLTOALL]) { @@ -163,7 +163,7 @@ int ompi_coll_tuned_alltoallv_intra_dec_dynamic(void *sbuf, int *scounts, int *s mca_coll_tuned_module_t *tuned_module = (mca_coll_tuned_module_t*) module; mca_coll_tuned_comm_t *data = tuned_module->tuned_data; - OPAL_OUTPUT((ompi_coll_tuned_stream, "ompi_coll_tuned_alltoallv_intra_dec_dynamic")); + ORTE_OUTPUT((ompi_coll_tuned_stream, "ompi_coll_tuned_alltoallv_intra_dec_dynamic")); /* * BEGIN - File Based Rules @@ -198,7 +198,7 @@ int ompi_coll_tuned_barrier_intra_dec_dynamic(struct ompi_communicator_t *comm, mca_coll_tuned_module_t *tuned_module = (mca_coll_tuned_module_t*) module; mca_coll_tuned_comm_t *data = tuned_module->tuned_data; - OPAL_OUTPUT((ompi_coll_tuned_stream,"ompi_coll_tuned_barrier_intra_dec_dynamic")); + ORTE_OUTPUT((ompi_coll_tuned_stream,"ompi_coll_tuned_barrier_intra_dec_dynamic")); /* check to see if we have some filebased rules */ if (data->com_rules[BARRIER]) { @@ -236,7 +236,7 @@ int ompi_coll_tuned_bcast_intra_dec_dynamic(void *buff, int count, mca_coll_tuned_module_t *tuned_module = (mca_coll_tuned_module_t*) module; mca_coll_tuned_comm_t *data = tuned_module->tuned_data; - OPAL_OUTPUT((ompi_coll_tuned_stream, "coll:tuned:bcast_intra_dec_dynamic")); + ORTE_OUTPUT((ompi_coll_tuned_stream, "coll:tuned:bcast_intra_dec_dynamic")); /* check to see if we have some filebased rules */ if (data->com_rules[BCAST]) { @@ -284,7 +284,7 @@ int ompi_coll_tuned_reduce_intra_dec_dynamic( void *sendbuf, void *recvbuf, mca_coll_tuned_module_t *tuned_module = (mca_coll_tuned_module_t*) module; mca_coll_tuned_comm_t *data = tuned_module->tuned_data; - OPAL_OUTPUT((ompi_coll_tuned_stream, "coll:tuned:reduce_intra_dec_dynamic")); + ORTE_OUTPUT((ompi_coll_tuned_stream, "coll:tuned:reduce_intra_dec_dynamic")); /* check to see if we have some filebased rules */ if (data->com_rules[REDUCE]) { @@ -339,7 +339,7 @@ int ompi_coll_tuned_reduce_scatter_intra_dec_dynamic(void *sbuf, void *rbuf, mca_coll_tuned_module_t *tuned_module = (mca_coll_tuned_module_t*) module; mca_coll_tuned_comm_t *data = tuned_module->tuned_data; - OPAL_OUTPUT((ompi_coll_tuned_stream, "coll:tuned:reduce_scatter_intra_dec_dynamic")); + ORTE_OUTPUT((ompi_coll_tuned_stream, "coll:tuned:reduce_scatter_intra_dec_dynamic")); /* check to see if we have some filebased rules */ if (data->com_rules[REDUCESCATTER]) { @@ -394,7 +394,7 @@ int ompi_coll_tuned_allgather_intra_dec_dynamic(void *sbuf, int scount, mca_coll_tuned_module_t *tuned_module = (mca_coll_tuned_module_t*) module; mca_coll_tuned_comm_t *data = tuned_module->tuned_data; - OPAL_OUTPUT((ompi_coll_tuned_stream, + ORTE_OUTPUT((ompi_coll_tuned_stream, "ompi_coll_tuned_allgather_intra_dec_dynamic")); if (data->com_rules[ALLGATHER]) { @@ -454,7 +454,7 @@ int ompi_coll_tuned_allgatherv_intra_dec_dynamic(void *sbuf, int scount, mca_coll_tuned_module_t *tuned_module = (mca_coll_tuned_module_t*) module; mca_coll_tuned_comm_t *data = tuned_module->tuned_data; - OPAL_OUTPUT((ompi_coll_tuned_stream, + ORTE_OUTPUT((ompi_coll_tuned_stream, "ompi_coll_tuned_allgatherv_intra_dec_dynamic")); if (data->com_rules[ALLGATHERV]) { @@ -509,7 +509,7 @@ int ompi_coll_tuned_gather_intra_dec_dynamic(void *sbuf, int scount, mca_coll_tuned_module_t *tuned_module = (mca_coll_tuned_module_t*) module; mca_coll_tuned_comm_t *data = tuned_module->tuned_data; - OPAL_OUTPUT((ompi_coll_tuned_stream, + ORTE_OUTPUT((ompi_coll_tuned_stream, "ompi_coll_tuned_gather_intra_dec_dynamic")); if (data->user_forced[GATHER].algorithm) { @@ -533,7 +533,7 @@ int ompi_coll_tuned_scatter_intra_dec_dynamic(void *sbuf, int scount, mca_coll_tuned_module_t *tuned_module = (mca_coll_tuned_module_t*) module; mca_coll_tuned_comm_t *data = tuned_module->tuned_data; - OPAL_OUTPUT((ompi_coll_tuned_stream, + ORTE_OUTPUT((ompi_coll_tuned_stream, "ompi_coll_tuned_scatter_intra_dec_dynamic")); if (data->user_forced[SCATTER].algorithm) { diff --git a/ompi/mca/coll/tuned/coll_tuned_decision_fixed.c b/ompi/mca/coll/tuned/coll_tuned_decision_fixed.c index 11f202b179..b0515fc7ba 100644 --- a/ompi/mca/coll/tuned/coll_tuned_decision_fixed.c +++ b/ompi/mca/coll/tuned/coll_tuned_decision_fixed.c @@ -47,7 +47,7 @@ ompi_coll_tuned_allreduce_intra_dec_fixed (void *sbuf, void *rbuf, int count, size_t dsize, block_dsize; int comm_size = ompi_comm_size(comm); const size_t intermediate_message = 10000; - OPAL_OUTPUT((ompi_coll_tuned_stream, "ompi_coll_tuned_allreduce_intra_dec_fixed")); + ORTE_OUTPUT((ompi_coll_tuned_stream, "ompi_coll_tuned_allreduce_intra_dec_fixed")); /** * Decision function based on MX results from the Grig cluster at UTK. @@ -141,7 +141,7 @@ int ompi_coll_tuned_alltoall_intra_dec_fixed(void *sbuf, int scount, ompi_ddt_type_size(sdtype, &dsize); total_dsize = dsize * scount * communicator_size; /* needed for decision */ - OPAL_OUTPUT((ompi_coll_tuned_stream, "ompi_coll_tuned_alltoall_intra_dec_fixed rank %d com_size %d msg_length %ld", + ORTE_OUTPUT((ompi_coll_tuned_stream, "ompi_coll_tuned_alltoall_intra_dec_fixed rank %d com_size %d msg_length %ld", ompi_comm_rank(comm), communicator_size, total_dsize)); if (communicator_size >= 12 && total_dsize <= 768) { @@ -185,7 +185,7 @@ int ompi_coll_tuned_barrier_intra_dec_fixed(struct ompi_communicator_t *comm, { int communicator_size = ompi_comm_size(comm); - OPAL_OUTPUT((ompi_coll_tuned_stream, "ompi_coll_tuned_barrier_intra_dec_fixed com_size %d", + ORTE_OUTPUT((ompi_coll_tuned_stream, "ompi_coll_tuned_barrier_intra_dec_fixed com_size %d", communicator_size)); if( 2 == communicator_size ) @@ -244,7 +244,7 @@ int ompi_coll_tuned_bcast_intra_dec_fixed(void *buff, int count, ompi_ddt_type_size(datatype, &dsize); message_size = dsize * (unsigned long)count; /* needed for decision */ - OPAL_OUTPUT((ompi_coll_tuned_stream, "ompi_coll_tuned_bcast_intra_dec_fixed" + ORTE_OUTPUT((ompi_coll_tuned_stream, "ompi_coll_tuned_bcast_intra_dec_fixed" " root %d rank %d com_size %d msg_length %lu", root, ompi_comm_rank(comm), communicator_size, (unsigned long)message_size)); @@ -375,7 +375,7 @@ int ompi_coll_tuned_reduce_intra_dec_fixed( void *sendbuf, void *recvbuf, 0, max_requests); } - OPAL_OUTPUT((ompi_coll_tuned_stream, "ompi_coll_tuned_reduce_intra_dec_fixed" + ORTE_OUTPUT((ompi_coll_tuned_stream, "ompi_coll_tuned_reduce_intra_dec_fixed" "root %d rank %d com_size %d msg_length %lu", root, ompi_comm_rank(comm), communicator_size, (unsigned long)message_size)); @@ -466,7 +466,7 @@ int ompi_coll_tuned_reduce_scatter_intra_dec_fixed( void *sbuf, void *rbuf, const size_t small_message_size = 12 * 1024; const size_t large_message_size = 256 * 1024; - OPAL_OUTPUT((ompi_coll_tuned_stream, "ompi_coll_tuned_reduce_scatter_intra_dec_fixed")); + ORTE_OUTPUT((ompi_coll_tuned_stream, "ompi_coll_tuned_reduce_scatter_intra_dec_fixed")); if( !ompi_op_is_commute(op) ) { return ompi_coll_tuned_reduce_scatter_intra_nonoverlapping (sbuf, rbuf, rcounts, @@ -529,7 +529,7 @@ int ompi_coll_tuned_allgather_intra_dec_fixed(void *sbuf, int scount, ompi_ddt_type_size(sdtype, &dsize); total_dsize = dsize * scount * communicator_size; - OPAL_OUTPUT((ompi_coll_tuned_stream, "ompi_coll_tuned_allgather_intra_dec_fixed" + ORTE_OUTPUT((ompi_coll_tuned_stream, "ompi_coll_tuned_allgather_intra_dec_fixed" " rank %d com_size %d msg_length %lu", ompi_comm_rank(comm), communicator_size, (unsigned long)total_dsize)); @@ -628,7 +628,7 @@ int ompi_coll_tuned_allgatherv_intra_dec_fixed(void *sbuf, int scount, total_dsize += dsize * rcounts[i]; } - OPAL_OUTPUT((ompi_coll_tuned_stream, + ORTE_OUTPUT((ompi_coll_tuned_stream, "ompi_coll_tuned_allgatherv_intra_dec_fixed" " rank %d com_size %d msg_length %lu", ompi_comm_rank(comm), communicator_size, (unsigned long)total_dsize)); @@ -684,7 +684,7 @@ int ompi_coll_tuned_gather_intra_dec_fixed(void *sbuf, int scount, int communicator_size, rank; size_t dsize, block_size; - OPAL_OUTPUT((ompi_coll_tuned_stream, + ORTE_OUTPUT((ompi_coll_tuned_stream, "ompi_coll_tuned_gather_intra_dec_fixed")); communicator_size = ompi_comm_size(comm); @@ -746,7 +746,7 @@ int ompi_coll_tuned_scatter_intra_dec_fixed(void *sbuf, int scount, int communicator_size, rank; size_t dsize, block_size; - OPAL_OUTPUT((ompi_coll_tuned_stream, + ORTE_OUTPUT((ompi_coll_tuned_stream, "ompi_coll_tuned_scatter_intra_dec_fixed")); communicator_size = ompi_comm_size(comm); diff --git a/ompi/mca/coll/tuned/coll_tuned_dynamic_file.c b/ompi/mca/coll/tuned/coll_tuned_dynamic_file.c index ce320cda2d..29bb921a4a 100644 --- a/ompi/mca/coll/tuned/coll_tuned_dynamic_file.c +++ b/ompi/mca/coll/tuned/coll_tuned_dynamic_file.c @@ -26,7 +26,7 @@ #include "ompi/mca/coll/coll.h" #include "ompi/request/request.h" #include "ompi/mca/pml/pml.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "coll_tuned.h" /* need to include our own topo prototypes so we can malloc data on the comm correctly */ @@ -82,23 +82,23 @@ int ompi_coll_tuned_read_rules_config_file (char *fname, ompi_coll_alg_rule_t** int total_msg_count = 0; if (!fname) { - OPAL_OUTPUT((ompi_coll_tuned_stream,"Gave NULL as rule table configuration file for tuned collectives... ignoring!\n")); + ORTE_OUTPUT((ompi_coll_tuned_stream,"Gave NULL as rule table configuration file for tuned collectives... ignoring!\n")); return (-1); } if (!rules) { - OPAL_OUTPUT((ompi_coll_tuned_stream,"Gave NULL as rule table result ptr!... ignoring!\n")); + ORTE_OUTPUT((ompi_coll_tuned_stream,"Gave NULL as rule table result ptr!... ignoring!\n")); return (-2); } if (n_collectives<1) { - OPAL_OUTPUT((ompi_coll_tuned_stream,"Gave %d as max number of collectives in the rule table configuration file for tuned collectives!... ignoring!\n", n_collectives)); + ORTE_OUTPUT((ompi_coll_tuned_stream,"Gave %d as max number of collectives in the rule table configuration file for tuned collectives!... ignoring!\n", n_collectives)); return (-3); } fptr = fopen (fname, "r"); if (!fptr) { - OPAL_OUTPUT((ompi_coll_tuned_stream,"cannot read rules file [%s]\n", fname)); + ORTE_OUTPUT((ompi_coll_tuned_stream,"cannot read rules file [%s]\n", fname)); goto on_file_error; } @@ -107,11 +107,11 @@ int ompi_coll_tuned_read_rules_config_file (char *fname, ompi_coll_alg_rule_t** X = getnext(fptr); if (X<0) { - OPAL_OUTPUT((ompi_coll_tuned_stream,"Could not read number of collectives in configuration file around line %d\n", fileline)); + ORTE_OUTPUT((ompi_coll_tuned_stream,"Could not read number of collectives in configuration file around line %d\n", fileline)); goto on_file_error; } if (X>n_collectives) { - OPAL_OUTPUT((ompi_coll_tuned_stream,"Number of collectives in configuration file %d is greater than number of MPI collectives possible %d ??? error around line %d\n", X, n_collectives, fileline)); + ORTE_OUTPUT((ompi_coll_tuned_stream,"Number of collectives in configuration file %d is greater than number of MPI collectives possible %d ??? error around line %d\n", X, n_collectives, fileline)); goto on_file_error; } @@ -119,20 +119,20 @@ int ompi_coll_tuned_read_rules_config_file (char *fname, ompi_coll_alg_rule_t** CI = getnext (fptr); if (CI<0) { - OPAL_OUTPUT((ompi_coll_tuned_stream,"Could not read next Collective id in configuration file around line %d\n", fileline)); + ORTE_OUTPUT((ompi_coll_tuned_stream,"Could not read next Collective id in configuration file around line %d\n", fileline)); goto on_file_error; } if (CI>=n_collectives) { - OPAL_OUTPUT((ompi_coll_tuned_stream,"Collective id in configuration file %d is greater than MPI collectives possible %d. Error around line %d\n", CI, n_collectives, fileline)); + ORTE_OUTPUT((ompi_coll_tuned_stream,"Collective id in configuration file %d is greater than MPI collectives possible %d. Error around line %d\n", CI, n_collectives, fileline)); goto on_file_error; } if (alg_rules[CI].alg_rule_id != CI) { - OPAL_OUTPUT((ompi_coll_tuned_stream, "Internal error in handling collective ID %d\n", CI)); + ORTE_OUTPUT((ompi_coll_tuned_stream, "Internal error in handling collective ID %d\n", CI)); ompi_coll_tuned_free_all_rules (*rules, n_collectives); return (-4); } - OPAL_OUTPUT((ompi_coll_tuned_stream, "Reading dynamic rule for collective ID %d\n", CI)); + ORTE_OUTPUT((ompi_coll_tuned_stream, "Reading dynamic rule for collective ID %d\n", CI)); alg_p = &alg_rules[CI]; alg_p->alg_rule_id = CI; @@ -141,10 +141,10 @@ int ompi_coll_tuned_read_rules_config_file (char *fname, ompi_coll_alg_rule_t** NCS = getnext (fptr); if (NCS<0) { - OPAL_OUTPUT((ompi_coll_tuned_stream,"Could not read count of communicators for collective ID %d at around line %d\n", CI, fileline)); + ORTE_OUTPUT((ompi_coll_tuned_stream,"Could not read count of communicators for collective ID %d at around line %d\n", CI, fileline)); goto on_file_error; } - OPAL_OUTPUT((ompi_coll_tuned_stream, "Read communicator count %d for dynamic rule for collective ID %d\n", NCS, CI)); + ORTE_OUTPUT((ompi_coll_tuned_stream, "Read communicator count %d for dynamic rule for collective ID %d\n", NCS, CI)); alg_p->n_com_sizes = NCS; alg_p->com_rules = ompi_coll_tuned_mk_com_rules (NCS, CI); @@ -154,7 +154,7 @@ int ompi_coll_tuned_read_rules_config_file (char *fname, ompi_coll_alg_rule_t** CS = getnext (fptr); if (CS<0) { - OPAL_OUTPUT((ompi_coll_tuned_stream,"Could not read communicator size for collective ID %d com rule %d at around line %d\n", CI, ncs, fileline)); + ORTE_OUTPUT((ompi_coll_tuned_stream,"Could not read communicator size for collective ID %d com rule %d at around line %d\n", CI, ncs, fileline)); goto on_file_error; } @@ -162,10 +162,10 @@ int ompi_coll_tuned_read_rules_config_file (char *fname, ompi_coll_alg_rule_t** NMS = getnext (fptr); if (NMS<0) { - OPAL_OUTPUT((ompi_coll_tuned_stream,"Could not read number of message sizes for collective ID %d com rule %d at around line %d\n", CI, ncs, fileline)); + ORTE_OUTPUT((ompi_coll_tuned_stream,"Could not read number of message sizes for collective ID %d com rule %d at around line %d\n", CI, ncs, fileline)); goto on_file_error; } - OPAL_OUTPUT((ompi_coll_tuned_stream, "Read message count %d for dynamic rule for collective ID %d and comm size %d\n", + ORTE_OUTPUT((ompi_coll_tuned_stream, "Read message count %d for dynamic rule for collective ID %d and comm size %d\n", NMS, CI, CS)); com_p->n_msg_sizes = NMS; com_p->msg_rules = ompi_coll_tuned_mk_msg_rules (NMS, CI, ncs, CS); @@ -178,35 +178,35 @@ int ompi_coll_tuned_read_rules_config_file (char *fname, ompi_coll_alg_rule_t** MS = getnext (fptr); if (MS<0) { - OPAL_OUTPUT((ompi_coll_tuned_stream,"Could not read message size for collective ID %d com rule %d msg rule %d at around line %d\n", CI, ncs, nms, fileline)); + ORTE_OUTPUT((ompi_coll_tuned_stream,"Could not read message size for collective ID %d com rule %d msg rule %d at around line %d\n", CI, ncs, nms, fileline)); goto on_file_error; } msg_p->msg_size = MS; ALG = getnext (fptr); if (ALG<0) { - OPAL_OUTPUT((ompi_coll_tuned_stream,"Could not read target algorithm method for collective ID %d com rule %d msg rule %d at around line %d\n", CI, ncs, nms, fileline)); + ORTE_OUTPUT((ompi_coll_tuned_stream,"Could not read target algorithm method for collective ID %d com rule %d msg rule %d at around line %d\n", CI, ncs, nms, fileline)); goto on_file_error; } msg_p->result_alg = ALG; FANINOUT = getnext (fptr); if (FANINOUT<0) { - OPAL_OUTPUT((ompi_coll_tuned_stream,"Could not read fan in/out topo for collective ID %d com rule %d msg rule %d at around line %d\n", CI, ncs, nms, fileline)); + ORTE_OUTPUT((ompi_coll_tuned_stream,"Could not read fan in/out topo for collective ID %d com rule %d msg rule %d at around line %d\n", CI, ncs, nms, fileline)); goto on_file_error; } msg_p->result_topo_faninout = FANINOUT; SS = getnext (fptr); if (SS<0) { - OPAL_OUTPUT((ompi_coll_tuned_stream,"Could not read target segment size for collective ID %d com rule %d msg rule %d at around line %d\n", CI, ncs, nms, fileline)); + ORTE_OUTPUT((ompi_coll_tuned_stream,"Could not read target segment size for collective ID %d com rule %d msg rule %d at around line %d\n", CI, ncs, nms, fileline)); goto on_file_error; } msg_p->result_segsize = SS; if (!nms && MS) { - OPAL_OUTPUT((ompi_coll_tuned_stream,"All algorithms must specify a rule for message size of zero upwards always first!\n")); - OPAL_OUTPUT((ompi_coll_tuned_stream,"Message size was %d for collective ID %d com rule %d msg rule %d at around line %d\n", MS, CI, ncs, nms, fileline)); + ORTE_OUTPUT((ompi_coll_tuned_stream,"All algorithms must specify a rule for message size of zero upwards always first!\n")); + ORTE_OUTPUT((ompi_coll_tuned_stream,"Message size was %d for collective ID %d com rule %d msg rule %d at around line %d\n", MS, CI, ncs, nms, fileline)); goto on_file_error; } @@ -219,17 +219,17 @@ int ompi_coll_tuned_read_rules_config_file (char *fname, ompi_coll_alg_rule_t** } /* comm size */ total_alg_count++; - OPAL_OUTPUT((ompi_coll_tuned_stream, "Done reading dynamic rule for collective ID %d\n", CI)); + ORTE_OUTPUT((ompi_coll_tuned_stream, "Done reading dynamic rule for collective ID %d\n", CI)); } /* per collective */ fclose (fptr); - OPAL_OUTPUT((ompi_coll_tuned_stream,"\nConfigure file Stats\n")); - OPAL_OUTPUT((ompi_coll_tuned_stream,"Collectives with rules\t\t\t: %5d\n", total_alg_count)); - OPAL_OUTPUT((ompi_coll_tuned_stream,"Communicator sizes with rules\t\t: %5d\n", total_com_count)); - OPAL_OUTPUT((ompi_coll_tuned_stream,"Message sizes with rules\t\t: %5d\n", total_msg_count)); - OPAL_OUTPUT((ompi_coll_tuned_stream,"Lines in configuration file read\t\t: %5d\n", fileline)); + ORTE_OUTPUT((ompi_coll_tuned_stream,"\nConfigure file Stats\n")); + ORTE_OUTPUT((ompi_coll_tuned_stream,"Collectives with rules\t\t\t: %5d\n", total_alg_count)); + ORTE_OUTPUT((ompi_coll_tuned_stream,"Communicator sizes with rules\t\t: %5d\n", total_com_count)); + ORTE_OUTPUT((ompi_coll_tuned_stream,"Message sizes with rules\t\t: %5d\n", total_msg_count)); + ORTE_OUTPUT((ompi_coll_tuned_stream,"Lines in configuration file read\t\t: %5d\n", fileline)); /* return the rules to the caller */ *rules = alg_rules; @@ -243,10 +243,10 @@ int ompi_coll_tuned_read_rules_config_file (char *fname, ompi_coll_alg_rule_t** /* we return back a verbose message and a count of -1 algorithms read */ /* draconian but its better than having a bad collective decision table */ - OPAL_OUTPUT((ompi_coll_tuned_stream,"read_rules_config_file: bad configure file [%s]. Read afar as line %d\n", fname, fileline)); - OPAL_OUTPUT((ompi_coll_tuned_stream,"Ignoring user supplied tuned collectives configuration decision file.\n")); - OPAL_OUTPUT((ompi_coll_tuned_stream,"Switching back to [compiled in] fixed decision table.\n")); - OPAL_OUTPUT((ompi_coll_tuned_stream,"Fix errors as listed above and try again.\n")); + ORTE_OUTPUT((ompi_coll_tuned_stream,"read_rules_config_file: bad configure file [%s]. Read afar as line %d\n", fname, fileline)); + ORTE_OUTPUT((ompi_coll_tuned_stream,"Ignoring user supplied tuned collectives configuration decision file.\n")); + ORTE_OUTPUT((ompi_coll_tuned_stream,"Switching back to [compiled in] fixed decision table.\n")); + ORTE_OUTPUT((ompi_coll_tuned_stream,"Fix errors as listed above and try again.\n")); /* deallocate memory if allocated */ if (alg_rules) ompi_coll_tuned_free_all_rules (alg_rules, n_collectives); diff --git a/ompi/mca/coll/tuned/coll_tuned_dynamic_rules.c b/ompi/mca/coll/tuned/coll_tuned_dynamic_rules.c index a5f0171106..83bfcc3a78 100644 --- a/ompi/mca/coll/tuned/coll_tuned_dynamic_rules.c +++ b/ompi/mca/coll/tuned/coll_tuned_dynamic_rules.c @@ -106,14 +106,14 @@ ompi_coll_msg_rule_t* ompi_coll_tuned_mk_msg_rules (int n_msg_rules, int alg_rul int ompi_coll_tuned_dump_msg_rule (ompi_coll_msg_rule_t* msg_p) { if (!msg_p) { - OPAL_OUTPUT((ompi_coll_tuned_stream,"Message rule was a NULL ptr?!\n")); + ORTE_OUTPUT((ompi_coll_tuned_stream,"Message rule was a NULL ptr?!\n")); return (-1); } - OPAL_OUTPUT((ompi_coll_tuned_stream,"alg_id %3d\tcom_id %3d\tcom_size %3d\tmsg_id %3d\t", msg_p->alg_rule_id, + ORTE_OUTPUT((ompi_coll_tuned_stream,"alg_id %3d\tcom_id %3d\tcom_size %3d\tmsg_id %3d\t", msg_p->alg_rule_id, msg_p->com_rule_id, msg_p->mpi_comsize, msg_p->msg_rule_id)); - OPAL_OUTPUT((ompi_coll_tuned_stream,"msg_size %6d -> algorithm %2d\ttopo in/out %2d\tsegsize %5ld\tmax_requests %4d\n", + ORTE_OUTPUT((ompi_coll_tuned_stream,"msg_size %6d -> algorithm %2d\ttopo in/out %2d\tsegsize %5ld\tmax_requests %4d\n", msg_p->msg_size, msg_p->result_alg, msg_p->result_topo_faninout, msg_p->result_segsize, msg_p->result_max_requests)); @@ -126,18 +126,18 @@ int ompi_coll_tuned_dump_com_rule (ompi_coll_com_rule_t* com_p) int i; if (!com_p) { - OPAL_OUTPUT((ompi_coll_tuned_stream,"Com rule was a NULL ptr?!\n")); + ORTE_OUTPUT((ompi_coll_tuned_stream,"Com rule was a NULL ptr?!\n")); return (-1); } - OPAL_OUTPUT((ompi_coll_tuned_stream, "alg_id %3d\tcom_id %3d\tcom_size %3d\t", com_p->alg_rule_id, com_p->com_rule_id, com_p->mpi_comsize)); + ORTE_OUTPUT((ompi_coll_tuned_stream, "alg_id %3d\tcom_id %3d\tcom_size %3d\t", com_p->alg_rule_id, com_p->com_rule_id, com_p->mpi_comsize)); if (!com_p->n_msg_sizes) { - OPAL_OUTPUT((ompi_coll_tuned_stream,"no msgsizes defined\n")); + ORTE_OUTPUT((ompi_coll_tuned_stream,"no msgsizes defined\n")); return (0); } - OPAL_OUTPUT((ompi_coll_tuned_stream,"number of message sizes %3d\n", com_p->n_msg_sizes)); + ORTE_OUTPUT((ompi_coll_tuned_stream,"number of message sizes %3d\n", com_p->n_msg_sizes)); for (i=0;in_msg_sizes;i++) { ompi_coll_tuned_dump_msg_rule (&(com_p->msg_rules[i])); @@ -152,18 +152,18 @@ int ompi_coll_tuned_dump_alg_rule (ompi_coll_alg_rule_t* alg_p) int i; if (!alg_p) { - OPAL_OUTPUT((ompi_coll_tuned_stream,"Algorithm rule was a NULL ptr?!\n")); + ORTE_OUTPUT((ompi_coll_tuned_stream,"Algorithm rule was a NULL ptr?!\n")); return (-1); } - OPAL_OUTPUT((ompi_coll_tuned_stream,"alg_id %3d\t", alg_p->alg_rule_id)); + ORTE_OUTPUT((ompi_coll_tuned_stream,"alg_id %3d\t", alg_p->alg_rule_id)); if (!alg_p->n_com_sizes) { - OPAL_OUTPUT((ompi_coll_tuned_stream,"no coms defined\n")); + ORTE_OUTPUT((ompi_coll_tuned_stream,"no coms defined\n")); return (0); } - OPAL_OUTPUT((ompi_coll_tuned_stream,"number of com sizes %3d\n", alg_p->n_com_sizes)); + ORTE_OUTPUT((ompi_coll_tuned_stream,"number of com sizes %3d\n", alg_p->n_com_sizes)); for (i=0;in_com_sizes;i++) { ompi_coll_tuned_dump_com_rule (&(alg_p->com_rules[i])); @@ -178,11 +178,11 @@ int ompi_coll_tuned_dump_all_rules (ompi_coll_alg_rule_t* alg_p, int n_rules) int i; if (!alg_p) { - OPAL_OUTPUT((ompi_coll_tuned_stream,"Algorithm rule was a NULL ptr?!\n")); + ORTE_OUTPUT((ompi_coll_tuned_stream,"Algorithm rule was a NULL ptr?!\n")); return (-1); } - OPAL_OUTPUT((ompi_coll_tuned_stream,"Number of algorithm rules %3d\n", n_rules)); + ORTE_OUTPUT((ompi_coll_tuned_stream,"Number of algorithm rules %3d\n", n_rules)); for (i=0;imsg_rules; if (!msg_p) { - OPAL_OUTPUT((ompi_coll_tuned_stream,"attempt to free NULL msg_rules when msg count was %d\n", com_p->n_msg_sizes)); + ORTE_OUTPUT((ompi_coll_tuned_stream,"attempt to free NULL msg_rules when msg count was %d\n", com_p->n_msg_sizes)); rc = -1; /* some error */ } else { @@ -236,7 +236,7 @@ int ompi_coll_tuned_free_coms_in_alg_rule (ompi_coll_alg_rule_t* alg_p) ompi_coll_com_rule_t* com_p; if (!alg_p) { - OPAL_OUTPUT((ompi_coll_tuned_stream,"attempt to free NULL alg_rule ptr\n")); + ORTE_OUTPUT((ompi_coll_tuned_stream,"attempt to free NULL alg_rule ptr\n")); return (-1); } @@ -244,7 +244,7 @@ int ompi_coll_tuned_free_coms_in_alg_rule (ompi_coll_alg_rule_t* alg_p) com_p = alg_p->com_rules; if (!com_p) { - OPAL_OUTPUT((ompi_coll_tuned_stream,"attempt to free NULL com_rules when com count was %d\n", alg_p->n_com_sizes)); + ORTE_OUTPUT((ompi_coll_tuned_stream,"attempt to free NULL com_rules when com count was %d\n", alg_p->n_com_sizes)); } else { /* ok, memory exists for the com rules so free their message rules first */ @@ -319,15 +319,15 @@ ompi_coll_com_rule_t* ompi_coll_tuned_get_com_rule_ptr (ompi_coll_alg_rule_t* ru i = best = 0; while (in_com_sizes) { - /* OPAL_OUTPUT((ompi_coll_tuned_stream,"checking comsize %d against alg_id %d com_id %d index %d com_size %d", */ + /* ORTE_OUTPUT((ompi_coll_tuned_stream,"checking comsize %d against alg_id %d com_id %d index %d com_size %d", */ /* mpi_comsize, com_p->alg_rule_id, com_p->com_rule_id, i, com_p->mpi_comsize)); */ if (com_p->mpi_comsize <= mpi_comsize) { best = i; best_com_p = com_p; - /* OPAL_OUTPUT((ompi_coll_tuned_stream(":ok\n")); */ + /* ORTE_OUTPUT((ompi_coll_tuned_stream(":ok\n")); */ } else { - /* OPAL_OUTPUT((ompi_coll_tuned_stream(":nop\n")); */ + /* ORTE_OUTPUT((ompi_coll_tuned_stream(":nop\n")); */ break; } /* go to the next entry */ @@ -335,7 +335,7 @@ ompi_coll_com_rule_t* ompi_coll_tuned_get_com_rule_ptr (ompi_coll_alg_rule_t* ru i++; } - OPAL_OUTPUT((ompi_coll_tuned_stream,"Selected the following com rule id %d\n", best_com_p->com_rule_id)); + ORTE_OUTPUT((ompi_coll_tuned_stream,"Selected the following com rule id %d\n", best_com_p->com_rule_id)); ompi_coll_tuned_dump_com_rule (best_com_p); return (best_com_p); @@ -390,15 +390,15 @@ int ompi_coll_tuned_get_target_method_params (ompi_coll_com_rule_t* base_com_rul i = best = 0; while (in_msg_sizes) { - /* OPAL_OUTPUT((ompi_coll_tuned_stream,"checking mpi_msgsize %d against com_id %d msg_id %d index %d msg_size %d", */ + /* ORTE_OUTPUT((ompi_coll_tuned_stream,"checking mpi_msgsize %d against com_id %d msg_id %d index %d msg_size %d", */ /* mpi_msgsize, msg_p->com_rule_id, msg_p->msg_rule_id, i, msg_p->msg_size)); */ if (msg_p->msg_size <= mpi_msgsize) { best = i; best_msg_p = msg_p; - /* OPAL_OUTPUT((ompi_coll_tuned_stream(":ok\n")); */ + /* ORTE_OUTPUT((ompi_coll_tuned_stream(":ok\n")); */ } else { - /* OPAL_OUTPUT((ompi_coll_tuned_stream(":nop\n")); */ + /* ORTE_OUTPUT((ompi_coll_tuned_stream(":nop\n")); */ break; } /* go to the next entry */ @@ -406,7 +406,7 @@ int ompi_coll_tuned_get_target_method_params (ompi_coll_com_rule_t* base_com_rul i++; } - OPAL_OUTPUT((ompi_coll_tuned_stream,"Selected the following msg rule id %d\n", best_msg_p->msg_rule_id)); + ORTE_OUTPUT((ompi_coll_tuned_stream,"Selected the following msg rule id %d\n", best_msg_p->msg_rule_id)); ompi_coll_tuned_dump_msg_rule (best_msg_p); /* return the segment size */ diff --git a/ompi/mca/coll/tuned/coll_tuned_gather.c b/ompi/mca/coll/tuned/coll_tuned_gather.c index 66fc944644..d4376bc5ba 100644 --- a/ompi/mca/coll/tuned/coll_tuned_gather.c +++ b/ompi/mca/coll/tuned/coll_tuned_gather.c @@ -61,7 +61,7 @@ ompi_coll_tuned_gather_intra_binomial(void *sbuf, int scount, size = ompi_comm_size(comm); rank = ompi_comm_rank(comm); - OPAL_OUTPUT((ompi_coll_tuned_stream, + ORTE_OUTPUT((ompi_coll_tuned_stream, "ompi_coll_tuned_gather_intra_binomial rank %d", rank)); /* create the binomial tree */ @@ -145,7 +145,7 @@ ompi_coll_tuned_gather_intra_binomial(void *sbuf, int scount, mycount = size - vkid; mycount *= rcount; - OPAL_OUTPUT((ompi_coll_tuned_stream, + ORTE_OUTPUT((ompi_coll_tuned_stream, "ompi_coll_tuned_gather_intra_binomial rank %d recv %d mycount = %d", rank, bmtree->tree_next[i], mycount)); @@ -160,7 +160,7 @@ ompi_coll_tuned_gather_intra_binomial(void *sbuf, int scount, if (rank != root) { /* all nodes except root send to parents */ - OPAL_OUTPUT((ompi_coll_tuned_stream, + ORTE_OUTPUT((ompi_coll_tuned_stream, "ompi_coll_tuned_gather_intra_binomial rank %d send %d count %d\n", rank, bmtree->tree_prev, total_recv)); @@ -195,7 +195,7 @@ ompi_coll_tuned_gather_intra_binomial(void *sbuf, int scount, if (NULL != tempbuf) free(tempbuf); - OPAL_OUTPUT((ompi_coll_tuned_stream, "%s:%4d\tError occurred %d, rank %2d", + ORTE_OUTPUT((ompi_coll_tuned_stream, "%s:%4d\tError occurred %d, rank %2d", __FILE__, line, err, rank)); return err; } @@ -229,7 +229,7 @@ ompi_coll_tuned_gather_intra_linear_sync(void *sbuf, int scount, rank = ompi_comm_rank(comm); - OPAL_OUTPUT((ompi_coll_tuned_stream, + ORTE_OUTPUT((ompi_coll_tuned_stream, "ompi_coll_tuned_gather_intra_linear_sync rank %d, segment %d", rank, first_segment_size)); if (rank != root) { @@ -335,7 +335,7 @@ ompi_coll_tuned_gather_intra_linear_sync(void *sbuf, int scount, return MPI_SUCCESS; error_hndl: - OPAL_OUTPUT (( ompi_coll_tuned_stream, + ORTE_OUTPUT (( ompi_coll_tuned_stream, "ERROR_HNDL: node %d file %s line %d error %d\n", rank, __FILE__, line, ret )); return ret; @@ -383,7 +383,7 @@ ompi_coll_tuned_gather_intra_basic_linear(void *sbuf, int scount, rank = ompi_comm_rank(comm); /* Everyone but root sends data and returns. */ - OPAL_OUTPUT((ompi_coll_tuned_stream, + ORTE_OUTPUT((ompi_coll_tuned_stream, "ompi_coll_tuned_gather_intra_basic_linear rank %d", rank)); if (rank != root) { @@ -454,7 +454,7 @@ ompi_coll_tuned_gather_intra_check_forced_init(coll_tuned_force_algorithm_mca_pa &(requested_alg)); if( requested_alg > max_alg ) { if( 0 == ompi_comm_rank( MPI_COMM_WORLD ) ) { - opal_output( 0, "Gather algorithm #%d is not available (range [0..%d]). Switching back to ignore(0)\n", + orte_output( 0, "Gather algorithm #%d is not available (range [0..%d]). Switching back to ignore(0)\n", requested_alg, max_alg ); } mca_base_param_set_int( mca_param_indices->algorithm_param_index, 0); @@ -497,7 +497,7 @@ ompi_coll_tuned_gather_intra_do_forced(void *sbuf, int scount, mca_coll_tuned_module_t *tuned_module = (mca_coll_tuned_module_t*) module; mca_coll_tuned_comm_t *data = tuned_module->tuned_data; - OPAL_OUTPUT((ompi_coll_tuned_stream, + ORTE_OUTPUT((ompi_coll_tuned_stream, "coll:tuned:gather_intra_do_forced selected algorithm %d", data->user_forced[GATHER].algorithm)); @@ -523,7 +523,7 @@ ompi_coll_tuned_gather_intra_do_forced(void *sbuf, int scount, first_segment_size); } default: - OPAL_OUTPUT((ompi_coll_tuned_stream, + ORTE_OUTPUT((ompi_coll_tuned_stream, "coll:tuned:gather_intra_do_forced attempt to select algorithm %d when only 0-%d is valid?", data->user_forced[GATHER].algorithm, ompi_coll_tuned_forced_max_algorithms[GATHER])); @@ -541,7 +541,7 @@ ompi_coll_tuned_gather_intra_do_this(void *sbuf, int scount, struct mca_coll_base_module_1_1_0_t *module, int algorithm, int faninout, int segsize) { - OPAL_OUTPUT((ompi_coll_tuned_stream, + ORTE_OUTPUT((ompi_coll_tuned_stream, "coll:tuned:gather_intra_do_this selected algorithm %d topo faninout %d segsize %d", algorithm, faninout, segsize)); @@ -565,7 +565,7 @@ ompi_coll_tuned_gather_intra_do_this(void *sbuf, int scount, segsize); default: - OPAL_OUTPUT((ompi_coll_tuned_stream, + ORTE_OUTPUT((ompi_coll_tuned_stream, "coll:tuned:gather_intra_do_this attempt to select algorithm %d when only 0-%d is valid?", algorithm, ompi_coll_tuned_forced_max_algorithms[GATHER])); diff --git a/ompi/mca/coll/tuned/coll_tuned_module.c b/ompi/mca/coll/tuned/coll_tuned_module.c index 7cf69490c1..551b2818be 100644 --- a/ompi/mca/coll/tuned/coll_tuned_module.c +++ b/ompi/mca/coll/tuned/coll_tuned_module.c @@ -59,7 +59,7 @@ ompi_coll_tuned_comm_query(struct ompi_communicator_t *comm, int *priority) { mca_coll_tuned_module_t *tuned_module; - OPAL_OUTPUT((ompi_coll_tuned_stream, "coll:tuned:module_tuned query called")); + ORTE_OUTPUT((ompi_coll_tuned_stream, "coll:tuned:module_tuned query called")); /** * If it is inter-communicator and size is less than 2 we have specialized modules @@ -73,9 +73,9 @@ ompi_coll_tuned_comm_query(struct ompi_communicator_t *comm, int *priority) if (OMPI_COMM_IS_INTER(comm)) { #if 0 if (ompi_coll_tuned_use_dynamic_rules) { - OPAL_OUTPUT((ompi_coll_tuned_stream,"coll:tuned:module_query using inter_dynamic")); + ORTE_OUTPUT((ompi_coll_tuned_stream,"coll:tuned:module_query using inter_dynamic")); } else { - OPAL_OUTPUT((ompi_coll_tuned_stream,"coll:tuned:module_query using inter_fixed")); + ORTE_OUTPUT((ompi_coll_tuned_stream,"coll:tuned:module_query using inter_fixed")); } #endif @@ -99,7 +99,7 @@ ompi_coll_tuned_comm_query(struct ompi_communicator_t *comm, int *priority) tuned_module->super.ft_event = mca_coll_tuned_ft_event; if (ompi_coll_tuned_use_dynamic_rules) { - OPAL_OUTPUT((ompi_coll_tuned_stream,"coll:tuned:module_query using intra_dynamic")); + ORTE_OUTPUT((ompi_coll_tuned_stream,"coll:tuned:module_query using intra_dynamic")); tuned_module->super.coll_allgather = ompi_coll_tuned_allgather_intra_dec_dynamic; tuned_module->super.coll_allgatherv = ompi_coll_tuned_allgatherv_intra_dec_dynamic; @@ -119,7 +119,7 @@ ompi_coll_tuned_comm_query(struct ompi_communicator_t *comm, int *priority) tuned_module->super.coll_scatterv = NULL; } else { - OPAL_OUTPUT((ompi_coll_tuned_stream,"coll:tuned:module_query using intra_fixed")); + ORTE_OUTPUT((ompi_coll_tuned_stream,"coll:tuned:module_query using intra_fixed")); tuned_module->super.coll_allgather = ompi_coll_tuned_allgather_intra_dec_fixed; tuned_module->super.coll_allgatherv = ompi_coll_tuned_allgatherv_intra_dec_fixed; @@ -159,7 +159,7 @@ tuned_module_enable(struct mca_coll_base_module_1_1_0_t *module, int i; - OPAL_OUTPUT((ompi_coll_tuned_stream,"coll:tuned:module_init called.")); + ORTE_OUTPUT((ompi_coll_tuned_stream,"coll:tuned:module_init called.")); /* This routine will become more complex and might have to be */ /* broken into more sections/function calls */ @@ -263,14 +263,14 @@ tuned_module_enable(struct mca_coll_base_module_1_1_0_t *module, if (&ompi_mpi_comm_world==comm) { if (ompi_coll_tuned_use_dynamic_rules) { - OPAL_OUTPUT((ompi_coll_tuned_stream,"coll:tuned:module_init MCW & Dynamic")); + ORTE_OUTPUT((ompi_coll_tuned_stream,"coll:tuned:module_init MCW & Dynamic")); if (ompi_coll_tuned_dynamic_rules_filename) { - OPAL_OUTPUT((ompi_coll_tuned_stream,"coll:tuned:module_init Opening [%s]", + ORTE_OUTPUT((ompi_coll_tuned_stream,"coll:tuned:module_init Opening [%s]", ompi_coll_tuned_dynamic_rules_filename)); rc = ompi_coll_tuned_read_rules_config_file (ompi_coll_tuned_dynamic_rules_filename, &(data->all_base_rules), COLLCOUNT); if (rc>=0) { - OPAL_OUTPUT((ompi_coll_tuned_stream,"coll:tuned:module_init Read %d valid rules\n", rc)); + ORTE_OUTPUT((ompi_coll_tuned_stream,"coll:tuned:module_init Read %d valid rules\n", rc)); /* at this point we all have a base set of rules */ /* now we can get our customized communicator sized rule set, for each collective */ for (i=0;iall_base_rules)) { - OPAL_OUTPUT((ompi_coll_tuned_stream,"coll:tuned:module_init NOT MCW & Dynamic")); + ORTE_OUTPUT((ompi_coll_tuned_stream,"coll:tuned:module_init NOT MCW & Dynamic")); /* this will, erm fail if MCW doesn't exist which it should! */ data->all_base_rules = (ompi_mpi_comm_world.c_coll_selected_data)->all_base_rules; @@ -350,7 +350,7 @@ tuned_module_enable(struct mca_coll_base_module_1_1_0_t *module, tuned_module->tuned_data = data; - OPAL_OUTPUT((ompi_coll_tuned_stream,"coll:tuned:module_init Tuned is in use")); + ORTE_OUTPUT((ompi_coll_tuned_stream,"coll:tuned:module_init Tuned is in use")); return OMPI_SUCCESS; } diff --git a/ompi/mca/coll/tuned/coll_tuned_reduce.c b/ompi/mca/coll/tuned/coll_tuned_reduce.c index 5c00035f38..e34eed22e0 100644 --- a/ompi/mca/coll/tuned/coll_tuned_reduce.c +++ b/ompi/mca/coll/tuned/coll_tuned_reduce.c @@ -70,7 +70,7 @@ int ompi_coll_tuned_reduce_generic( void* sendbuf, void* recvbuf, int original_c sendtmpbuf = (char *)recvbuf; } - OPAL_OUTPUT((ompi_coll_tuned_stream, "coll:tuned:reduce_generic count %d, msg size %ld, segsize %ld, max_requests %d", original_count, (unsigned long)(num_segments * segment_increment), (unsigned long)segment_increment, max_outstanding_reqs)); + ORTE_OUTPUT((ompi_coll_tuned_stream, "coll:tuned:reduce_generic count %d, msg size %ld, segsize %ld, max_requests %d", original_count, (unsigned long)(num_segments * segment_increment), (unsigned long)segment_increment, max_outstanding_reqs)); rank = ompi_comm_rank(comm); @@ -326,7 +326,7 @@ int ompi_coll_tuned_reduce_generic( void* sendbuf, void* recvbuf, int original_c return OMPI_SUCCESS; error_hndl: /* error handler */ - OPAL_OUTPUT (( ompi_coll_tuned_stream, + ORTE_OUTPUT (( ompi_coll_tuned_stream, "ERROR_HNDL: node %d file %s line %d error %d\n", rank, __FILE__, line, ret )); if( inbuf_free[0] != NULL ) free(inbuf_free[0]); @@ -355,7 +355,7 @@ int ompi_coll_tuned_reduce_intra_chain( void *sendbuf, void *recvbuf, int count, mca_coll_tuned_module_t *tuned_module = (mca_coll_tuned_module_t*) module; mca_coll_tuned_comm_t *data = tuned_module->tuned_data; - OPAL_OUTPUT((ompi_coll_tuned_stream,"coll:tuned:reduce_intra_chain rank %d fo %d ss %5d", ompi_comm_rank(comm), fanout, segsize)); + ORTE_OUTPUT((ompi_coll_tuned_stream,"coll:tuned:reduce_intra_chain rank %d fo %d ss %5d", ompi_comm_rank(comm), fanout, segsize)); COLL_TUNED_UPDATE_CHAIN( comm, tuned_module, root, fanout ); /** @@ -385,7 +385,7 @@ int ompi_coll_tuned_reduce_intra_pipeline( void *sendbuf, void *recvbuf, mca_coll_tuned_module_t *tuned_module = (mca_coll_tuned_module_t*) module; mca_coll_tuned_comm_t *data = tuned_module->tuned_data; - OPAL_OUTPUT((ompi_coll_tuned_stream,"coll:tuned:reduce_intra_pipeline rank %d ss %5d", + ORTE_OUTPUT((ompi_coll_tuned_stream,"coll:tuned:reduce_intra_pipeline rank %d ss %5d", ompi_comm_rank(comm), segsize)); COLL_TUNED_UPDATE_PIPELINE( comm, tuned_module, root ); @@ -416,7 +416,7 @@ int ompi_coll_tuned_reduce_intra_binary( void *sendbuf, void *recvbuf, mca_coll_tuned_module_t *tuned_module = (mca_coll_tuned_module_t*) module; mca_coll_tuned_comm_t *data = tuned_module->tuned_data; - OPAL_OUTPUT((ompi_coll_tuned_stream,"coll:tuned:reduce_intra_binary rank %d ss %5d", + ORTE_OUTPUT((ompi_coll_tuned_stream,"coll:tuned:reduce_intra_binary rank %d ss %5d", ompi_comm_rank(comm), segsize)); COLL_TUNED_UPDATE_BINTREE( comm, tuned_module, root ); @@ -447,7 +447,7 @@ int ompi_coll_tuned_reduce_intra_binomial( void *sendbuf, void *recvbuf, mca_coll_tuned_module_t *tuned_module = (mca_coll_tuned_module_t*) module; mca_coll_tuned_comm_t *data = tuned_module->tuned_data; - OPAL_OUTPUT((ompi_coll_tuned_stream,"coll:tuned:reduce_intra_binomial rank %d ss %5d", + ORTE_OUTPUT((ompi_coll_tuned_stream,"coll:tuned:reduce_intra_binomial rank %d ss %5d", ompi_comm_rank(comm), segsize)); COLL_TUNED_UPDATE_IN_ORDER_BMTREE( comm, tuned_module, root ); @@ -491,7 +491,7 @@ int ompi_coll_tuned_reduce_intra_in_order_binary( void *sendbuf, void *recvbuf, rank = ompi_comm_rank(comm); size = ompi_comm_size(comm); - OPAL_OUTPUT((ompi_coll_tuned_stream,"coll:tuned:reduce_intra_in_order_binary rank %d ss %5d", + ORTE_OUTPUT((ompi_coll_tuned_stream,"coll:tuned:reduce_intra_in_order_binary rank %d ss %5d", rank, segsize)); COLL_TUNED_UPDATE_IN_ORDER_BINTREE( comm, tuned_module ); @@ -611,7 +611,7 @@ ompi_coll_tuned_reduce_intra_basic_linear(void *sbuf, void *rbuf, int count, rank = ompi_comm_rank(comm); size = ompi_comm_size(comm); - OPAL_OUTPUT((ompi_coll_tuned_stream,"coll:tuned:reduce_intra_basic_linear rank %d", rank)); + ORTE_OUTPUT((ompi_coll_tuned_stream,"coll:tuned:reduce_intra_basic_linear rank %d", rank)); /* If not root, send data to the root. */ @@ -732,7 +732,7 @@ int ompi_coll_tuned_reduce_intra_check_forced_init (coll_tuned_force_algorithm_m mca_base_param_lookup_int(mca_param_indices->algorithm_param_index, &(requested_alg)); if( requested_alg > max_alg ) { if( 0 == ompi_comm_rank( MPI_COMM_WORLD ) ) { - opal_output( 0, "Reduce algorithm #%d is not available (range [0..%d]). Switching back to ignore(0)\n", + orte_output( 0, "Reduce algorithm #%d is not available (range [0..%d]). Switching back to ignore(0)\n", requested_alg, max_alg ); } mca_base_param_set_int( mca_param_indices->algorithm_param_index, 0); @@ -770,7 +770,7 @@ int ompi_coll_tuned_reduce_intra_check_forced_init (coll_tuned_force_algorithm_m mca_base_param_lookup_int(mca_param_indices->max_requests_param_index, &(max_requests)); if( max_requests < 0 ) { if( 0 == ompi_comm_rank( MPI_COMM_WORLD ) ) { - opal_output( 0, "Maximum outstanding requests must be positive number or 0. Initializing to 0 (no limit).\n" ); + orte_output( 0, "Maximum outstanding requests must be positive number or 0. Initializing to 0 (no limit).\n" ); } mca_base_param_set_int( mca_param_indices->max_requests_param_index, 0); } @@ -792,7 +792,7 @@ int ompi_coll_tuned_reduce_intra_do_forced(void *sbuf, void* rbuf, int count, const int chain_fanout = data->user_forced[REDUCE].chain_fanout; const int max_requests = data->user_forced[REDUCE].max_requests; - OPAL_OUTPUT((ompi_coll_tuned_stream,"coll:tuned:reduce_intra_do_forced selected algorithm %d", + ORTE_OUTPUT((ompi_coll_tuned_stream,"coll:tuned:reduce_intra_do_forced selected algorithm %d", data->user_forced[REDUCE].algorithm)); @@ -817,7 +817,7 @@ int ompi_coll_tuned_reduce_intra_do_forced(void *sbuf, void* rbuf, int count, op, root, comm, module, segsize, max_requests); default: - OPAL_OUTPUT((ompi_coll_tuned_stream,"coll:tuned:reduce_intra_do_forced attempt to select algorithm %d when only 0-%d is valid?", + ORTE_OUTPUT((ompi_coll_tuned_stream,"coll:tuned:reduce_intra_do_forced attempt to select algorithm %d when only 0-%d is valid?", data->user_forced[REDUCE].algorithm, ompi_coll_tuned_forced_max_algorithms[REDUCE])); return (MPI_ERR_ARG); } /* switch */ @@ -832,7 +832,7 @@ int ompi_coll_tuned_reduce_intra_do_this(void *sbuf, void* rbuf, int count, int algorithm, int faninout, int segsize, int max_requests ) { - OPAL_OUTPUT((ompi_coll_tuned_stream,"coll:tuned:reduce_intra_do_this selected algorithm %d topo faninout %d segsize %d", + ORTE_OUTPUT((ompi_coll_tuned_stream,"coll:tuned:reduce_intra_do_this selected algorithm %d topo faninout %d segsize %d", algorithm, faninout, segsize)); switch (algorithm) { @@ -856,7 +856,7 @@ int ompi_coll_tuned_reduce_intra_do_this(void *sbuf, void* rbuf, int count, op, root, comm, module, segsize, max_requests); default: - OPAL_OUTPUT((ompi_coll_tuned_stream,"coll:tuned:reduce_intra_do_this attempt to select algorithm %d when only 0-%d is valid?", + ORTE_OUTPUT((ompi_coll_tuned_stream,"coll:tuned:reduce_intra_do_this attempt to select algorithm %d when only 0-%d is valid?", algorithm, ompi_coll_tuned_forced_max_algorithms[REDUCE])); return (MPI_ERR_ARG); } /* switch */ diff --git a/ompi/mca/coll/tuned/coll_tuned_reduce_scatter.c b/ompi/mca/coll/tuned/coll_tuned_reduce_scatter.c index bd2131fbbe..1647e92b55 100644 --- a/ompi/mca/coll/tuned/coll_tuned_reduce_scatter.c +++ b/ompi/mca/coll/tuned/coll_tuned_reduce_scatter.c @@ -54,7 +54,7 @@ int ompi_coll_tuned_reduce_scatter_intra_nonoverlapping(void *sbuf, void *rbuf, rank = ompi_comm_rank(comm); size = ompi_comm_size(comm); - OPAL_OUTPUT((ompi_coll_tuned_stream,"coll:tuned:reduce_scatter_intra_nonoverlapping, rank %d", rank)); + ORTE_OUTPUT((ompi_coll_tuned_stream,"coll:tuned:reduce_scatter_intra_nonoverlapping, rank %d", rank)); for (i = 0, total_count = 0; i < size; i++) { total_count += rcounts[i]; } @@ -140,7 +140,7 @@ ompi_coll_tuned_reduce_scatter_intra_basic_recursivehalving(void *sbuf, rank = ompi_comm_rank(comm); size = ompi_comm_size(comm); - OPAL_OUTPUT((ompi_coll_tuned_stream,"coll:tuned:reduce_scatter_intra_basic_recursivehalving, rank %d", rank)); + ORTE_OUTPUT((ompi_coll_tuned_stream,"coll:tuned:reduce_scatter_intra_basic_recursivehalving, rank %d", rank)); /* Find displacements and the like */ disps = (int*) malloc(sizeof(int) * size); @@ -470,7 +470,7 @@ ompi_coll_tuned_reduce_scatter_intra_ring(void *sbuf, void *rbuf, int *rcounts, size = ompi_comm_size(comm); rank = ompi_comm_rank(comm); - OPAL_OUTPUT((ompi_coll_tuned_stream, + ORTE_OUTPUT((ompi_coll_tuned_stream, "coll:tuned:reduce_scatter_intra_ring rank %d, size %d", rank, size)); @@ -614,7 +614,7 @@ ompi_coll_tuned_reduce_scatter_intra_ring(void *sbuf, void *rbuf, int *rcounts, return MPI_SUCCESS; error_hndl: - OPAL_OUTPUT((ompi_coll_tuned_stream, "%s:%4d\tRank %d Error occurred %d\n", + ORTE_OUTPUT((ompi_coll_tuned_stream, "%s:%4d\tRank %d Error occurred %d\n", __FILE__, line, rank, ret)); if (NULL != displs) free(displs); if (NULL != accumbuf_free) free(accumbuf_free); @@ -654,7 +654,7 @@ int ompi_coll_tuned_reduce_scatter_intra_check_forced_init (coll_tuned_force_alg mca_base_param_lookup_int(mca_param_indices->algorithm_param_index, &(requested_alg)); if( requested_alg > max_alg ) { if( 0 == ompi_comm_rank( MPI_COMM_WORLD ) ) { - opal_output( 0, "Reduce_scatter algorithm #%d is not available (range [0..%d]). Switching back to ignore(0)\n", + orte_output( 0, "Reduce_scatter algorithm #%d is not available (range [0..%d]). Switching back to ignore(0)\n", requested_alg, max_alg ); } mca_base_param_set_int( mca_param_indices->algorithm_param_index, 0); @@ -695,7 +695,7 @@ int ompi_coll_tuned_reduce_scatter_intra_do_forced(void *sbuf, void* rbuf, mca_coll_tuned_module_t *tuned_module = (mca_coll_tuned_module_t*) module; mca_coll_tuned_comm_t *data = tuned_module->tuned_data; - OPAL_OUTPUT((ompi_coll_tuned_stream,"coll:tuned:reduce_scatter_intra_do_forced selected algorithm %d", + ORTE_OUTPUT((ompi_coll_tuned_stream,"coll:tuned:reduce_scatter_intra_do_forced selected algorithm %d", data->user_forced[REDUCESCATTER].algorithm)); switch (data->user_forced[REDUCESCATTER].algorithm) { @@ -708,7 +708,7 @@ int ompi_coll_tuned_reduce_scatter_intra_do_forced(void *sbuf, void* rbuf, case (3): return ompi_coll_tuned_reduce_scatter_intra_ring (sbuf, rbuf, rcounts, dtype, op, comm, module); default: - OPAL_OUTPUT((ompi_coll_tuned_stream,"coll:tuned:reduce_scatter_intra_do_forced attempt to select algorithm %d when only 0-%d is valid?", + ORTE_OUTPUT((ompi_coll_tuned_stream,"coll:tuned:reduce_scatter_intra_do_forced attempt to select algorithm %d when only 0-%d is valid?", data->user_forced[REDUCESCATTER].algorithm, ompi_coll_tuned_forced_max_algorithms[REDUCESCATTER])); return (MPI_ERR_ARG); } /* switch */ @@ -723,7 +723,7 @@ int ompi_coll_tuned_reduce_scatter_intra_do_this(void *sbuf, void* rbuf, struct mca_coll_base_module_1_1_0_t *module, int algorithm, int faninout, int segsize) { - OPAL_OUTPUT((ompi_coll_tuned_stream,"coll:tuned:reduce_scatter_intra_do_this selected algorithm %d topo faninout %d segsize %d", + ORTE_OUTPUT((ompi_coll_tuned_stream,"coll:tuned:reduce_scatter_intra_do_this selected algorithm %d topo faninout %d segsize %d", algorithm, faninout, segsize)); switch (algorithm) { @@ -736,7 +736,7 @@ int ompi_coll_tuned_reduce_scatter_intra_do_this(void *sbuf, void* rbuf, case (3): return ompi_coll_tuned_reduce_scatter_intra_ring (sbuf, rbuf, rcounts, dtype, op, comm, module); default: - OPAL_OUTPUT((ompi_coll_tuned_stream,"coll:tuned:reduce_scatter_intra_do_this attempt to select algorithm %d when only 0-%d is valid?", + ORTE_OUTPUT((ompi_coll_tuned_stream,"coll:tuned:reduce_scatter_intra_do_this attempt to select algorithm %d when only 0-%d is valid?", algorithm, ompi_coll_tuned_forced_max_algorithms[REDUCESCATTER])); return (MPI_ERR_ARG); } /* switch */ diff --git a/ompi/mca/coll/tuned/coll_tuned_scatter.c b/ompi/mca/coll/tuned/coll_tuned_scatter.c index 5652463983..1bb01c2512 100644 --- a/ompi/mca/coll/tuned/coll_tuned_scatter.c +++ b/ompi/mca/coll/tuned/coll_tuned_scatter.c @@ -59,7 +59,7 @@ ompi_coll_tuned_scatter_intra_binomial(void *sbuf, int scount, size = ompi_comm_size(comm); rank = ompi_comm_rank(comm); - OPAL_OUTPUT((ompi_coll_tuned_stream, + ORTE_OUTPUT((ompi_coll_tuned_stream, "ompi_coll_tuned_scatter_intra_binomial rank %d", rank)); /* create the binomial tree */ @@ -174,7 +174,7 @@ ompi_coll_tuned_scatter_intra_binomial(void *sbuf, int scount, if (NULL != tempbuf) free(tempbuf); - OPAL_OUTPUT((ompi_coll_tuned_stream, "%s:%4d\tError occurred %d, rank %2d", + ORTE_OUTPUT((ompi_coll_tuned_stream, "%s:%4d\tError occurred %d, rank %2d", __FILE__, line, err, rank)); return err; } @@ -294,7 +294,7 @@ ompi_coll_tuned_scatter_intra_check_forced_init(coll_tuned_force_algorithm_mca_p &(requested_alg)); if( requested_alg > max_alg ) { if( 0 == ompi_comm_rank( MPI_COMM_WORLD ) ) { - opal_output( 0, "Scatter algorithm #%d is not available (range [0..%d]). Switching back to ignore(0)\n", + orte_output( 0, "Scatter algorithm #%d is not available (range [0..%d]). Switching back to ignore(0)\n", requested_alg, max_alg ); } mca_base_param_set_int( mca_param_indices->algorithm_param_index, 0); @@ -337,7 +337,7 @@ ompi_coll_tuned_scatter_intra_do_forced(void *sbuf, int scount, mca_coll_tuned_module_t *tuned_module = (mca_coll_tuned_module_t*) module; mca_coll_tuned_comm_t *data = tuned_module->tuned_data; - OPAL_OUTPUT((ompi_coll_tuned_stream, + ORTE_OUTPUT((ompi_coll_tuned_stream, "coll:tuned:scatter_intra_do_forced selected algorithm %d", data->user_forced[SCATTER].algorithm)); @@ -355,7 +355,7 @@ ompi_coll_tuned_scatter_intra_do_forced(void *sbuf, int scount, rbuf, rcount, rdtype, root, comm, module); default: - OPAL_OUTPUT((ompi_coll_tuned_stream, + ORTE_OUTPUT((ompi_coll_tuned_stream, "coll:tuned:scatter_intra_do_forced attempt to select algorithm %d when only 0-%d is valid?", data->user_forced[SCATTER].algorithm, ompi_coll_tuned_forced_max_algorithms[SCATTER])); @@ -373,7 +373,7 @@ ompi_coll_tuned_scatter_intra_do_this(void *sbuf, int scount, struct mca_coll_base_module_1_1_0_t *module, int algorithm, int faninout, int segsize) { - OPAL_OUTPUT((ompi_coll_tuned_stream, + ORTE_OUTPUT((ompi_coll_tuned_stream, "coll:tuned:scatter_intra_do_this selected algorithm %d topo faninout %d segsize %d", algorithm, faninout, segsize)); @@ -391,7 +391,7 @@ ompi_coll_tuned_scatter_intra_do_this(void *sbuf, int scount, rbuf, rcount, rdtype, root, comm, module); default: - OPAL_OUTPUT((ompi_coll_tuned_stream, + ORTE_OUTPUT((ompi_coll_tuned_stream, "coll:tuned:scatter_intra_do_this attempt to select algorithm %d when only 0-%d is valid?", algorithm, ompi_coll_tuned_forced_max_algorithms[SCATTER])); diff --git a/ompi/mca/coll/tuned/coll_tuned_topo.c b/ompi/mca/coll/tuned/coll_tuned_topo.c index d409b77a71..0a5310a8d9 100644 --- a/ompi/mca/coll/tuned/coll_tuned_topo.c +++ b/ompi/mca/coll/tuned/coll_tuned_topo.c @@ -88,14 +88,14 @@ ompi_coll_tuned_topo_build_tree( int fanout, int i; ompi_coll_tree_t* tree; - OPAL_OUTPUT((ompi_coll_tuned_stream, "coll:tuned:topo_build_tree Building fo %d rt %d", fanout, root)); + ORTE_OUTPUT((ompi_coll_tuned_stream, "coll:tuned:topo_build_tree Building fo %d rt %d", fanout, root)); if (fanout<1) { - OPAL_OUTPUT((ompi_coll_tuned_stream, "coll:tuned:topo_build_tree invalid fanout %d", fanout)); + ORTE_OUTPUT((ompi_coll_tuned_stream, "coll:tuned:topo_build_tree invalid fanout %d", fanout)); return NULL; } if (fanout>MAXTREEFANOUT) { - OPAL_OUTPUT((ompi_coll_tuned_stream,"coll:tuned:topo_build_tree invalid fanout %d bigger than max %d", fanout, MAXTREEFANOUT)); + ORTE_OUTPUT((ompi_coll_tuned_stream,"coll:tuned:topo_build_tree invalid fanout %d bigger than max %d", fanout, MAXTREEFANOUT)); return NULL; } @@ -107,7 +107,7 @@ ompi_coll_tuned_topo_build_tree( int fanout, tree = (ompi_coll_tree_t*)malloc(sizeof(ompi_coll_tree_t)); if (!tree) { - OPAL_OUTPUT((ompi_coll_tuned_stream,"coll:tuned:topo_build_tree PANIC::out of memory")); + ORTE_OUTPUT((ompi_coll_tuned_stream,"coll:tuned:topo_build_tree PANIC::out of memory")); return NULL; } @@ -207,7 +207,7 @@ ompi_coll_tuned_topo_build_in_order_bintree( struct ompi_communicator_t* comm ) tree = (ompi_coll_tree_t*)malloc(sizeof(ompi_coll_tree_t)); if (!tree) { - OPAL_OUTPUT((ompi_coll_tuned_stream, + ORTE_OUTPUT((ompi_coll_tuned_stream, "coll:tuned:topo_build_tree PANIC::out of memory")); return NULL; } @@ -225,7 +225,7 @@ ompi_coll_tuned_topo_build_in_order_bintree( struct ompi_communicator_t* comm ) tree->tree_nextsize = 0; tree->tree_next[0] = -1; tree->tree_next[1] = -1; - OPAL_OUTPUT((ompi_coll_tuned_stream, + ORTE_OUTPUT((ompi_coll_tuned_stream, "coll:tuned:topo_build_in_order_tree Building fo %d rt %d", tree->tree_fanout, tree->tree_root)); @@ -340,7 +340,7 @@ ompi_coll_tuned_topo_build_bmtree( struct ompi_communicator_t* comm, ompi_coll_tree_t *bmtree; int i; - OPAL_OUTPUT((ompi_coll_tuned_stream,"coll:tuned:topo:build_bmtree rt %d", root)); + ORTE_OUTPUT((ompi_coll_tuned_stream,"coll:tuned:topo:build_bmtree rt %d", root)); /* * Get size and rank of the process in this communicator @@ -352,7 +352,7 @@ ompi_coll_tuned_topo_build_bmtree( struct ompi_communicator_t* comm, bmtree = (ompi_coll_tree_t*)malloc(sizeof(ompi_coll_tree_t)); if (!bmtree) { - OPAL_OUTPUT((ompi_coll_tuned_stream,"coll:tuned:topo:build_bmtree PANIC out of memory")); + ORTE_OUTPUT((ompi_coll_tuned_stream,"coll:tuned:topo:build_bmtree PANIC out of memory")); return NULL; } @@ -383,7 +383,7 @@ ompi_coll_tuned_topo_build_bmtree( struct ompi_communicator_t* comm, remote += root; if( remote >= size ) remote -= size; if (childs==MAXTREEFANOUT) { - OPAL_OUTPUT((ompi_coll_tuned_stream,"coll:tuned:topo:build_bmtree max fanout incorrect %d needed %d", MAXTREEFANOUT, childs)); + ORTE_OUTPUT((ompi_coll_tuned_stream,"coll:tuned:topo:build_bmtree max fanout incorrect %d needed %d", MAXTREEFANOUT, childs)); return NULL; } bmtree->tree_next[childs] = remote; @@ -421,7 +421,7 @@ ompi_coll_tuned_topo_build_in_order_bmtree( struct ompi_communicator_t* comm, ompi_coll_tree_t *bmtree; int i; - OPAL_OUTPUT((ompi_coll_tuned_stream,"coll:tuned:topo:build_in_order_bmtree rt %d", root)); + ORTE_OUTPUT((ompi_coll_tuned_stream,"coll:tuned:topo:build_in_order_bmtree rt %d", root)); /* * Get size and rank of the process in this communicator @@ -433,7 +433,7 @@ ompi_coll_tuned_topo_build_in_order_bmtree( struct ompi_communicator_t* comm, bmtree = (ompi_coll_tree_t*)malloc(sizeof(ompi_coll_tree_t)); if (!bmtree) { - OPAL_OUTPUT((ompi_coll_tuned_stream,"coll:tuned:topo:build_bmtree PANIC out of memory")); + ORTE_OUTPUT((ompi_coll_tuned_stream,"coll:tuned:topo:build_bmtree PANIC out of memory")); return NULL; } @@ -457,7 +457,7 @@ ompi_coll_tuned_topo_build_in_order_bmtree( struct ompi_communicator_t* comm, bmtree->tree_next[childs] = (remote + root) % size; childs++; if (childs==MAXTREEFANOUT) { - OPAL_OUTPUT((ompi_coll_tuned_stream, + ORTE_OUTPUT((ompi_coll_tuned_stream, "coll:tuned:topo:build_bmtree max fanout incorrect %d needed %d", MAXTREEFANOUT, childs)); return NULL; @@ -483,7 +483,7 @@ ompi_coll_tuned_topo_build_chain( int fanout, int mark,head,len; ompi_coll_tree_t *chain; - OPAL_OUTPUT((ompi_coll_tuned_stream,"coll:tuned:topo:build_chain fo %d rt %d", fanout, root)); + ORTE_OUTPUT((ompi_coll_tuned_stream,"coll:tuned:topo:build_chain fo %d rt %d", fanout, root)); /* * Get size and rank of the process in this communicator @@ -492,11 +492,11 @@ ompi_coll_tuned_topo_build_chain( int fanout, rank = ompi_comm_rank(comm); if( fanout < 1 ) { - OPAL_OUTPUT((ompi_coll_tuned_stream,"coll:tuned:topo:build_chain WARNING invalid fanout of ZERO, forcing to 1 (pipeline)!")); + ORTE_OUTPUT((ompi_coll_tuned_stream,"coll:tuned:topo:build_chain WARNING invalid fanout of ZERO, forcing to 1 (pipeline)!")); fanout = 1; } if (fanout>MAXTREEFANOUT) { - OPAL_OUTPUT((ompi_coll_tuned_stream,"coll:tuned:topo:build_chain WARNING invalid fanout %d bigger than max %d, forcing to max!", fanout, MAXTREEFANOUT)); + ORTE_OUTPUT((ompi_coll_tuned_stream,"coll:tuned:topo:build_chain WARNING invalid fanout %d bigger than max %d, forcing to max!", fanout, MAXTREEFANOUT)); fanout = MAXTREEFANOUT; } @@ -505,7 +505,7 @@ ompi_coll_tuned_topo_build_chain( int fanout, */ chain = (ompi_coll_tree_t*)malloc( sizeof(ompi_coll_tree_t) ); if (!chain) { - OPAL_OUTPUT((ompi_coll_tuned_stream,"coll:tuned:topo:build_chain PANIC out of memory")); + ORTE_OUTPUT((ompi_coll_tuned_stream,"coll:tuned:topo:build_chain PANIC out of memory")); fflush(stdout); return NULL; } @@ -627,13 +627,13 @@ int ompi_coll_tuned_topo_dump_tree (ompi_coll_tree_t* tree, int rank) { int i; - OPAL_OUTPUT((ompi_coll_tuned_stream, "coll:tuned:topo:topo_dump_tree %1d tree root %d" + ORTE_OUTPUT((ompi_coll_tuned_stream, "coll:tuned:topo:topo_dump_tree %1d tree root %d" " fanout %d BM %1d nextsize %d prev %d", rank, tree->tree_root, tree->tree_bmtree, tree->tree_fanout, tree->tree_nextsize, tree->tree_prev)); if( tree->tree_nextsize ) { for( i = 0; i < tree->tree_nextsize; i++ ) - OPAL_OUTPUT((ompi_coll_tuned_stream,"[%1d] %d", i, tree->tree_next[i])); + ORTE_OUTPUT((ompi_coll_tuned_stream,"[%1d] %d", i, tree->tree_next[i])); } return (0); } diff --git a/ompi/mca/coll/tuned/coll_tuned_util.c b/ompi/mca/coll/tuned/coll_tuned_util.c index 8b1408c11f..a9fa8e032c 100644 --- a/ompi/mca/coll/tuned/coll_tuned_util.c +++ b/ompi/mca/coll/tuned/coll_tuned_util.c @@ -62,7 +62,7 @@ int ompi_coll_tuned_sendrecv_actual( void* sendbuf, int scount, return (MPI_SUCCESS); error_handler: - OPAL_OUTPUT ((ompi_coll_tuned_stream, "%s:%d: Error %d occurred\n", + ORTE_OUTPUT ((ompi_coll_tuned_stream, "%s:%d: Error %d occurred\n", __FILE__,line,err)); return (err); } @@ -107,7 +107,7 @@ int ompi_coll_tuned_sendrecv_actual_localcompleted( void* sendbuf, int scount, return (MPI_SUCCESS); error_handler: - OPAL_OUTPUT ((ompi_coll_tuned_stream, "%s:%d: Error %d occurred\n",__FILE__,line,err)); + ORTE_OUTPUT ((ompi_coll_tuned_stream, "%s:%d: Error %d occurred\n",__FILE__,line,err)); return (err); } diff --git a/ompi/mca/coll/tuned/coll_tuned_util.h b/ompi/mca/coll/tuned/coll_tuned_util.h index c6df61c214..9b38fae7db 100644 --- a/ompi/mca/coll/tuned/coll_tuned_util.h +++ b/ompi/mca/coll/tuned/coll_tuned_util.h @@ -117,7 +117,7 @@ ompi_coll_tuned_isendrecv( void* sendbuf, int scount, ompi_datatype_t* sdtype, return MPI_SUCCESS; error_handler: - OPAL_OUTPUT((ompi_coll_tuned_stream, "%s:%d\tError occurred %d\n", + ORTE_OUTPUT((ompi_coll_tuned_stream, "%s:%d\tError occurred %d\n", __FILE__, line, ret)); return ret; } diff --git a/ompi/mca/common/mx/common_mx.c b/ompi/mca/common/mx/common_mx.c index b8a631579a..7b2fbbaf06 100644 --- a/ompi/mca/common/mx/common_mx.c +++ b/ompi/mca/common/mx/common_mx.c @@ -17,7 +17,7 @@ */ #include "ompi_config.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "ompi/constants.h" #include "common_mx.h" @@ -40,7 +40,7 @@ ompi_common_mx_initialize(void) mx_return = mx_init(); if(MX_SUCCESS != mx_return) { - opal_output(0, + orte_output(0, "Error in mx_init (error %s)\n", mx_strerror(mx_return)); return OMPI_ERR_NOT_AVAILABLE; @@ -59,7 +59,7 @@ ompi_common_mx_finalize(void) if( 0 == ompi_common_mx_initialize_ref_cnt ) { mx_return = mx_finalize(); if(mx_return != MX_SUCCESS){ - opal_output(0, "Error in mx_finalize (error %s)\n", mx_strerror(mx_return)); + orte_output(0, "Error in mx_finalize (error %s)\n", mx_strerror(mx_return)); return OMPI_ERROR; } } diff --git a/ompi/mca/common/portals/common_portals_cray_xt_modex.c b/ompi/mca/common/portals/common_portals_cray_xt_modex.c index 6a02333700..35419597cc 100644 --- a/ompi/mca/common/portals/common_portals_cray_xt_modex.c +++ b/ompi/mca/common/portals/common_portals_cray_xt_modex.c @@ -22,7 +22,7 @@ #include "common_portals.h" #include "ompi/constants.h" #include "opal/mca/base/base.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "ompi/runtime/ompi_module_exchange.h" @@ -71,7 +71,7 @@ ompi_common_portals_initialize(ptl_handle_ni_t *ni_handle, bool *accel) */ ret = PtlInit(&max_interfaces); if (PTL_OK != ret) { - opal_output(0, "PtlInit failed, returning %d\n", ret); + orte_output(0, "PtlInit failed, returning %d\n", ret); return OMPI_ERR_NOT_AVAILABLE; } @@ -85,14 +85,14 @@ ompi_common_portals_initialize(ptl_handle_ni_t *ni_handle, bool *accel) ni_handle /* our interface handle */ ); if (PTL_OK != ret && PTL_IFACE_DUP != ret) { - opal_output(0, "PtlNIInit failed, returning %d (%s : %d)\n", + orte_output(0, "PtlNIInit failed, returning %d (%s : %d)\n", ret, __FILE__, __LINE__); return OMPI_ERROR; } ret = PtlGetId(*ni_handle ,&ptl_process_id); if(PTL_OK != ret) { - opal_output(0, "PtlGetId failed, returning %d\n", ret); + orte_output(0, "PtlGetId failed, returning %d\n", ret); return OMPI_ERROR; } @@ -129,10 +129,10 @@ ompi_common_portals_get_procs(size_t nprocs, ret = ompi_modex_recv(&portals_component, procs[i], (void**) &ptl_process_id, &size); if (OMPI_SUCCESS != ret) { - opal_output(0, "ompi_modex_recv failed: %d", ret); + orte_output(0, "ompi_modex_recv failed: %d", ret); return ret; } else if (sizeof(ptl_process_id_t) != size) { - opal_output(0, "ompi_modex_recv returned size %d, expected %d", + orte_output(0, "ompi_modex_recv returned size %d, expected %d", (int) size, (int) sizeof(ptl_process_id_t)); return OMPI_ERROR; } diff --git a/ompi/mca/common/portals/common_portals_crayxt3.c b/ompi/mca/common/portals/common_portals_crayxt3.c index e7ab9ab61a..c4f4f2946f 100644 --- a/ompi/mca/common/portals/common_portals_crayxt3.c +++ b/ompi/mca/common/portals/common_portals_crayxt3.c @@ -18,7 +18,7 @@ #include -#include "opal/util/output.h" +#include "orte/util/output.h" #include "ompi/constants.h" #include "ompi/proc/proc.h" #include "opal/mca/base/base.h" @@ -51,7 +51,7 @@ ompi_common_portals_initialize(ptl_handle_ni_t *ni_handle, bool *accel) */ ret = PtlInit(&max_interfaces); if (PTL_OK != ret) { - opal_output(0, "%5d: PtlInit failed, returning %d\n", + orte_output(0, "%5d: PtlInit failed, returning %d\n", cnos_get_rank(), ret); return OMPI_ERR_NOT_AVAILABLE; } @@ -101,7 +101,7 @@ ompi_common_portals_ni_initialize(ptl_handle_ni_t *ni_handle, bool *accel) */ ret = PtlInit(&max_interfaces); if (PTL_OK != ret) { - opal_output(0, "%5d: PtlInit failed, returning %d\n", + orte_output(0, "%5d: PtlInit failed, returning %d\n", cnos_get_rank(), ret); return OMPI_ERR_NOT_AVAILABLE; } @@ -116,7 +116,7 @@ ompi_common_portals_ni_initialize(ptl_handle_ni_t *ni_handle, bool *accel) ni_handle /* our interface handle */ ); if (PTL_OK != ret && PTL_IFACE_DUP != ret) { - opal_output(0, "%5d: PtlNIInit failed, returning %d (%s : %d)\n", + orte_output(0, "%5d: PtlNIInit failed, returning %d (%s : %d)\n", cnos_get_rank(), ret, __FILE__, __LINE__); return OMPI_ERROR; } @@ -142,7 +142,7 @@ ompi_common_portals_get_procs(size_t nprocs, */ nptl_procs = cnos_get_nidpid_map(&map); if (nptl_procs <= 0) { - opal_output(0, "%5d: cnos_get_nidpid_map() returned %d", + orte_output(0, "%5d: cnos_get_nidpid_map() returned %d", cnos_get_rank(), nptl_procs); return OMPI_ERR_FATAL; } diff --git a/ompi/mca/common/portals/common_portals_utcp.c b/ompi/mca/common/portals/common_portals_utcp.c index 9a392151d5..a70ebdf753 100644 --- a/ompi/mca/common/portals/common_portals_utcp.c +++ b/ompi/mca/common/portals/common_portals_utcp.c @@ -21,7 +21,7 @@ #include #include "opal/mca/mca.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "opal/mca/base/mca_base_param.h" #include "ompi/proc/proc.h" #include "ompi/constants.h" @@ -116,7 +116,7 @@ ompi_common_portals_initialize(ptl_handle_ni_t *ni_handle, bool *accel) ret = PtlInit(&max_interfaces); if (PTL_OK != ret) { - opal_output(0, "%5d: PtlInit failed, returning %d\n", + orte_output(0, "%5d: PtlInit failed, returning %d\n", getpid(), ret); return OMPI_ERR_NOT_AVAILABLE; } @@ -133,21 +133,21 @@ ompi_common_portals_initialize(ptl_handle_ni_t *ni_handle, bool *accel) &active_ni_h /* our interface handle */ ); if (PTL_OK != ret) { - opal_output(0, "%5d: PtlNIInit failed, returning %d\n", + orte_output(0, "%5d: PtlNIInit failed, returning %d\n", getpid(), ret); return OMPI_ERR_FATAL; } ret = PtlGetRank(active_ni_h, &rank, &nptl_procs); if (ret != PTL_OK) { - opal_output(0, "%5d, PtlGetRank() returned %d", + orte_output(0, "%5d, PtlGetRank() returned %d", getpid(), ret); return OMPI_ERR_FATAL; } ret = PtlGetRankId(active_ni_h, rank, &info); if (ret != PTL_OK) { - opal_output(0, "%5d, PtlGetRank(rank=%d) returned %d", + orte_output(0, "%5d, PtlGetRank(rank=%d) returned %d", getpid(), rank, ret); return OMPI_ERR_FATAL; } @@ -206,11 +206,11 @@ ompi_common_portals_ni_initialize(ptl_handle_ni_t *ni_handle, bool *accel) ret = ompi_modex_recv(&portals_component, procs[i], (void**) &info, &size); if (OMPI_SUCCESS != ret) { - opal_output(0, "%5d: ompi_modex_recv failed: %d", + orte_output(0, "%5d: ompi_modex_recv failed: %d", getpid(), ret); return ret; } else if (sizeof(ptl_process_id_t) != size) { - opal_output(0, "%5d: ompi_modex_recv returned size %d, expected %d", + orte_output(0, "%5d: ompi_modex_recv returned size %d, expected %d", getpid(), size, sizeof(ptl_process_id_t)); return OMPI_ERROR; } @@ -248,7 +248,7 @@ ompi_common_portals_ni_initialize(ptl_handle_ni_t *ni_handle, bool *accel) ret = PtlInit(&max_interfaces); if (PTL_OK != ret) { - opal_output(0, "%5d: PtlInit failed, returning %d\n", + orte_output(0, "%5d: PtlInit failed, returning %d\n", getpid(), ret); return OMPI_ERR_NOT_AVAILABLE; } @@ -265,7 +265,7 @@ ompi_common_portals_ni_initialize(ptl_handle_ni_t *ni_handle, bool *accel) &active_ni_h /* our interface handle */ ); if (PTL_OK != ret) { - opal_output(0, "%5d: PtlNIInit failed, returning %d\n", + orte_output(0, "%5d: PtlNIInit failed, returning %d\n", getpid(), ret); return OMPI_ERR_FATAL; } @@ -293,11 +293,11 @@ ompi_common_portals_get_procs(size_t nprocs, ret = ompi_modex_recv(&portals_component, procs[i], (void**) &info, &size); if (OMPI_SUCCESS != ret) { - opal_output(0, "%5d: ompi_modex_recv failed: %d", + orte_output(0, "%5d: ompi_modex_recv failed: %d", getpid(), ret); return ret; } else if (sizeof(ptl_process_id_t) != size) { - opal_output(0, "%5d: ompi_modex_recv returned size %d, expected %d", + orte_output(0, "%5d: ompi_modex_recv returned size %d, expected %d", getpid(), size, sizeof(ptl_process_id_t)); return OMPI_ERROR; } diff --git a/ompi/mca/common/sm/common_sm_mmap.c b/ompi/mca/common/sm/common_sm_mmap.c index f29ed5cd27..75f55fd872 100644 --- a/ompi/mca/common/sm/common_sm_mmap.c +++ b/ompi/mca/common/sm/common_sm_mmap.c @@ -45,7 +45,7 @@ #include "ompi/proc/proc.h" #include "common_sm_mmap.h" #include "opal/util/basename.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "opal/align.h" #include "orte/util/proc_info.h" #include "orte/mca/rml/rml_types.h" @@ -79,7 +79,7 @@ static mca_common_sm_mmap_t* create_map(int fd, size_t size, char *file_name, seg = (mca_common_sm_file_header_t*) mmap(NULL, size, PROT_READ|PROT_WRITE, MAP_SHARED, fd, 0); if((void*)-1 == seg) { - opal_output(0, "mca_common_sm_mmap_init: " + orte_output(0, "mca_common_sm_mmap_init: " "mmap failed with errno=%d\n", errno); return NULL; } @@ -101,7 +101,7 @@ static mca_common_sm_mmap_t* create_map(int fd, size_t size, char *file_name, /* is addr past end of file ? */ if((unsigned char*)seg + size < addr) { - opal_output(0, "mca_common_sm_mmap_init: " + orte_output(0, "mca_common_sm_mmap_init: " "memory region too small len %lu addr %p\n", (unsigned long)size, addr); return NULL; @@ -148,10 +148,10 @@ mca_common_sm_mmap_t* mca_common_sm_mmap_init(size_t size, char *file_name, /* process initializing the file */ fd = open(file_name, O_CREAT|O_RDWR, 0600); if(fd < 0) { - opal_output(0, "mca_common_sm_mmap_init: " + orte_output(0, "mca_common_sm_mmap_init: " "open %s failed with errno=%d\n", file_name, errno); } else if(ftruncate(fd, size) != 0) { - opal_output(0, "mca_common_sm_mmap_init: " + orte_output(0, "mca_common_sm_mmap_init: " "ftruncate failed with errno=%d\n", errno); } else { @@ -177,7 +177,7 @@ mca_common_sm_mmap_t* mca_common_sm_mmap_init(size_t size, char *file_name, rc = orte_rml.send(&(procs[p]->proc_name), iov, 2, OMPI_RML_TAG_SM_BACK_FILE_CREATED, 0); if(rc < 0) { - opal_output(0, "mca_common_sm_mmap_init: " + orte_output(0, "mca_common_sm_mmap_init: " "orte_rml.send failed to %lu with errno=%d\n", (unsigned long)p, errno); goto out; @@ -189,7 +189,7 @@ mca_common_sm_mmap_t* mca_common_sm_mmap_init(size_t size, char *file_name, rc = orte_rml.recv(&(procs[0]->proc_name), iov, 2, OMPI_RML_TAG_SM_BACK_FILE_CREATED, 0); if(rc < 0) { - opal_output(0, "mca_common_sm_mmap_init: " + orte_output(0, "mca_common_sm_mmap_init: " "orte_rml.recv failed from %d with errno=%d\n", 0, errno); goto out; @@ -288,7 +288,7 @@ mca_common_sm_mmap_t* mca_common_sm_mmap_init(size_t size, char *file_name, /* is addr past end of file ? */ if( (unsigned char*)seg+size < addr ) { - opal_output(0, "mca_common_sm_mmap_init: memory region too small len %d addr %p\n", + orte_output(0, "mca_common_sm_mmap_init: memory region too small len %d addr %p\n", size,addr); goto return_error; } @@ -318,7 +318,7 @@ mca_common_sm_mmap_t* mca_common_sm_mmap_init(size_t size, char *file_name, char* localbuf = NULL; FormatMessage( FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, NULL, rc, 0, (LPTSTR)&localbuf, 1024, NULL ); - opal_output( 0, "%s\n", localbuf ); + orte_output( 0, "%s\n", localbuf ); LocalFree( localbuf ); } if( NULL != lpvMem ) UnmapViewOfFile( lpvMem ); diff --git a/ompi/mca/crcp/base/crcp_base_close.c b/ompi/mca/crcp/base/crcp_base_close.c index 316bf99da3..53db6860a7 100644 --- a/ompi/mca/crcp/base/crcp_base_close.c +++ b/ompi/mca/crcp/base/crcp_base_close.c @@ -19,7 +19,7 @@ #include "opal/mca/mca.h" #include "opal/mca/base/base.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "opal/mca/base/mca_base_param.h" #include "ompi/mca/crcp/crcp.h" diff --git a/ompi/mca/crcp/base/crcp_base_fns.c b/ompi/mca/crcp/base/crcp_base_fns.c index 08c7e338f7..d6526130dc 100644 --- a/ompi/mca/crcp/base/crcp_base_fns.c +++ b/ompi/mca/crcp/base/crcp_base_fns.c @@ -28,7 +28,7 @@ #include "opal/mca/mca.h" #include "opal/mca/base/base.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "opal/util/os_dirpath.h" #include "ompi/communicator/communicator.h" diff --git a/ompi/mca/crcp/base/crcp_base_open.c b/ompi/mca/crcp/base/crcp_base_open.c index c68d80e4ce..7075880ed4 100644 --- a/ompi/mca/crcp/base/crcp_base_open.c +++ b/ompi/mca/crcp/base/crcp_base_open.c @@ -19,9 +19,11 @@ #include "opal/mca/mca.h" #include "opal/mca/base/base.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "opal/mca/base/mca_base_param.h" +#include "orte/util/output.h" + #include "ompi/mca/crcp/crcp.h" #include "ompi/mca/crcp/base/base.h" @@ -44,20 +46,9 @@ ompi_crcp_base_component_t ompi_crcp_base_selected_component; */ int ompi_crcp_base_open(void) { - int value; char *str_value = NULL; - /* Debugging/Verbose output */ - mca_base_param_reg_int_name("crcp", - "base_verbose", - "Verbosity level of the CRCP framework", - false, false, - 0, &value); - if(0 != value) { - ompi_crcp_base_output = opal_output_open(NULL); - } else { - ompi_crcp_base_output = -1; - } + ompi_crcp_base_output = orte_output_open(NULL, "CRCP", "DEBUG", NULL); /* * Which CRCP component to open diff --git a/ompi/mca/crcp/base/crcp_base_select.c b/ompi/mca/crcp/base/crcp_base_select.c index b7dd168a53..6f1f3db2d7 100644 --- a/ompi/mca/crcp/base/crcp_base_select.c +++ b/ompi/mca/crcp/base/crcp_base_select.c @@ -19,7 +19,7 @@ #include "opal/mca/mca.h" #include "opal/mca/base/base.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "opal/mca/base/mca_base_param.h" #include "ompi/mca/crcp/crcp.h" @@ -52,7 +52,7 @@ static ompi_crcp_base_component_t none_component = { /* Verbosity level */ 0, - /* opal_output handler */ + /* orte_output handler */ -1, /* Default priority */ 1 @@ -130,7 +130,7 @@ int ompi_crcp_base_select(void) strdup("none"), &include_list); if(NULL != include_list && 0 == strncmp(include_list, "none", strlen("none")) ){ - opal_output_verbose(10, ompi_crcp_base_output, + orte_output_verbose(10, ompi_crcp_base_output, "crcp:select: Using %s component", include_list); best_component = &none_component; diff --git a/ompi/mca/crcp/coord/crcp_coord_btl.c b/ompi/mca/crcp/coord/crcp_coord_btl.c index 78d853bdef..e673bf2798 100644 --- a/ompi/mca/crcp/coord/crcp_coord_btl.c +++ b/ompi/mca/crcp/coord/crcp_coord_btl.c @@ -23,8 +23,8 @@ #include "opal/runtime/opal_cr.h" #include "opal/event/event.h" -#include "opal/util/output.h" -#include "opal/util/show_help.h" +#include "orte/util/output.h" +#include "orte/util/show_help.h" #include "opal/util/argv.h" #include "opal/util/opal_environ.h" #include "opal/mca/base/mca_base_param.h" diff --git a/ompi/mca/crcp/coord/crcp_coord_component.c b/ompi/mca/crcp/coord/crcp_coord_component.c index 6e2633717b..dee3f2a41e 100644 --- a/ompi/mca/crcp/coord/crcp_coord_component.c +++ b/ompi/mca/crcp/coord/crcp_coord_component.c @@ -16,6 +16,8 @@ #include "ompi_config.h" +#include "orte/util/output.h" + #include "ompi/mca/crcp/crcp.h" #include "ompi/mca/crcp/base/base.h" #include "crcp_coord.h" @@ -66,7 +68,7 @@ ompi_crcp_coord_component_t mca_crcp_coord_component = { /* Verbosity level */ 0, - /* opal_output handler */ + /* orte_output handler */ -1, /* Default priority */ 10 @@ -98,8 +100,8 @@ static int crcp_coord_open(void) * otherwise take our parents level and output channel */ if ( 0 != mca_crcp_coord_component.super.verbose) { - mca_crcp_coord_component.super.output_handle = opal_output_open(NULL); - opal_output_set_verbosity(mca_crcp_coord_component.super.output_handle, + mca_crcp_coord_component.super.output_handle = orte_output_open(NULL, "CRCP", "COORD", "DEBUG", NULL); + orte_output_set_verbosity(mca_crcp_coord_component.super.output_handle, mca_crcp_coord_component.super.verbose); } else { mca_crcp_coord_component.super.output_handle = ompi_crcp_base_output; @@ -116,12 +118,12 @@ static int crcp_coord_open(void) /* * Debug Output */ - opal_output_verbose(10, mca_crcp_coord_component.super.output_handle, + orte_output_verbose(10, mca_crcp_coord_component.super.output_handle, "crcp:coord: open()"); - opal_output_verbose(20, mca_crcp_coord_component.super.output_handle, + orte_output_verbose(20, mca_crcp_coord_component.super.output_handle, "crcp:coord: open: priority = %d", mca_crcp_coord_component.super.priority); - opal_output_verbose(20, mca_crcp_coord_component.super.output_handle, + orte_output_verbose(20, mca_crcp_coord_component.super.output_handle, "crcp:coord: open: verbosity = %d", mca_crcp_coord_component.super.verbose); @@ -130,7 +132,7 @@ static int crcp_coord_open(void) static int crcp_coord_close(void) { - opal_output_verbose(10, mca_crcp_coord_component.super.output_handle, + orte_output_verbose(10, mca_crcp_coord_component.super.output_handle, "crcp:coord: close()"); return OMPI_SUCCESS; diff --git a/ompi/mca/crcp/coord/crcp_coord_module.c b/ompi/mca/crcp/coord/crcp_coord_module.c index 9d6fd05e18..f62ec5675b 100644 --- a/ompi/mca/crcp/coord/crcp_coord_module.c +++ b/ompi/mca/crcp/coord/crcp_coord_module.c @@ -24,11 +24,11 @@ #include "opal/mca/mca.h" #include "opal/mca/base/base.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "opal/mca/base/mca_base_param.h" -#include "opal/util/output.h" -#include "opal/util/show_help.h" +#include "orte/util/output.h" +#include "orte/util/show_help.h" #include "opal/util/argv.h" #include "opal/util/opal_environ.h" @@ -105,7 +105,7 @@ static ompi_crcp_base_module_t loc_module = { */ int ompi_crcp_coord_component_query(mca_base_module_t **module, int *priority) { - opal_output_verbose(10, mca_crcp_coord_component.super.output_handle, + orte_output_verbose(10, mca_crcp_coord_component.super.output_handle, "crcp:coord: component_query()"); *priority = mca_crcp_coord_component.super.priority; @@ -116,7 +116,7 @@ int ompi_crcp_coord_component_query(mca_base_module_t **module, int *priority) int ompi_crcp_coord_module_init(void) { - opal_output_verbose(10, mca_crcp_coord_component.super.output_handle, + orte_output_verbose(10, mca_crcp_coord_component.super.output_handle, "crcp:coord: module_init()"); ompi_crcp_coord_pml_init(); @@ -126,7 +126,7 @@ int ompi_crcp_coord_module_init(void) int ompi_crcp_coord_module_finalize(void) { - opal_output_verbose(10, mca_crcp_coord_component.super.output_handle, + orte_output_verbose(10, mca_crcp_coord_component.super.output_handle, "crcp:coord: module_finalize()"); ompi_crcp_coord_pml_finalize(); diff --git a/ompi/mca/crcp/coord/crcp_coord_pml.c b/ompi/mca/crcp/coord/crcp_coord_pml.c index 77ca9b6540..a6327538f0 100644 --- a/ompi/mca/crcp/coord/crcp_coord_pml.c +++ b/ompi/mca/crcp/coord/crcp_coord_pml.c @@ -162,9 +162,9 @@ #include "opal/runtime/opal_cr.h" #include "opal/event/event.h" -#include "opal/util/output.h" -#include "opal/util/output.h" -#include "opal/util/show_help.h" +#include "orte/util/output.h" +#include "orte/util/output.h" +#include "orte/util/show_help.h" #include "opal/util/argv.h" #include "opal/util/opal_environ.h" #include "opal/util/arch.h" @@ -770,7 +770,7 @@ OBJ_CLASS_INSTANCE(ompi_crcp_coord_pml_state_t, #define PACK_BUFFER(buffer, var, count, type, error_msg) \ { \ if (OMPI_SUCCESS != (ret = opal_dss.pack(buffer, &(var), count, type)) ) { \ - opal_output(mca_crcp_coord_component.super.output_handle, \ + orte_output(mca_crcp_coord_component.super.output_handle, \ "%s (Return %d)", error_msg, ret); \ exit_status = ret; \ goto cleanup; \ @@ -781,7 +781,7 @@ OBJ_CLASS_INSTANCE(ompi_crcp_coord_pml_state_t, { \ orte_std_cntr_t n = count; \ if (ORTE_SUCCESS != (ret = opal_dss.unpack(buffer, &(var), &n, type)) ) { \ - opal_output(mca_crcp_coord_component.super.output_handle, \ + orte_output(mca_crcp_coord_component.super.output_handle, \ "%s (Return %d)", error_msg, ret); \ exit_status = ret; \ goto cleanup; \ @@ -845,7 +845,7 @@ ompi_crcp_base_pml_state_t* ompi_crcp_coord_pml_enable( bool enable, ompi_crcp_base_pml_state_t* pml_state ) { - OPAL_OUTPUT_VERBOSE((20, mca_crcp_coord_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((20, mca_crcp_coord_component.super.output_handle, "crcp:coord: pml_enable()")); pml_state->error_code = OMPI_SUCCESS; return pml_state; @@ -855,7 +855,7 @@ ompi_crcp_base_pml_state_t* ompi_crcp_coord_pml_enable( ompi_crcp_base_pml_state_t* ompi_crcp_coord_pml_progress( ompi_crcp_base_pml_state_t* pml_state) { - OPAL_OUTPUT_VERBOSE((20, mca_crcp_coord_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((20, mca_crcp_coord_component.super.output_handle, "crcp:coord: pml_progress()")); pml_state->error_code = OMPI_SUCCESS; return pml_state; @@ -873,7 +873,7 @@ ompi_crcp_base_pml_state_t* ompi_crcp_coord_pml_iprobe( int exit_status = OMPI_SUCCESS; int ret; - OPAL_OUTPUT_VERBOSE((20, mca_crcp_coord_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((20, mca_crcp_coord_component.super.output_handle, "crcp:coord: pml_iprobe(%d, %d)", dst, tag)); /* @@ -889,7 +889,7 @@ ompi_crcp_base_pml_state_t* ompi_crcp_coord_pml_iprobe( tag, dst, comm->c_contextid, &drain_msg_ref) ) ) { - opal_output(mca_crcp_coord_component.super.output_handle, + orte_output(mca_crcp_coord_component.super.output_handle, "crcp:coord: pml_iprobe(): Failed trying to find a drained message." " This should never happen. (%d)", ret); @@ -903,7 +903,7 @@ ompi_crcp_base_pml_state_t* ompi_crcp_coord_pml_iprobe( * - Mark the 'matched' flag as true */ if( NULL != drain_msg_ref ) { - OPAL_OUTPUT_VERBOSE((10, mca_crcp_coord_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((10, mca_crcp_coord_component.super.output_handle, "crcp:coord: pml_iprobe(): Matched a drained message...")); /* Copy the status information */ @@ -943,7 +943,7 @@ ompi_crcp_base_pml_state_t* ompi_crcp_coord_pml_probe( int exit_status = OMPI_SUCCESS; int ret; - OPAL_OUTPUT_VERBOSE((20, mca_crcp_coord_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((20, mca_crcp_coord_component.super.output_handle, "crcp:coord: pml_probe(%d, %d)", dst, tag)); /* @@ -959,7 +959,7 @@ ompi_crcp_base_pml_state_t* ompi_crcp_coord_pml_probe( tag, dst, comm->c_contextid, &drain_msg_ref) ) ) { - opal_output(mca_crcp_coord_component.super.output_handle, + orte_output(mca_crcp_coord_component.super.output_handle, "crcp:coord: pml_probe(): Failed trying to find a drained message." " This should never happen. (%d)", ret); @@ -972,7 +972,7 @@ ompi_crcp_base_pml_state_t* ompi_crcp_coord_pml_probe( * - Copy of the status structure to pass back to the user */ if( NULL != drain_msg_ref ) { - OPAL_OUTPUT_VERBOSE((10, mca_crcp_coord_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((10, mca_crcp_coord_component.super.output_handle, "crcp:coord: pml_iprobe(): Matched a drained message...")); /* Copy the status information */ @@ -998,7 +998,7 @@ ompi_crcp_base_pml_state_t* ompi_crcp_coord_pml_dump( int verbose, ompi_crcp_base_pml_state_t* pml_state ) { - OPAL_OUTPUT_VERBOSE((20, mca_crcp_coord_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((20, mca_crcp_coord_component.super.output_handle, "crcp:coord: pml_dump()")); pml_state->error_code = OMPI_SUCCESS; return pml_state; @@ -1010,7 +1010,7 @@ ompi_crcp_base_pml_state_t* ompi_crcp_coord_pml_add_comm( struct ompi_communicator_t* comm, ompi_crcp_base_pml_state_t* pml_state ) { - OPAL_OUTPUT_VERBOSE((20, mca_crcp_coord_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((20, mca_crcp_coord_component.super.output_handle, "crcp:coord: pml_add_comm()")); pml_state->error_code = OMPI_SUCCESS; return pml_state; @@ -1020,7 +1020,7 @@ ompi_crcp_base_pml_state_t* ompi_crcp_coord_pml_del_comm( struct ompi_communicator_t* comm, ompi_crcp_base_pml_state_t* pml_state ) { - OPAL_OUTPUT_VERBOSE((20, mca_crcp_coord_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((20, mca_crcp_coord_component.super.output_handle, "crcp:coord: pml_del_comm()")); pml_state->error_code = OMPI_SUCCESS; return pml_state; @@ -1039,7 +1039,7 @@ ompi_crcp_base_pml_state_t* ompi_crcp_coord_pml_add_procs( goto DONE; } - OPAL_OUTPUT_VERBOSE((20, mca_crcp_coord_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((20, mca_crcp_coord_component.super.output_handle, "crcp:coord: pml_add_procs()")); /* @@ -1079,13 +1079,13 @@ ompi_crcp_base_pml_state_t* ompi_crcp_coord_pml_del_procs( goto DONE; } - OPAL_OUTPUT_VERBOSE((20, mca_crcp_coord_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((20, mca_crcp_coord_component.super.output_handle, "crcp:coord: pml_del_procs()")); for( i = 0; i < nprocs; ++i) { item = (opal_list_item_t*)find_peer(procs[i]->proc_name); if(NULL == item) { - opal_output(mca_crcp_coord_component.super.output_handle, + orte_output(mca_crcp_coord_component.super.output_handle, "crcp:coord: del_procs: Unable to find peer %s\n", ORTE_NAME_PRINT(&(procs[i]->proc_name))); exit_status = OMPI_ERROR; @@ -1119,7 +1119,7 @@ ompi_crcp_base_pml_state_t* ompi_crcp_coord_pml_isend_init( int exit_status = OMPI_SUCCESS; int ret; - OPAL_OUTPUT_VERBOSE((20, mca_crcp_coord_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((20, mca_crcp_coord_component.super.output_handle, "crcp:coord: pml_isend_init()")); /* @@ -1131,13 +1131,13 @@ ompi_crcp_base_pml_state_t* ompi_crcp_coord_pml_isend_init( * Find the peer reference */ if( OMPI_SUCCESS != (ret = find_peer_in_comm(comm, dst, &peer_ref) ) ){ - opal_output(mca_crcp_coord_component.super.output_handle, + orte_output(mca_crcp_coord_component.super.output_handle, "crcp:coord: isend: Failed to find peer_ref\n"); exit_status = ret; goto DONE; } if( NULL == peer_ref ) { - opal_output(mca_crcp_coord_component.super.output_handle, + orte_output(mca_crcp_coord_component.super.output_handle, "crcp:coord: isend: Failed to find peer_ref - peer_ref is NULL\n"); exit_status = ret; goto DONE; @@ -1213,7 +1213,7 @@ ompi_crcp_base_pml_state_t* ompi_crcp_coord_pml_isend( int exit_status = OMPI_SUCCESS; int ret; - OPAL_OUTPUT_VERBOSE((20, mca_crcp_coord_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((20, mca_crcp_coord_component.super.output_handle, "crcp:coord: pml_isend()")); /* @@ -1225,13 +1225,13 @@ ompi_crcp_base_pml_state_t* ompi_crcp_coord_pml_isend( * Find the peer reference */ if( OMPI_SUCCESS != (ret = find_peer_in_comm(comm, dst, &peer_ref) ) ){ - opal_output(mca_crcp_coord_component.super.output_handle, + orte_output(mca_crcp_coord_component.super.output_handle, "crcp:coord: isend: Failed to find peer_ref\n"); exit_status = ret; goto DONE; } if( NULL == peer_ref ) { - opal_output(mca_crcp_coord_component.super.output_handle, + orte_output(mca_crcp_coord_component.super.output_handle, "crcp:coord: isend: Failed to find peer_ref - peer_ref is NULL\n"); exit_status = ret; goto DONE; @@ -1308,7 +1308,7 @@ ompi_crcp_base_pml_state_t* ompi_crcp_coord_pml_send( int exit_status = OMPI_SUCCESS; int ret; - OPAL_OUTPUT_VERBOSE((20, mca_crcp_coord_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((20, mca_crcp_coord_component.super.output_handle, "crcp:coord: pml_send()")); /* @@ -1320,13 +1320,13 @@ ompi_crcp_base_pml_state_t* ompi_crcp_coord_pml_send( * Find the peer reference */ if( OMPI_SUCCESS != (ret = find_peer_in_comm(comm, dst, &peer_ref) ) ){ - opal_output(mca_crcp_coord_component.super.output_handle, + orte_output(mca_crcp_coord_component.super.output_handle, "crcp:coord: send: Failed to find peer_ref\n"); exit_status = ret; goto DONE; } if( NULL == peer_ref ) { - opal_output(mca_crcp_coord_component.super.output_handle, + orte_output(mca_crcp_coord_component.super.output_handle, "crcp:coord: send: Failed to find peer_ref - peer_ref is NULL\n"); exit_status = ret; goto DONE; @@ -1407,7 +1407,7 @@ ompi_crcp_base_pml_state_t* ompi_crcp_coord_pml_irecv_init( int exit_status = OMPI_SUCCESS; int ret; - OPAL_OUTPUT_VERBOSE((20, mca_crcp_coord_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((20, mca_crcp_coord_component.super.output_handle, "crcp:coord: pml_irecv_init()")); /* @@ -1449,13 +1449,13 @@ ompi_crcp_base_pml_state_t* ompi_crcp_coord_pml_irecv_init( } else { if( OMPI_SUCCESS != (ret = find_peer_in_comm(comm, src, &peer_ref) ) ){ - opal_output(mca_crcp_coord_component.super.output_handle, + orte_output(mca_crcp_coord_component.super.output_handle, "crcp:coord: recv: Failed to find peer_ref\n"); exit_status = ret; goto DONE; } if( NULL == peer_ref ) { - opal_output(mca_crcp_coord_component.super.output_handle, + orte_output(mca_crcp_coord_component.super.output_handle, "crcp:coord: recv: Failed to find peer_ref - peer_ref is NULL\n"); exit_status = ret; goto DONE; @@ -1521,7 +1521,7 @@ ompi_crcp_base_pml_state_t* ompi_crcp_coord_pml_irecv( int exit_status = OMPI_SUCCESS; int ret; - OPAL_OUTPUT_VERBOSE((20, mca_crcp_coord_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((20, mca_crcp_coord_component.super.output_handle, "crcp:coord: pml_irecv()")); /* @@ -1537,7 +1537,7 @@ ompi_crcp_base_pml_state_t* ompi_crcp_coord_pml_irecv( count, tag, src, comm->c_contextid, &drain_msg_ref) ) ) { - opal_output(mca_crcp_coord_component.super.output_handle, + orte_output(mca_crcp_coord_component.super.output_handle, "crcp:coord: pml_irecv(): Failed trying to find a drained message." " This should never happen. (%d)", ret); @@ -1552,7 +1552,7 @@ ompi_crcp_base_pml_state_t* ompi_crcp_coord_pml_irecv( * when we originally drained the message. */ if( NULL != drain_msg_ref ) { - OPAL_OUTPUT_VERBOSE((10, mca_crcp_coord_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((10, mca_crcp_coord_component.super.output_handle, "crcp:coord: pml_irecv(): Matched a drained message. " "[%3d, %3d] vs [%3d, %3d]", (int)datatype->size, (int)count, @@ -1564,7 +1564,7 @@ ompi_crcp_base_pml_state_t* ompi_crcp_coord_pml_irecv( if( 0 != ompi_ddt_copy_content_same_ddt(datatype, count, buf, drain_msg_ref->buffer) ) { - opal_output( mca_crcp_coord_component.super.output_handle, + orte_output( mca_crcp_coord_component.super.output_handle, "crcp:coord: pml_irecv(): Datatype copy failed (%d)", ret); } @@ -1582,13 +1582,13 @@ ompi_crcp_base_pml_state_t* ompi_crcp_coord_pml_irecv( */ if( NULL == peer_ref ) { if( OMPI_SUCCESS != (ret = find_peer_in_comm(comm, src, &peer_ref) ) ){ - opal_output(mca_crcp_coord_component.super.output_handle, + orte_output(mca_crcp_coord_component.super.output_handle, "crcp:coord: recv: Failed to find peer_ref\n"); exit_status = ret; goto DONE; } if( NULL == peer_ref ) { - opal_output(mca_crcp_coord_component.super.output_handle, + orte_output(mca_crcp_coord_component.super.output_handle, "crcp:coord: recv: Failed to find peer_ref - peer_ref is NULL\n"); exit_status = ret; goto DONE; @@ -1636,13 +1636,13 @@ ompi_crcp_base_pml_state_t* ompi_crcp_coord_pml_irecv( } else { if( OMPI_SUCCESS != (ret = find_peer_in_comm(comm, src, &peer_ref) ) ){ - opal_output(mca_crcp_coord_component.super.output_handle, + orte_output(mca_crcp_coord_component.super.output_handle, "crcp:coord: recv: Failed to find peer_ref\n"); exit_status = ret; goto DONE; } if( NULL == peer_ref ) { - opal_output(mca_crcp_coord_component.super.output_handle, + orte_output(mca_crcp_coord_component.super.output_handle, "crcp:coord: recv: Failed to find peer_ref - peer_ref is NULL\n"); exit_status = ret; goto DONE; @@ -1710,7 +1710,7 @@ ompi_crcp_base_pml_state_t* ompi_crcp_coord_pml_recv( int exit_status = OMPI_SUCCESS; int ret; - OPAL_OUTPUT_VERBOSE((20, mca_crcp_coord_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((20, mca_crcp_coord_component.super.output_handle, "crcp:coord: pml_recv()")); /* @@ -1726,7 +1726,7 @@ ompi_crcp_base_pml_state_t* ompi_crcp_coord_pml_recv( count, tag, src, comm->c_contextid, &drain_msg_ref) ) ) { - opal_output(mca_crcp_coord_component.super.output_handle, + orte_output(mca_crcp_coord_component.super.output_handle, "crcp:coord: pml_recv(): Failed trying to find a drained message." " This should never happen. (%d)", ret); @@ -1741,7 +1741,7 @@ ompi_crcp_base_pml_state_t* ompi_crcp_coord_pml_recv( * when we originally drained the message. */ if( NULL != drain_msg_ref ) { - OPAL_OUTPUT_VERBOSE((10, mca_crcp_coord_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((10, mca_crcp_coord_component.super.output_handle, "crcp:coord: pml_recv(): Matched a drained message...")); /* Copy the drained message */ @@ -1749,7 +1749,7 @@ ompi_crcp_base_pml_state_t* ompi_crcp_coord_pml_recv( tag = drain_msg_ref->tag; if( 0 != ompi_ddt_copy_content_same_ddt(datatype, count, buf, drain_msg_ref->buffer) ) { - opal_output( mca_crcp_coord_component.super.output_handle, + orte_output( mca_crcp_coord_component.super.output_handle, "crcp:coord: pml_recv(): Datatype copy failed (%d)", ret); } @@ -1768,13 +1768,13 @@ ompi_crcp_base_pml_state_t* ompi_crcp_coord_pml_recv( */ if( NULL == peer_ref ) { if( OMPI_SUCCESS != (ret = find_peer_in_comm(comm, src, &peer_ref) ) ){ - opal_output(mca_crcp_coord_component.super.output_handle, + orte_output(mca_crcp_coord_component.super.output_handle, "crcp:coord: recv: Failed to find peer_ref\n"); exit_status = ret; goto DONE; } if( NULL == peer_ref ) { - opal_output(mca_crcp_coord_component.super.output_handle, + orte_output(mca_crcp_coord_component.super.output_handle, "crcp:coord: recv: Failed to find peer_ref - peer_ref is NULL\n"); exit_status = ret; goto DONE; @@ -1825,13 +1825,13 @@ ompi_crcp_base_pml_state_t* ompi_crcp_coord_pml_recv( } else { if( OMPI_SUCCESS != (ret = find_peer_in_comm(comm, src, &peer_ref) ) ){ - opal_output(mca_crcp_coord_component.super.output_handle, + orte_output(mca_crcp_coord_component.super.output_handle, "crcp:coord: recv: Failed to find peer_ref\n"); exit_status = ret; goto DONE; } if( NULL == peer_ref ) { - opal_output(mca_crcp_coord_component.super.output_handle, + orte_output(mca_crcp_coord_component.super.output_handle, "crcp:coord: recv: Failed to find peer_ref - peer_ref is NULL\n"); exit_status = ret; goto DONE; @@ -1869,14 +1869,14 @@ ompi_crcp_base_pml_state_t* ompi_crcp_coord_pml_recv( src = status->MPI_SOURCE; if( OMPI_SUCCESS != (ret = find_peer_in_comm(comm, src, &peer_ref) ) ){ - opal_output(mca_crcp_coord_component.super.output_handle, + orte_output(mca_crcp_coord_component.super.output_handle, "crcp:coord: recv: Failed to resolve peer_ref (rank %d)\n", src); exit_status = ret; goto DONE; } if( NULL == peer_ref ) { - opal_output(mca_crcp_coord_component.super.output_handle, + orte_output(mca_crcp_coord_component.super.output_handle, "crcp:coord: recv: Failed to resolve peer_ref (rank %d) - peer_ref is NULL\n", src); exit_status = ret; @@ -1932,7 +1932,7 @@ ompi_crcp_base_pml_state_t* ompi_crcp_coord_pml_start( int exit_status = OMPI_SUCCESS; int ret; - OPAL_OUTPUT_VERBOSE((20, mca_crcp_coord_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((20, mca_crcp_coord_component.super.output_handle, "crcp:coord: pml_start()")); /* @@ -1963,13 +1963,13 @@ ompi_crcp_base_pml_state_t* ompi_crcp_coord_pml_start( if( OMPI_SUCCESS != (ret = find_peer_in_comm(breq->req_comm, breq->req_peer, &peer_ref) ) ){ - opal_output(mca_crcp_coord_component.super.output_handle, + orte_output(mca_crcp_coord_component.super.output_handle, "crcp:coord: pml_start(): Failed to find peer_ref\n"); exit_status = ret; goto DONE; } if( NULL == peer_ref ) { - opal_output(mca_crcp_coord_component.super.output_handle, + orte_output(mca_crcp_coord_component.super.output_handle, "crcp:coord: pml_start(): Failed to find peer_ref - peer_ref is NULL\n"); exit_status = ret; goto DONE; @@ -1987,7 +1987,7 @@ ompi_crcp_base_pml_state_t* ompi_crcp_coord_pml_start( FIND_MSG_FALSE, FIND_MSG_TRUE ) ) ) { - opal_output(mca_crcp_coord_component.super.output_handle, + orte_output(mca_crcp_coord_component.super.output_handle, "crcp:coord: pml_start(): Unable to find the proper (recv) message ref for this recv\n"); exit_status = ret; goto DONE; @@ -2013,7 +2013,7 @@ ompi_crcp_base_pml_state_t* ompi_crcp_coord_pml_start( FIND_MSG_FALSE, FIND_MSG_TRUE ) ) ) { - opal_output(mca_crcp_coord_component.super.output_handle, + orte_output(mca_crcp_coord_component.super.output_handle, "crcp:coord: pml_start(): Unable to find the proper (recv) message ref for this recv\n"); exit_status = ret; goto DONE; @@ -2035,7 +2035,7 @@ ompi_crcp_base_pml_state_t* ompi_crcp_coord_pml_start( msg_ref->rank, msg_ref->comm->c_contextid, &drain_msg_ref) ) ) { - opal_output(mca_crcp_coord_component.super.output_handle, + orte_output(mca_crcp_coord_component.super.output_handle, "crcp:coord: pml_start(): Failed trying to find a drained message." " This should never happen. (%d)", ret); @@ -2050,20 +2050,20 @@ ompi_crcp_base_pml_state_t* ompi_crcp_coord_pml_start( if( OMPI_SUCCESS != (ret = find_peer_in_comm(drain_msg_ref->comm, drain_msg_ref->rank, &peer_ref) ) ){ - opal_output(mca_crcp_coord_component.super.output_handle, + orte_output(mca_crcp_coord_component.super.output_handle, "crcp:coord: pml_start: Failed to find peer_ref\n"); exit_status = ret; goto DONE; } if( NULL == peer_ref ) { - opal_output(mca_crcp_coord_component.super.output_handle, + orte_output(mca_crcp_coord_component.super.output_handle, "crcp:coord: pml_start: Failed to find peer_ref - peer_ref is NULL\n"); exit_status = ret; goto DONE; } } - OPAL_OUTPUT_VERBOSE((10, mca_crcp_coord_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((10, mca_crcp_coord_component.super.output_handle, "crcp:coord: pml_start: Matched a Recv_init: total = %d", peer_ref->total_recv_init_msgs)); @@ -2071,7 +2071,7 @@ ompi_crcp_base_pml_state_t* ompi_crcp_coord_pml_start( /* Copy the drained message */ if( 0 != ompi_ddt_copy_content_same_ddt(msg_ref->datatype, msg_ref->count, msg_ref->buffer, drain_msg_ref->buffer) ) { - opal_output( mca_crcp_coord_component.super.output_handle, + orte_output( mca_crcp_coord_component.super.output_handle, "crcp:coord: pml_start(): Datatype copy failed (%d)", ret); } @@ -2121,13 +2121,13 @@ ompi_crcp_base_pml_state_t* ompi_crcp_coord_pml_start( if( OMPI_SUCCESS != (ret = find_peer_in_comm(breq->req_comm, breq->req_peer, &peer_ref) ) ){ - opal_output(mca_crcp_coord_component.super.output_handle, + orte_output(mca_crcp_coord_component.super.output_handle, "crcp:coord: req_start(): Failed to find peer_ref\n"); exit_status = ret; goto DONE; } if( NULL == peer_ref ) { - opal_output(mca_crcp_coord_component.super.output_handle, + orte_output(mca_crcp_coord_component.super.output_handle, "crcp:coord: req_start(): Failed to find peer_ref - peer_ref is NULL\n"); exit_status = ret; goto DONE; @@ -2146,7 +2146,7 @@ ompi_crcp_base_pml_state_t* ompi_crcp_coord_pml_start( FIND_MSG_FALSE, FIND_MSG_TRUE ) ) ) { - opal_output(mca_crcp_coord_component.super.output_handle, + orte_output(mca_crcp_coord_component.super.output_handle, "crcp:coord: pml_start(): Unable to find the proper (send_init) message ref for this recv\n"); exit_status = ret; goto DONE; @@ -2180,7 +2180,7 @@ ompi_crcp_base_pml_state_t* ompi_crcp_coord_pml_start( continue; } else { - opal_output(mca_crcp_coord_component.super.output_handle, + orte_output(mca_crcp_coord_component.super.output_handle, "crcp:coord: pml_start(): Could not find message ref - THIS SHOULD NEVER HAPPEN" "[file %s line %d]\n", __FILE__, __LINE__); @@ -2199,13 +2199,13 @@ ompi_crcp_base_pml_state_t* ompi_crcp_coord_pml_start( if( OMPI_SUCCESS != (ret = find_peer_in_comm(breq->req_comm, breq->req_peer, &peer_ref) ) ){ - opal_output(mca_crcp_coord_component.super.output_handle, + orte_output(mca_crcp_coord_component.super.output_handle, "crcp:coord: pml_start(): Failed to find peer_ref\n"); exit_status = ret; goto DONE; } if( NULL == peer_ref ) { - opal_output(mca_crcp_coord_component.super.output_handle, + orte_output(mca_crcp_coord_component.super.output_handle, "crcp:coord: pml_start(): Failed to find peer_ref - peer_ref is NULL\n"); exit_status = ret; goto DONE; @@ -2223,7 +2223,7 @@ ompi_crcp_base_pml_state_t* ompi_crcp_coord_pml_start( FIND_MSG_FALSE, FIND_MSG_TRUE ) ) ) { - opal_output(mca_crcp_coord_component.super.output_handle, + orte_output(mca_crcp_coord_component.super.output_handle, "crcp:coord: pml_start(): Unable to find the proper (recv) message ref for this recv\n"); exit_status = ret; goto DONE; @@ -2255,7 +2255,7 @@ ompi_crcp_base_pml_state_t* ompi_crcp_coord_pml_start( continue; } else { - opal_output(mca_crcp_coord_component.super.output_handle, + orte_output(mca_crcp_coord_component.super.output_handle, "crcp:coord: pml_start(): Could not find message ref - THIS SHOULD NEVER HAPPEN" "[file %s line %d]\n", __FILE__, __LINE__); @@ -2279,7 +2279,7 @@ ompi_crcp_base_pml_state_t* ompi_crcp_coord_pml_start( FIND_MSG_FALSE, FIND_MSG_TRUE ) ) ) { - opal_output(mca_crcp_coord_component.super.output_handle, + orte_output(mca_crcp_coord_component.super.output_handle, "crcp:coord: pml_start(): Unable to find the proper (recv) message ref for this recv\n"); exit_status = ret; goto DONE; @@ -2311,7 +2311,7 @@ ompi_crcp_base_pml_state_t* ompi_crcp_coord_pml_start( continue; } else { - opal_output(mca_crcp_coord_component.super.output_handle, + orte_output(mca_crcp_coord_component.super.output_handle, "crcp:coord: pml_start(): Could not find message ref - THIS SHOULD NEVER HAPPEN" "[file %s line %d]\n", __FILE__, __LINE__); @@ -2324,7 +2324,7 @@ ompi_crcp_base_pml_state_t* ompi_crcp_coord_pml_start( * Unkonwn request type... */ else { - opal_output(mca_crcp_coord_component.super.output_handle, + orte_output(mca_crcp_coord_component.super.output_handle, "crcp:coord: pml_start(POST): Unknown Request type (%d)", breq->req_type); pml_state->error_code = OMPI_ERROR; @@ -2357,7 +2357,7 @@ int ompi_crcp_coord_request_complete(struct ompi_request_t *request) int src; int tag; - OPAL_OUTPUT_VERBOSE((20, mca_crcp_coord_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((20, mca_crcp_coord_component.super.output_handle, "crcp:coord: pml_request_complete()")); /* @@ -2386,7 +2386,7 @@ int ompi_crcp_coord_request_complete(struct ompi_request_t *request) if( OMPI_SUCCESS != (ret = find_peer_in_comm(breq->req_comm, request->req_status.MPI_SOURCE, &peer_ref) ) ){ - opal_output(mca_crcp_coord_component.super.output_handle, + orte_output(mca_crcp_coord_component.super.output_handle, "crcp:coord: req_complete(): Failed to find peer_ref\n"); exit_status = ret; goto DONE; @@ -2395,14 +2395,14 @@ int ompi_crcp_coord_request_complete(struct ompi_request_t *request) if( OMPI_SUCCESS != (ret = find_peer_in_comm(breq->req_comm, src, &peer_ref) ) ){ - opal_output(mca_crcp_coord_component.super.output_handle, + orte_output(mca_crcp_coord_component.super.output_handle, "crcp:coord: req_complete(): Failed to find peer_ref\n"); exit_status = ret; goto DONE; } } if( NULL == peer_ref ) { - opal_output(mca_crcp_coord_component.super.output_handle, + orte_output(mca_crcp_coord_component.super.output_handle, "crcp:coord: req_complete(): Failed to find peer_ref - peer_ref is NULL\n"); exit_status = ret; goto DONE; @@ -2428,13 +2428,13 @@ int ompi_crcp_coord_request_complete(struct ompi_request_t *request) FIND_MSG_TRUE, FIND_MSG_TRUE ) ) ) { - opal_output(mca_crcp_coord_component.super.output_handle, + orte_output(mca_crcp_coord_component.super.output_handle, "crcp:coord: req_complete: Unable to find the proper (isend) message ref for this complete\n"); exit_status = ret; goto DONE; } if( NULL != msg_ref ) { - OPAL_OUTPUT_VERBOSE((15, mca_crcp_coord_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((15, mca_crcp_coord_component.super.output_handle, "crcp:coord: req_complete: Matched an iSend: total = %d", peer_ref->total_isend_msgs)); goto FOUND; @@ -2467,7 +2467,7 @@ int ompi_crcp_coord_request_complete(struct ompi_request_t *request) FIND_MSG_TRUE, FIND_MSG_TRUE ) ) ) { - opal_output(mca_crcp_coord_component.super.output_handle, + orte_output(mca_crcp_coord_component.super.output_handle, "crcp:coord: req_complete: Unable to find the proper (send_init) message ref for this complete\n"); exit_status = ret; goto DONE; @@ -2515,7 +2515,7 @@ int ompi_crcp_coord_request_complete(struct ompi_request_t *request) FIND_MSG_TRUE, FIND_MSG_TRUE ) ) ) { - opal_output(mca_crcp_coord_component.super.output_handle, + orte_output(mca_crcp_coord_component.super.output_handle, "crcp:coord: req_complete: Unable to find the proper (irecv) message ref for this complete\n"); exit_status = ret; goto DONE; @@ -2528,7 +2528,7 @@ int ompi_crcp_coord_request_complete(struct ompi_request_t *request) peer_ref->total_irecv_msgs += 1; } - OPAL_OUTPUT_VERBOSE((15, mca_crcp_coord_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((15, mca_crcp_coord_component.super.output_handle, "crcp:coord: req_complete: Matched an iRecv: total = %d", peer_ref->total_irecv_msgs)); goto FOUND; @@ -2550,7 +2550,7 @@ int ompi_crcp_coord_request_complete(struct ompi_request_t *request) FIND_MSG_TRUE, FIND_MSG_TRUE ) ) ) { - opal_output(mca_crcp_coord_component.super.output_handle, + orte_output(mca_crcp_coord_component.super.output_handle, "crcp:coord: req_complete: Unable to find the proper (recv_init) message ref for this complete\n"); exit_status = ret; goto DONE; @@ -2566,7 +2566,7 @@ int ompi_crcp_coord_request_complete(struct ompi_request_t *request) peer_ref->total_irecv_msgs += 1; } - OPAL_OUTPUT_VERBOSE((15, mca_crcp_coord_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((15, mca_crcp_coord_component.super.output_handle, "crcp:coord: req_complete: Matched an iRecv: total = %d", peer_ref->total_irecv_msgs)); goto FOUND; @@ -2599,7 +2599,7 @@ int ompi_crcp_coord_request_complete(struct ompi_request_t *request) FIND_MSG_TRUE, FIND_MSG_TRUE ) ) ) { - opal_output(mca_crcp_coord_component.super.output_handle, + orte_output(mca_crcp_coord_component.super.output_handle, "crcp:coord: req_complete: Unable to find the proper (recv_init) message ref for this complete\n"); exit_status = ret; goto DONE; @@ -2627,7 +2627,7 @@ int ompi_crcp_coord_request_complete(struct ompi_request_t *request) FIND_MSG_TRUE, FIND_MSG_TRUE ) ) ) { - opal_output(mca_crcp_coord_component.super.output_handle, + orte_output(mca_crcp_coord_component.super.output_handle, "crcp:coord: requ_complete: Unable to find the proper (recv_init) message ref for this complete\n"); exit_status = ret; goto DONE; @@ -2664,7 +2664,7 @@ int ompi_crcp_coord_request_complete(struct ompi_request_t *request) * An unknown type of request is completing. */ else { - opal_output(mca_crcp_coord_component.super.output_handle, + orte_output(mca_crcp_coord_component.super.output_handle, "crcp:coord: req_complete: Unknown request type... %d", breq->req_type); } @@ -2680,7 +2680,7 @@ int ompi_crcp_coord_request_complete(struct ompi_request_t *request) msg_ref->done = true; msg_ref->active = false; - OPAL_OUTPUT_VERBOSE((25, mca_crcp_coord_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((25, mca_crcp_coord_component.super.output_handle, "crcp:coord: req_complete: Marked Message... ( %d, %d )\n", peer_ref->total_isend_msgs, peer_ref->total_irecv_msgs)); } @@ -2690,7 +2690,7 @@ int ompi_crcp_coord_request_complete(struct ompi_request_t *request) * so this case can occur during normal operation. * This is caused by us checking for completeness twice in ompi_request_wait_all. */ - OPAL_OUTPUT_VERBOSE((15, mca_crcp_coord_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((15, mca_crcp_coord_component.super.output_handle, "crcp:coord: request_complete: No match found for this request :( %d, %d ): [%d/%d,%d]\n", peer_ref->total_isend_msgs, peer_ref->total_irecv_msgs, breq->req_peer, src, breq->req_comm->c_contextid)); @@ -2716,7 +2716,7 @@ ompi_crcp_base_pml_state_t* ompi_crcp_coord_pml_ft_event( goto STEP_1; } - OPAL_OUTPUT_VERBOSE((20, mca_crcp_coord_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((20, mca_crcp_coord_component.super.output_handle, "crcp:coord: pml_ft_event()")); /************************** @@ -2736,7 +2736,7 @@ ompi_crcp_base_pml_state_t* ompi_crcp_coord_pml_ft_event( * channels have been flushed. */ if( OMPI_SUCCESS != (ret = ft_event_coordinate_peers()) ) { - opal_output(mca_crcp_coord_component.super.output_handle, + orte_output(mca_crcp_coord_component.super.output_handle, "crcp:coord: ft_event: Checkpoint Coordination Failed %d", ret); exit_status = ret; @@ -2744,7 +2744,7 @@ ompi_crcp_base_pml_state_t* ompi_crcp_coord_pml_ft_event( } if( stall_for_completion ) { - OPAL_OUTPUT_VERBOSE((10, mca_crcp_coord_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((10, mca_crcp_coord_component.super.output_handle, "crcp:coord: pml_ft_event: STALLING PID %d\n", getpid())); @@ -2770,7 +2770,7 @@ ompi_crcp_base_pml_state_t* ompi_crcp_coord_pml_ft_event( * Finish the coord protocol */ if( OMPI_SUCCESS != (ret = ft_event_finalize_exchange() ) ) { - opal_output(mca_crcp_coord_component.super.output_handle, + orte_output(mca_crcp_coord_component.super.output_handle, "crcp:coord: pml_ft_event: Checkpoint Finalization Failed %d", ret); exit_status = ret; @@ -2803,7 +2803,7 @@ ompi_crcp_base_pml_state_t* ompi_crcp_coord_pml_ft_event( * Finish the coord protocol */ if( OMPI_SUCCESS != (ret = ft_event_finalize_exchange() ) ) { - opal_output(mca_crcp_coord_component.super.output_handle, + orte_output(mca_crcp_coord_component.super.output_handle, "crcp:coord: pml_ft_event: Checkpoint Finalization Failed %d", ret); exit_status = ret; @@ -2894,7 +2894,7 @@ static int find_drained_msg(size_t ddt_size, drain_msg = (ompi_crcp_coord_pml_message_ref_t*)item; - OPAL_OUTPUT_VERBOSE((15, mca_crcp_coord_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((15, mca_crcp_coord_component.super.output_handle, "crcp:coord: find_drain_msg(): Compare [%d, %d, %d, %d] to %c-[%d, %d, %d, %d]", (int)ddt_size, (int)count, tag, peer, (NULL == drain_msg->buffer ? 'T' : 'F'), @@ -2962,7 +2962,7 @@ static int ft_event_coordinate_peers(void) */ START_TIMER(CRCP_TIMER_CKPT_EX_B); if( OMPI_SUCCESS != (ret = ft_event_exchange_bookmarks() ) ) { - opal_output(mca_crcp_coord_component.super.output_handle, + orte_output(mca_crcp_coord_component.super.output_handle, "crcp:coord: ft_event_coordinate_peers: Bookmark Exchange Failed %d", ret); exit_status = ret; @@ -2975,7 +2975,7 @@ static int ft_event_coordinate_peers(void) */ START_TIMER(CRCP_TIMER_CKPT_CK_B); if( OMPI_SUCCESS != (ret = ft_event_check_bookmarks() ) ) { - opal_output(mca_crcp_coord_component.super.output_handle, + orte_output(mca_crcp_coord_component.super.output_handle, "crcp:coord: ft_event_coordinate_peers: Bookmark Check Failed %d", ret); exit_status = ret; @@ -2988,7 +2988,7 @@ static int ft_event_coordinate_peers(void) */ START_TIMER(CRCP_TIMER_CKPT_POST); if( OMPI_SUCCESS != (ret = ft_event_post_drain_acks() ) ) { - opal_output(mca_crcp_coord_component.super.output_handle, + orte_output(mca_crcp_coord_component.super.output_handle, "crcp:coord: ft_event_coordinate_peers: Bookmark Post Drain ACKS Failed %d", ret); exit_status = ret; @@ -2996,7 +2996,7 @@ static int ft_event_coordinate_peers(void) } if( OMPI_SUCCESS != (ret = ft_event_post_drained() ) ) { - opal_output(mca_crcp_coord_component.super.output_handle, + orte_output(mca_crcp_coord_component.super.output_handle, "crcp:coord: ft_event_coordinate_peers: Bookmark Post Drain Msgs Failed %d", ret); exit_status = ret; @@ -3008,7 +3008,7 @@ static int ft_event_coordinate_peers(void) * Check if we need to stall for completion of tasks */ if( stall_for_completion ) { - OPAL_OUTPUT_VERBOSE((15, mca_crcp_coord_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((15, mca_crcp_coord_component.super.output_handle, "crcp:coord: ft_event_coordinate_peers: %s **** STALLING ***", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME))); step_to_return_to = 1; @@ -3026,7 +3026,7 @@ static int ft_event_coordinate_peers(void) */ START_TIMER(CRCP_TIMER_CKPT_WAIT); if( OMPI_SUCCESS != (ret = ft_event_wait_quiesce() ) ) { - opal_output(mca_crcp_coord_component.super.output_handle, + orte_output(mca_crcp_coord_component.super.output_handle, "crcp:coord: ft_event_coordinate_peers: Wait Quiesce Failed %d", ret); exit_status = ret; @@ -3034,7 +3034,7 @@ static int ft_event_coordinate_peers(void) } END_TIMER(CRCP_TIMER_CKPT_WAIT); - OPAL_OUTPUT_VERBOSE((5, mca_crcp_coord_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((5, mca_crcp_coord_component.super.output_handle, "crcp:coord: ft_event_coordinate_peers: %s Coordination Finished...\n", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME))); @@ -3162,10 +3162,10 @@ static int ft_event_check_bookmarks(void) if( 10 <= mca_crcp_coord_component.super.verbose ) { sleep(ORTE_PROC_MY_NAME->vpid); - OPAL_OUTPUT_VERBOSE((10, mca_crcp_coord_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((10, mca_crcp_coord_component.super.output_handle, "Process %s Match Table", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME))); - OPAL_OUTPUT_VERBOSE((10, mca_crcp_coord_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((10, mca_crcp_coord_component.super.output_handle, "%s %5s | %7s | %7s | %7s | %7s |", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), "Vpid", "T_Send", "M_Recv", "M_Send", "T_Recv")); @@ -3191,7 +3191,7 @@ static int ft_event_check_bookmarks(void) peer_ref->matched_irecv_msgs + peer_ref->matched_recv_init_msgs ); - OPAL_OUTPUT_VERBOSE((10, mca_crcp_coord_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((10, mca_crcp_coord_component.super.output_handle, "%s %5d | %7d | %7d | %7d | %7d |", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), peer_ref->proc_name.vpid, @@ -3231,7 +3231,7 @@ static int ft_event_check_bookmarks(void) /* T_Send >= M_Recv */ if( p_n_to_p_m < p_n_from_p_m ) { - opal_output(mca_crcp_coord_component.super.output_handle, + orte_output(mca_crcp_coord_component.super.output_handle, "crcp:coord: check_bookmarks: %s --> %s " "Sent Msgs (%4d) = Received Msgs (%4d) => Diff (%4d). " " WARNING: Peer received more than was sent. :(\n", @@ -3246,7 +3246,7 @@ static int ft_event_check_bookmarks(void) /* I've send more than my peer has received, * so need to coordinate with peer. */ if( p_n_to_p_m > p_n_from_p_m) { - OPAL_OUTPUT_VERBOSE((10, mca_crcp_coord_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((10, mca_crcp_coord_component.super.output_handle, "crcp:coord: check_bookmarks: %s --> %s " "Sent Msgs (%4d) = Received Msgs (%4d). Peer needs %4d.\n", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), @@ -3261,7 +3261,7 @@ static int ft_event_check_bookmarks(void) * information for all of the messages since the last checkpoint */ if( OMPI_SUCCESS != (ret = send_msg_details(peer_ref, p_n_to_p_m, p_n_from_p_m) ) ) { - opal_output(mca_crcp_coord_component.super.output_handle, + orte_output(mca_crcp_coord_component.super.output_handle, "crcp:coord: check_bookmarks: Unable to send message details to peer %s: Return %d\n", ORTE_NAME_PRINT(&peer_ref->proc_name), ret); @@ -3282,7 +3282,7 @@ static int ft_event_check_bookmarks(void) /* M_Send >= T_Recv */ if( p_n_to_p_m < p_n_from_p_m ) { - opal_output(mca_crcp_coord_component.super.output_handle, + orte_output(mca_crcp_coord_component.super.output_handle, "crcp:coord: check_bookmarks: %s --> %s " "Sent Msgs (%4d) = Received Msgs (%4d) => Diff (%4d). " " WARNING: I received more than the peer sent. :(\n", @@ -3297,7 +3297,7 @@ static int ft_event_check_bookmarks(void) /* I've recv'ed less than my peer has sent, * so need to coordinate with peer. */ if( p_n_to_p_m > p_n_from_p_m) { - OPAL_OUTPUT_VERBOSE((10, mca_crcp_coord_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((10, mca_crcp_coord_component.super.output_handle, "crcp:coord: check_bookmarks: %s <-- %s " "Received Msgs (%4d) = Sent Msgs (%4d). I need %4d.\n", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), @@ -3311,7 +3311,7 @@ static int ft_event_check_bookmarks(void) * As we figure out what they are post Irecv's for them into a drained buffer list. */ if( OMPI_SUCCESS != (ret = recv_msg_details(peer_ref, p_n_to_p_m, p_n_from_p_m) ) ) { - opal_output(mca_crcp_coord_component.super.output_handle, + orte_output(mca_crcp_coord_component.super.output_handle, "crcp:coord: check_bookmarks: Unable to recv message details from peer %s: Return %d\n", ORTE_NAME_PRINT(&peer_ref->proc_name), ret); @@ -3334,7 +3334,7 @@ static int ft_event_check_bookmarks(void) /* M_Send >= T_Recv */ if( p_n_to_p_m < p_n_from_p_m ) { - opal_output(mca_crcp_coord_component.super.output_handle, + orte_output(mca_crcp_coord_component.super.output_handle, "crcp:coord: check_bookmarks: %s --> %s " "Sent Msgs (%4d) = Received Msgs (%4d) => Diff (%4d). " " WARNING: I received more than the peer sent. :(\n", @@ -3349,7 +3349,7 @@ static int ft_event_check_bookmarks(void) /* I've recv'ed less than my peer has sent, * so need to coordinate with peer. */ if( p_n_to_p_m > p_n_from_p_m) { - OPAL_OUTPUT_VERBOSE((10, mca_crcp_coord_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((10, mca_crcp_coord_component.super.output_handle, "crcp:coord: check_bookmarks: %s <-- %s " "Received Msgs (%4d) = Sent Msgs (%4d). I need %4d.\n", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), @@ -3363,7 +3363,7 @@ static int ft_event_check_bookmarks(void) * As we figure out what they are post Irecv's for them into a drained buffer list. */ if( OMPI_SUCCESS != (ret = recv_msg_details(peer_ref, p_n_to_p_m, p_n_from_p_m) ) ) { - opal_output(mca_crcp_coord_component.super.output_handle, + orte_output(mca_crcp_coord_component.super.output_handle, "crcp:coord: check_bookmarks: Unable to recv message details from peer %s: Return %d\n", ORTE_NAME_PRINT(&peer_ref->proc_name), ret); @@ -3384,7 +3384,7 @@ static int ft_event_check_bookmarks(void) /* T_Send >= M_Recv */ if( p_n_to_p_m < p_n_from_p_m ) { - opal_output(mca_crcp_coord_component.super.output_handle, + orte_output(mca_crcp_coord_component.super.output_handle, "crcp:coord: check_bookmarks: %s --> %s " "Sent Msgs (%4d) = Received Msgs (%4d) => Diff (%4d). " " WARNING: Peer received more than was sent. :(\n", @@ -3399,7 +3399,7 @@ static int ft_event_check_bookmarks(void) /* I've send more than my peer has received, * so need to coordinate with peer. */ if( p_n_to_p_m > p_n_from_p_m) { - OPAL_OUTPUT_VERBOSE((10, mca_crcp_coord_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((10, mca_crcp_coord_component.super.output_handle, "crcp:coord: check_bookmarks: %s --> %s " "Sent Msgs (%4d) = Received Msgs (%4d). Peer needs %4d.\n", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), @@ -3414,7 +3414,7 @@ static int ft_event_check_bookmarks(void) * information for all of the messages since the last checkpoint */ if( OMPI_SUCCESS != (ret = send_msg_details(peer_ref, p_n_to_p_m, p_n_from_p_m) ) ) { - opal_output(mca_crcp_coord_component.super.output_handle, + orte_output(mca_crcp_coord_component.super.output_handle, "crcp:coord: check_bookmarks: Unable to send message details to peer %s: Return %d\n", ORTE_NAME_PRINT(&peer_ref->proc_name), ret); @@ -3448,7 +3448,7 @@ static int ft_event_post_drain_acks(void) return OMPI_SUCCESS; } - OPAL_OUTPUT_VERBOSE((10, mca_crcp_coord_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((10, mca_crcp_coord_component.super.output_handle, "crcp:coord: post_drain_ack: %s Wait on %d Drain ACK Messages.\n", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), (int)req_size)); @@ -3468,7 +3468,7 @@ static int ft_event_post_drain_acks(void) 0, drain_message_ack_cbfunc, NULL) ) ) { - opal_output(mca_crcp_coord_component.super.output_handle, + orte_output(mca_crcp_coord_component.super.output_handle, "crcp:coord: post_drain_acks: %s Failed to post a RML receive to the peer\n", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME)); return ret; @@ -3510,7 +3510,7 @@ static void drain_message_ack_cbfunc(int status, sender) ) { /* We found it! */ drain_msg_ack->complete = true; - OPAL_OUTPUT_VERBOSE((5, mca_crcp_coord_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((5, mca_crcp_coord_component.super.output_handle, "crcp:coord: drain_message_ack_cbfunc: %s --> %s Received ACK of FLUSH from peer\n", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(sender) )); @@ -3519,7 +3519,7 @@ static void drain_message_ack_cbfunc(int status, } } - opal_output(mca_crcp_coord_component.super.output_handle, + orte_output(mca_crcp_coord_component.super.output_handle, "crcp:coord: drain_message_ack_cbfunc: %s --> %s ERROR: Uable to match ACK to peer\n", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(sender) ); @@ -3539,7 +3539,7 @@ static int ft_event_post_drained(void) return OMPI_SUCCESS; } - OPAL_OUTPUT_VERBOSE((10, mca_crcp_coord_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((10, mca_crcp_coord_component.super.output_handle, "crcp:coord: post_drained: %s Draining %d Messages.\n", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), (int)req_size)); @@ -3560,7 +3560,7 @@ static int ft_event_post_drained(void) * we have requests for */ if( drain_msg->already_posted ) { - OPAL_OUTPUT_VERBOSE((15, mca_crcp_coord_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((15, mca_crcp_coord_component.super.output_handle, "crcp:coord: post_drained: %s Found a message that we don't need to post.\n", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME))); continue; @@ -3569,7 +3569,7 @@ static int ft_event_post_drained(void) * Post a receive to drain this message */ else { - OPAL_OUTPUT_VERBOSE((15, mca_crcp_coord_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((15, mca_crcp_coord_component.super.output_handle, "crcp:coord: post_drained: %s Posting a message to be drained from %d.\n", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), drain_msg->rank)); @@ -3580,7 +3580,7 @@ static int ft_event_post_drained(void) drain_msg->tag, drain_msg->comm, &(drain_msg->request) ) ) ) { - opal_output(mca_crcp_coord_component.super.output_handle, + orte_output(mca_crcp_coord_component.super.output_handle, "crcp:coord: post_drained: %s Failed to post the Draining PML iRecv\n", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME) ); return ret; @@ -3600,7 +3600,7 @@ static int ft_event_wait_quiesce(void) * Wait for all draining receives to complete **********************************************/ if( OMPI_SUCCESS != (ret = wait_quiesce_drained() ) ) { - opal_output(mca_crcp_coord_component.super.output_handle, + orte_output(mca_crcp_coord_component.super.output_handle, "crcp:coord: wait_quiesce: %s Failed to quiesce drained messages\n", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME) ); exit_status = ret; @@ -3611,7 +3611,7 @@ static int ft_event_wait_quiesce(void) * If we are waiting for All Clear messages from peers wait on them. *******************************************************************/ if( OMPI_SUCCESS != (ret = wait_quiesce_drain_ack() ) ) { - opal_output(mca_crcp_coord_component.super.output_handle, + orte_output(mca_crcp_coord_component.super.output_handle, "crcp:coord: wait_quiesce: %s Failed to recv all drain ACKs\n", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME) ); exit_status = ret; @@ -3644,7 +3644,7 @@ static int wait_quiesce_drained(void) return OMPI_SUCCESS; } - OPAL_OUTPUT_VERBOSE((5, mca_crcp_coord_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((5, mca_crcp_coord_component.super.output_handle, "crcp:coord: wait_quiesce_drained: %s Waiting on %d messages to drain\n", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), (int)req_size)); @@ -3699,13 +3699,13 @@ static int wait_quiesce_drained(void) * Create the array of requests to wait on */ if( drain_msg->already_posted && NULL == drain_msg->request) { - OPAL_OUTPUT_VERBOSE((10, mca_crcp_coord_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((10, mca_crcp_coord_component.super.output_handle, "crcp:coord: wait_quiesce_drained: %s - %s Already posted this msg.\n", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(&(drain_msg->proc_name)) )); } else { - OPAL_OUTPUT_VERBOSE((15, mca_crcp_coord_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((15, mca_crcp_coord_component.super.output_handle, "crcp:coord: wait_quiesce_drained: %s - %s Waiting on message. (index = %d)\n", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(&(drain_msg->proc_name)), @@ -3730,7 +3730,7 @@ static int wait_quiesce_drained(void) } } if( !found ) { - OPAL_OUTPUT_VERBOSE((15, mca_crcp_coord_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((15, mca_crcp_coord_component.super.output_handle, "crcp:coord: wait_quiesce: %s - %s Add process to response list [idx %d]\n", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(&(drain_msg->proc_name)), @@ -3758,7 +3758,7 @@ static int wait_quiesce_drained(void) /* * Send ACKs to all peers */ - OPAL_OUTPUT_VERBOSE((5, mca_crcp_coord_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((5, mca_crcp_coord_component.super.output_handle, "crcp:coord: wait_quiesce: %s Send ACKs to all Peers\n", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME))); @@ -3838,7 +3838,7 @@ static int coord_request_wait_all( size_t count, coord_request_wait(req, status); - OPAL_OUTPUT_VERBOSE((15, mca_crcp_coord_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((15, mca_crcp_coord_component.super.output_handle, "crcp:coord: request_wait_all: %s Done with idx %d of %d\n", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), (int)i, (int)count)); @@ -3875,7 +3875,7 @@ static int wait_quiesce_drain_ack(void) return OMPI_SUCCESS; } - OPAL_OUTPUT_VERBOSE((10, mca_crcp_coord_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((10, mca_crcp_coord_component.super.output_handle, "crcp:coord: wait_quiesce_drain_ack: %s Waiting on %d Drain ACK messages\n", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), num_outstanding)); @@ -3923,14 +3923,14 @@ static int send_bookmarks(int peer_idx) peer_name.vpid = peer_idx; if( NULL == (peer_ref = find_peer(peer_name))) { - opal_output(mca_crcp_coord_component.super.output_handle, + orte_output(mca_crcp_coord_component.super.output_handle, "crcp:coord: send_bookmarks: Could not find peer indexed %d\n", peer_idx); exit_status = OMPI_ERROR; goto cleanup; } - OPAL_OUTPUT_VERBOSE((15, mca_crcp_coord_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((15, mca_crcp_coord_component.super.output_handle, "crcp:coord: send_bookmarks: %s -> %s Sending bookmark S[%4d,%4d,%4d] R[%4d,%4d,%4d]\n", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(&peer_name), @@ -3964,7 +3964,7 @@ static int send_bookmarks(int peer_idx) "crcp:coord: send_bookmarks: Unable to pack total_recv_init_msgs"); if ( 0 > ( ret = orte_rml.send_buffer(&peer_name, buffer, OMPI_CRCP_COORD_BOOKMARK_TAG, 0)) ) { - opal_output(mca_crcp_coord_component.super.output_handle, + orte_output(mca_crcp_coord_component.super.output_handle, "crcp:coord: send_bookmarks: Failed to send bookmark to peer %s: Return %d\n", ORTE_NAME_PRINT(&peer_name), ret); @@ -4002,7 +4002,7 @@ static int recv_bookmarks(int peer_idx) 0, recv_bookmarks_cbfunc, NULL) ) ) { - opal_output(mca_crcp_coord_component.super.output_handle, + orte_output(mca_crcp_coord_component.super.output_handle, "crcp:coord: recv_bookmarks: Failed to post receive bookmark from peer %s: Return %d\n", ORTE_NAME_PRINT(&peer_name), ret); @@ -4037,7 +4037,7 @@ static int recv_bookmarks(int peer_idx) peer_name.vpid = peer_idx; if( NULL == (peer_ref = find_peer(peer_name))) { - opal_output(mca_crcp_coord_component.super.output_handle, + orte_output(mca_crcp_coord_component.super.output_handle, "crcp:coord: recv_bookmarks: Could not find peer indexed %d\n", peer_idx); exit_status = OMPI_ERROR; @@ -4053,7 +4053,7 @@ static int recv_bookmarks(int peer_idx) } if ( 0 > (ret = orte_rml.recv_buffer(&peer_name, buffer, OMPI_CRCP_COORD_BOOKMARK_TAG, 0) ) , 0) { - opal_output(mca_crcp_coord_component.super.output_handle, + orte_output(mca_crcp_coord_component.super.output_handle, "crcp:coord: recv_bookmarks: Failed to receive bookmark from peer %s: Return %d\n", ORTE_NAME_PRINT(&peer_name), ret); @@ -4081,7 +4081,7 @@ static int recv_bookmarks(int peer_idx) "crcp:coord: recv_bookmarks: Unable to unpack total_recv_init_msgs"); peer_ref->matched_recv_init_msgs = tmp_int; - OPAL_OUTPUT_VERBOSE((15, mca_crcp_coord_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((15, mca_crcp_coord_component.super.output_handle, "crcp:coord: recv_bookmarks: %s <- %s Received bookmark S[%4d,%4d,%4d] R[%4d,%4d,%4d]\n", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(&peer_name), @@ -4123,7 +4123,7 @@ static void recv_bookmarks_cbfunc(int status, * Find the peer structure for this peer */ if( NULL == (peer_ref = find_peer(*sender))) { - opal_output(mca_crcp_coord_component.super.output_handle, + orte_output(mca_crcp_coord_component.super.output_handle, "crcp:coord: recv_bookmarks: Could not find peer indexed %d\n", peer_idx); exit_status = OMPI_ERROR; @@ -4150,7 +4150,7 @@ static void recv_bookmarks_cbfunc(int status, "crcp:coord: recv_bookmarks: Unable to unpack total_recv_init_msgs"); peer_ref->matched_recv_init_msgs = tmp_int; - OPAL_OUTPUT_VERBOSE((15, mca_crcp_coord_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((15, mca_crcp_coord_component.super.output_handle, "crcp:coord: recv_bookmarks: %s <- %s Received bookmark S[%4d,%4d,%4d] R[%4d,%4d,%4d]\n", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(sender), @@ -4206,7 +4206,7 @@ static int send_msg_details(ompi_crcp_coord_pml_peer_ref_t *peer_ref, found_match = false; if(OMPI_SUCCESS != (ret = do_send_msg_detail(peer_ref, msg_ref, &found_match, &finished)) ) { - opal_output(mca_crcp_coord_component.super.output_handle, + orte_output(mca_crcp_coord_component.super.output_handle, "crcp:coord: send_msg_details: %s --> %s Failed to send message details to peer. Return %d\n", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(&(peer_ref->proc_name)), @@ -4242,7 +4242,7 @@ static int send_msg_details(ompi_crcp_coord_pml_peer_ref_t *peer_ref, ALL_SENT: if( need > found ) { - OPAL_OUTPUT_VERBOSE((10, mca_crcp_coord_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((10, mca_crcp_coord_component.super.output_handle, "crcp:coord: send_msg_details: ERROR: ****** Need (%d) vs Found (%d)", need, found)); } @@ -4257,7 +4257,7 @@ static int send_msg_details(ompi_crcp_coord_pml_peer_ref_t *peer_ref, d_msg_ack->peer.vpid = peer_ref->proc_name.vpid; d_msg_ack->complete = false; opal_list_append(&drained_msg_ack_list, &(d_msg_ack->super)); - OPAL_OUTPUT_VERBOSE((10, mca_crcp_coord_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((10, mca_crcp_coord_component.super.output_handle, "crcp:coord: send_msg_details: %s <--> %s Will wait on ACK from this peer.\n", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(&(peer_ref->proc_name)))); @@ -4329,7 +4329,7 @@ static int do_send_msg_detail(ompi_crcp_coord_pml_peer_ref_t *peer_ref, */ if ( 0 > ( ret = orte_rml.send_buffer(&peer_ref->proc_name, buffer, OMPI_CRCP_COORD_BOOKMARK_TAG, 0)) ) { - opal_output(mca_crcp_coord_component.super.output_handle, + orte_output(mca_crcp_coord_component.super.output_handle, "crcp:coord: do_send_msg_detail: Unable to send message details to peer %s: Return %d\n", ORTE_NAME_PRINT(&peer_ref->proc_name), ret); @@ -4356,7 +4356,7 @@ static int do_send_msg_detail(ompi_crcp_coord_pml_peer_ref_t *peer_ref, */ if ( 0 > (ret = orte_rml.recv_buffer(&peer_ref->proc_name, buffer, OMPI_CRCP_COORD_BOOKMARK_TAG, 0) ) ) { - opal_output(mca_crcp_coord_component.super.output_handle, + orte_output(mca_crcp_coord_component.super.output_handle, "crcp:coord: do_send_msg_detail: %s --> %s Failed to receive ACK buffer from peer. Return %d\n", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(&(peer_ref->proc_name)), @@ -4427,7 +4427,7 @@ static int recv_msg_details(ompi_crcp_coord_pml_peer_ref_t *peer_ref, &p_rank, &p_comm_id, &p_tag, &p_count, &p_datatype_size)) ) { - opal_output(mca_crcp_coord_component.super.output_handle, + orte_output(mca_crcp_coord_component.super.output_handle, "crcp:coord: recv_msg_details: %s <-- %s " "Failed to receive message detail from peer. Return %d\n", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), @@ -4447,7 +4447,7 @@ static int recv_msg_details(ompi_crcp_coord_pml_peer_ref_t *peer_ref, p_tag, p_count, p_datatype_size, &found_match) ) ) { - opal_output(mca_crcp_coord_component.super.output_handle, + orte_output(mca_crcp_coord_component.super.output_handle, "crcp:coord: recv_msg_details: %s <-- %s " "Failed to check message detail from peer. Return %d\n", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), @@ -4475,7 +4475,7 @@ static int recv_msg_details(ompi_crcp_coord_pml_peer_ref_t *peer_ref, } if(OMPI_SUCCESS != (ret = do_recv_msg_detail_resp(peer_ref, response))) { - opal_output(mca_crcp_coord_component.super.output_handle, + orte_output(mca_crcp_coord_component.super.output_handle, "crcp:coord: recv_msg_details: %s <-- %s Failed to respond to peer. Return %d\n", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(&(peer_ref->proc_name)), @@ -4507,7 +4507,7 @@ static int do_recv_msg_detail(ompi_crcp_coord_pml_peer_ref_t *peer_ref, * Recv the msg */ if ( 0 > (ret = orte_rml.recv_buffer(&peer_ref->proc_name, buffer, OMPI_CRCP_COORD_BOOKMARK_TAG, 0) ) ) { - opal_output(mca_crcp_coord_component.super.output_handle, + orte_output(mca_crcp_coord_component.super.output_handle, "crcp:coord: do_recv_msg_detail: %s <-- %s Failed to receive buffer from peer. Return %d\n", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(&(peer_ref->proc_name)), @@ -4568,7 +4568,7 @@ static int do_recv_msg_detail_check(ompi_crcp_coord_pml_peer_ref_t *peer_ref, &msg_complete, /* Is the recv of the message already finished? */ &msg_already_posted); /* Has the recv already been posted? */ if( OMPI_SUCCESS != ret) { - opal_output(mca_crcp_coord_component.super.output_handle, + orte_output(mca_crcp_coord_component.super.output_handle, "crcp:coord: recv_msg_detail_check: %s -- %s " "Failed to determine if we have received this message. Return %d\n", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), @@ -4578,7 +4578,7 @@ static int do_recv_msg_detail_check(ompi_crcp_coord_pml_peer_ref_t *peer_ref, goto cleanup; } - OPAL_OUTPUT_VERBOSE((20, mca_crcp_coord_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((20, mca_crcp_coord_component.super.output_handle, "crcp:coord: recv_msg_detail_check: %s -- %s" " found %s, complete %s, posted %s, peer_rank=[%d vs %d]\n", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), @@ -4597,7 +4597,7 @@ static int do_recv_msg_detail_check(ompi_crcp_coord_pml_peer_ref_t *peer_ref, if( !msg_found ) { ompi_crcp_coord_pml_message_ref_t *d_msg = NULL; - OPAL_OUTPUT_VERBOSE((15, mca_crcp_coord_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((15, mca_crcp_coord_component.super.output_handle, "crcp:coord: recv_msg_detail_check: %s Found a message that needs to be drained\n", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME))); @@ -4655,7 +4655,7 @@ static int do_recv_msg_detail_check(ompi_crcp_coord_pml_peer_ref_t *peer_ref, else if( msg_already_posted ) { ompi_crcp_coord_pml_message_ref_t *d_msg = NULL; - OPAL_OUTPUT_VERBOSE((10, mca_crcp_coord_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((10, mca_crcp_coord_component.super.output_handle, "crcp:coord: recv_msg_detail_check: %s " "Found a message already posted! Prepare to drain.\n", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME))); @@ -4666,7 +4666,7 @@ static int do_recv_msg_detail_check(ompi_crcp_coord_pml_peer_ref_t *peer_ref, */ if( current_msg_id == posted_msg_ref->msg_id && COORD_MSG_TYPE_B_RECV == posted_msg_ref->msg_type) { - OPAL_OUTPUT_VERBOSE((10, mca_crcp_coord_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((10, mca_crcp_coord_component.super.output_handle, "crcp:coord: recv_msg_detail_check: %s " "Found a message already posted! Prepare to STALL.\n", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME))); @@ -4677,7 +4677,7 @@ static int do_recv_msg_detail_check(ompi_crcp_coord_pml_peer_ref_t *peer_ref, * current blocking recv */ else { - OPAL_OUTPUT_VERBOSE((10, mca_crcp_coord_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((10, mca_crcp_coord_component.super.output_handle, "crcp:coord: recv_msg_detail_check: %s " "Found a message already posted! No stall required [%3d, %3d, %3d, %3d].\n", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), @@ -4726,7 +4726,7 @@ static int do_recv_msg_detail_check(ompi_crcp_coord_pml_peer_ref_t *peer_ref, *found_match = true; } else { - opal_output(mca_crcp_coord_component.super.output_handle, + orte_output(mca_crcp_coord_component.super.output_handle, "crcp:coord: recv_msg_detail_check: ***** ERROR ***** %s Failed to find an action to use. This should never happen!\n", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME)); exit_status = OMPI_ERROR; @@ -4765,7 +4765,7 @@ static int have_received_msg(ompi_crcp_coord_pml_peer_ref_t *peer_ref, FIND_MSG_UNKNOWN, /* Active? */ FIND_MSG_TRUE /* Already Posted? */ ) ) ) { - opal_output(mca_crcp_coord_component.super.output_handle, + orte_output(mca_crcp_coord_component.super.output_handle, "crcp:coord: have_received_msg: Unable to find the proper message reference.\n"); return OMPI_ERROR; } @@ -4787,7 +4787,7 @@ static int have_received_msg(ompi_crcp_coord_pml_peer_ref_t *peer_ref, FIND_MSG_UNKNOWN, /* Active? */ FIND_MSG_TRUE /* Already Posted? */ ) ) ) { - opal_output(mca_crcp_coord_component.super.output_handle, + orte_output(mca_crcp_coord_component.super.output_handle, "crcp:coord: have_received_msg: Unable to find the proper message reference.\n"); return OMPI_ERROR; } @@ -4811,7 +4811,7 @@ static int have_received_msg(ompi_crcp_coord_pml_peer_ref_t *peer_ref, FIND_MSG_FALSE, /* Active? */ FIND_MSG_TRUE /* Already Posted? */ ) ) ) { - opal_output(mca_crcp_coord_component.super.output_handle, + orte_output(mca_crcp_coord_component.super.output_handle, "crcp:coord: have_received_msg: Unable to find the proper message reference.\n"); return OMPI_ERROR; } @@ -4830,7 +4830,7 @@ static int have_received_msg(ompi_crcp_coord_pml_peer_ref_t *peer_ref, FIND_MSG_TRUE, /* Active? */ FIND_MSG_TRUE /* Already Posted? */ ) ) ) { - opal_output(mca_crcp_coord_component.super.output_handle, + orte_output(mca_crcp_coord_component.super.output_handle, "crcp:coord: have_received_msg: Unable to find the proper message reference.\n"); return OMPI_ERROR; } @@ -4852,7 +4852,7 @@ static int have_received_msg(ompi_crcp_coord_pml_peer_ref_t *peer_ref, FIND_MSG_UNKNOWN, /* Active? */ FIND_MSG_TRUE /* Already Posted? */ ) ) ) { - opal_output(mca_crcp_coord_component.super.output_handle, + orte_output(mca_crcp_coord_component.super.output_handle, "crcp:coord: have_received_msg: Unable to find the proper message reference.\n"); return OMPI_ERROR; } @@ -4876,7 +4876,7 @@ static int have_received_msg(ompi_crcp_coord_pml_peer_ref_t *peer_ref, FIND_MSG_FALSE, /* Active? */ FIND_MSG_TRUE /* Already Posted? */ ) ) ) { - opal_output(mca_crcp_coord_component.super.output_handle, + orte_output(mca_crcp_coord_component.super.output_handle, "crcp:coord: have_received_msg: Unable to find the proper message reference.\n"); return OMPI_ERROR; } @@ -4895,7 +4895,7 @@ static int have_received_msg(ompi_crcp_coord_pml_peer_ref_t *peer_ref, FIND_MSG_TRUE, /* Active? */ FIND_MSG_TRUE /* Already Posted? */ ) ) ) { - opal_output(mca_crcp_coord_component.super.output_handle, + orte_output(mca_crcp_coord_component.super.output_handle, "crcp:coord: have_received_msg: Unable to find the proper message reference.\n"); return OMPI_ERROR; } @@ -4993,7 +4993,7 @@ static int find_message_named(opal_list_t * search_list, (peer == INVALID_INT || msg_ref->rank == peer) && msg_ref->ddt_size == ddt_size) { - OPAL_OUTPUT_VERBOSE((30, mca_crcp_coord_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((30, mca_crcp_coord_component.super.output_handle, "crcp:coord: find_message_named: Found Message -- Comm list (%d, %d)\n", tag, peer)); @@ -5021,7 +5021,7 @@ static int do_recv_msg_detail_resp(ompi_crcp_coord_pml_peer_ref_t *peer_ref, "crcp:coord: recv_msg_details: Unable to ask peer for more messages"); if ( 0 > ( ret = orte_rml.send_buffer(&peer_ref->proc_name, buffer, OMPI_CRCP_COORD_BOOKMARK_TAG, 0)) ) { - opal_output(mca_crcp_coord_component.super.output_handle, + orte_output(mca_crcp_coord_component.super.output_handle, "crcp:coord: recv_msg_detail_resp: Unable to send message detail response to peer %s: Return %d\n", ORTE_NAME_PRINT(&peer_ref->proc_name), ret); @@ -5092,7 +5092,7 @@ static void display_indv_timer(int idx, int var) { if( diff < 0.001 ) { return; } - opal_output(0, + orte_output(0, "crcp:coord: timing(%3d): %15s = %10.2f [%15.2f - %15.2f]\n", var, timer_label[idx], diff --git a/ompi/mca/crcp/crcp.h b/ompi/mca/crcp/crcp.h index c01df19c5b..6f25c87a57 100644 --- a/ompi/mca/crcp/crcp.h +++ b/ompi/mca/crcp/crcp.h @@ -267,7 +267,7 @@ struct ompi_crcp_base_component_1_0_0_t { /** Verbosity Level */ int verbose; - /** Output Handle for opal_output */ + /** Output Handle for orte_output */ int output_handle; /** Default Priority */ int priority; diff --git a/ompi/mca/dpm/base/dpm_base_close.c b/ompi/mca/dpm/base/dpm_base_close.c index 291b02d408..637a396e10 100644 --- a/ompi/mca/dpm/base/dpm_base_close.c +++ b/ompi/mca/dpm/base/dpm_base_close.c @@ -19,7 +19,7 @@ #include "opal/mca/mca.h" #include "opal/mca/base/base.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "opal/mca/base/mca_base_param.h" #include "ompi/mca/dpm/dpm.h" diff --git a/ompi/mca/dpm/base/dpm_base_open.c b/ompi/mca/dpm/base/dpm_base_open.c index 420667a1d8..a9258a9616 100644 --- a/ompi/mca/dpm/base/dpm_base_open.c +++ b/ompi/mca/dpm/base/dpm_base_open.c @@ -19,9 +19,11 @@ #include "opal/mca/mca.h" #include "opal/mca/base/base.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "opal/mca/base/mca_base_param.h" +#include "orte/util/output.h" + #include "ompi/mca/dpm/dpm.h" #include "ompi/mca/dpm/base/base.h" @@ -42,7 +44,7 @@ ompi_dpm_base_component_t ompi_dpm_base_selected_component; int ompi_dpm_base_open(void) { /* Debugging/Verbose output */ - ompi_dpm_base_output = opal_output_open(NULL); + ompi_dpm_base_output = orte_output_open(NULL, "DPM", "DEBUG", NULL); /* Open up all available components */ if (OPAL_SUCCESS != diff --git a/ompi/mca/dpm/base/dpm_base_select.c b/ompi/mca/dpm/base/dpm_base_select.c index 7ab903c6ab..d2fe1f7cf8 100644 --- a/ompi/mca/dpm/base/dpm_base_select.c +++ b/ompi/mca/dpm/base/dpm_base_select.c @@ -19,7 +19,7 @@ #include "opal/mca/mca.h" #include "opal/mca/base/base.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "opal/mca/base/mca_base_param.h" #include "opal/mca/base/mca_base_component_repository.h" diff --git a/ompi/mca/dpm/orte/dpm_orte.c b/ompi/mca/dpm/orte/dpm_orte.c index 4d86a1333c..3ee5875320 100644 --- a/ompi/mca/dpm/orte/dpm_orte.c +++ b/ompi/mca/dpm/orte/dpm_orte.c @@ -24,7 +24,7 @@ #include #include -#include "opal/util/show_help.h" +#include "orte/util/output.h" #include "opal/util/argv.h" #include "opal/util/opal_getcwd.h" @@ -124,7 +124,7 @@ static int connect_accept ( ompi_communicator_t *comm, int root, ompi_group_t *new_group_pointer; - OPAL_OUTPUT_VERBOSE((1, ompi_dpm_base_output, + ORTE_OUTPUT_VERBOSE((1, ompi_dpm_base_output, "%s dpm:orte:connect_accept with port %s %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), port_string, send_first ? "sending first" : "recv first")); @@ -181,7 +181,7 @@ static int connect_accept ( ompi_communicator_t *comm, int root, for(i=0 ; igrp_proc_count ; i++) proc_list[i] = ompi_group_peer_lookup(group,i); - OPAL_OUTPUT_VERBOSE((3, ompi_dpm_base_output, + ORTE_OUTPUT_VERBOSE((3, ompi_dpm_base_output, "%s dpm:orte:connect_accept adding %s to proc list", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(&proc_list[i]->proc_name))); @@ -233,14 +233,14 @@ static int connect_accept ( ompi_communicator_t *comm, int root, /* Exchange the number and the list of processes in the groups */ if ( send_first ) { - OPAL_OUTPUT_VERBOSE((3, ompi_dpm_base_output, + ORTE_OUTPUT_VERBOSE((3, ompi_dpm_base_output, "%s dpm:orte:connect_accept sending first to %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(rport))); rc = orte_rml.send_buffer(rport, nbuf, tag, 0); rc = orte_rml.recv_buffer(rport, nrbuf, tag, 0); } else { - OPAL_OUTPUT_VERBOSE((3, ompi_dpm_base_output, + ORTE_OUTPUT_VERBOSE((3, ompi_dpm_base_output, "%s dpm:orte:connect_accept recving first from %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(rport))); @@ -322,7 +322,7 @@ static int connect_accept ( ompi_communicator_t *comm, int root, name = OBJ_NEW(orte_namelist_t); name->name = rprocs[i]->proc_name; opal_list_append(&all_procs, &name->item); - OPAL_OUTPUT_VERBOSE((3, ompi_dpm_base_output, + ORTE_OUTPUT_VERBOSE((3, ompi_dpm_base_output, "%s dpm:orte:connect_accept send first adding %s to allgather list", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(&name->name))); @@ -331,7 +331,7 @@ static int connect_accept ( ompi_communicator_t *comm, int root, name = OBJ_NEW(orte_namelist_t); name->name = ompi_group_peer_lookup(group, i)->proc_name; opal_list_append(&all_procs, &name->item); - OPAL_OUTPUT_VERBOSE((3, ompi_dpm_base_output, + ORTE_OUTPUT_VERBOSE((3, ompi_dpm_base_output, "%s dpm:orte:connect_accept send first adding %s to allgather list", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(&name->name))); @@ -342,7 +342,7 @@ static int connect_accept ( ompi_communicator_t *comm, int root, name = OBJ_NEW(orte_namelist_t); name->name = ompi_group_peer_lookup(group, i)->proc_name; opal_list_append(&all_procs, &name->item); - OPAL_OUTPUT_VERBOSE((3, ompi_dpm_base_output, + ORTE_OUTPUT_VERBOSE((3, ompi_dpm_base_output, "%s dpm:orte:connect_accept recv first adding %s to allgather list", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(&name->name))); @@ -351,7 +351,7 @@ static int connect_accept ( ompi_communicator_t *comm, int root, name = OBJ_NEW(orte_namelist_t); name->name = rprocs[i]->proc_name; opal_list_append(&all_procs, &name->item); - OPAL_OUTPUT_VERBOSE((3, ompi_dpm_base_output, + ORTE_OUTPUT_VERBOSE((3, ompi_dpm_base_output, "%s dpm:orte:connect_accept recv first adding %s to allgather list", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(&name->name))); @@ -501,7 +501,7 @@ static int get_rport(orte_process_name_t *port, int send_first, if ( send_first ) { opal_buffer_t *sbuf; - OPAL_OUTPUT_VERBOSE((1, ompi_dpm_base_output, + ORTE_OUTPUT_VERBOSE((1, ompi_dpm_base_output, "%s dpm:orte:get_rport sending to %s tag %d", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(port), (int)tag)); @@ -527,7 +527,7 @@ static int get_rport(orte_process_name_t *port, int send_first, } else { opal_buffer_t *rbuf; - OPAL_OUTPUT_VERBOSE((1, ompi_dpm_base_output, + ORTE_OUTPUT_VERBOSE((1, ompi_dpm_base_output, "%s dpm:orte:get_rport waiting to recv on tag %d", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), (int)tag)); @@ -549,7 +549,7 @@ static int get_rport(orte_process_name_t *port, int send_first, } OBJ_RELEASE(rbuf); - OPAL_OUTPUT_VERBOSE((1, ompi_dpm_base_output, + ORTE_OUTPUT_VERBOSE((1, ompi_dpm_base_output, "%s dpm:orte:get_rport recv'd name %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(rport_name))); @@ -899,7 +899,7 @@ static int dyn_init(void) return OMPI_SUCCESS; } - OPAL_OUTPUT_VERBOSE((1, ompi_dpm_base_output, + ORTE_OUTPUT_VERBOSE((1, ompi_dpm_base_output, "%s dpm:orte:dyn_init with port %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), port_name)); diff --git a/ompi/mca/io/base/base.h b/ompi/mca/io/base/base.h index e15d89ebf9..e56d38265a 100644 --- a/ompi/mca/io/base/base.h +++ b/ompi/mca/io/base/base.h @@ -283,8 +283,8 @@ extern "C" { */ OMPI_DECLSPEC extern int mca_io_base_param; /** - * io framework debugging stream ID used with opal_output() and - * opal_output_verbose(). + * io framework debugging stream ID used with orte_output() and + * orte_output_verbose(). */ OMPI_DECLSPEC extern int mca_io_base_output; diff --git a/ompi/mca/io/base/io_base_delete.c b/ompi/mca/io/base/io_base_delete.c index 718d1e34c3..293c2c4634 100644 --- a/ompi/mca/io/base/io_base_delete.c +++ b/ompi/mca/io/base/io_base_delete.c @@ -26,7 +26,7 @@ #include "ompi/file/file.h" #include "opal/class/opal_list.h" #include "opal/util/argv.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "opal/mca/mca.h" #include "opal/mca/base/base.h" #include "ompi/mca/io/io.h" @@ -83,7 +83,7 @@ int mca_io_base_delete(char *filename, struct ompi_info_t *info) /* Announce */ - opal_output_verbose(10, mca_io_base_output, + orte_output_verbose(10, mca_io_base_output, "io:base:delete: deleting file: %s", filename); @@ -106,7 +106,7 @@ int mca_io_base_delete(char *filename, struct ompi_info_t *info) name_array = opal_argv_split(names, ','); num_names = opal_argv_count(name_array); - opal_output_verbose(10, mca_io_base_output, + orte_output_verbose(10, mca_io_base_output, "io:base:delete: Checking specific modules: %s", names); selectable = check_components(&mca_io_base_components_available, @@ -118,7 +118,7 @@ int mca_io_base_delete(char *filename, struct ompi_info_t *info) check them all. */ else { - opal_output_verbose(10, mca_io_base_output, + orte_output_verbose(10, mca_io_base_output, "io:base:delete: Checking all available modules"); selectable = check_components(&mca_io_base_components_available, filename, info, NULL, 0); @@ -169,7 +169,7 @@ int mca_io_base_delete(char *filename, struct ompi_info_t *info) /* Announce the winner */ - opal_output_verbose(10, mca_io_base_output, + orte_output_verbose(10, mca_io_base_output, "io:base:delete: Selected io component %s", selected.ai_component.v1_0_0.io_version.mca_component_name); @@ -288,12 +288,12 @@ static avail_io_t *check_one_component(const mca_base_component_t *component, avail->ai_priority : 100; avail->ai_priority = (avail->ai_priority < 0) ? 0 : avail->ai_priority; - opal_output_verbose(10, mca_io_base_output, + orte_output_verbose(10, mca_io_base_output, "io:base:delete: component available: %s, priority: %d", component->mca_component_name, avail->ai_priority); } else { - opal_output_verbose(10, mca_io_base_output, + orte_output_verbose(10, mca_io_base_output, "io:base:delete: component not available: %s", component->mca_component_name); } diff --git a/ompi/mca/io/base/io_base_file_select.c b/ompi/mca/io/base/io_base_file_select.c index 70be94b70d..cacffc9a73 100644 --- a/ompi/mca/io/base/io_base_file_select.c +++ b/ompi/mca/io/base/io_base_file_select.c @@ -25,7 +25,7 @@ #include "mpi.h" #include "ompi/file/file.h" #include "opal/util/argv.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "opal/class/opal_list.h" #include "opal/class/opal_object.h" #include "opal/mca/mca.h" @@ -92,7 +92,7 @@ int mca_io_base_file_select(ompi_file_t *file, /* Announce */ - opal_output_verbose(10, mca_io_base_output, + orte_output_verbose(10, mca_io_base_output, "io:base:file_select: new file: %s", file->f_filename); @@ -121,7 +121,7 @@ int mca_io_base_file_select(ompi_file_t *file, if (NULL != preferred) { str = &(preferred->mca_component_name[0]); - opal_output_verbose(10, mca_io_base_output, + orte_output_verbose(10, mca_io_base_output, "io:base:file_select: Checking preferred module: %s", str); selectable = check_components(&mca_io_base_components_available, @@ -146,7 +146,7 @@ int mca_io_base_file_select(ompi_file_t *file, name_array = opal_argv_split(names, ','); num_names = opal_argv_count(name_array); - opal_output_verbose(10, mca_io_base_output, + orte_output_verbose(10, mca_io_base_output, "io:base:file_select: Checking specific modules: %s", names); selectable = check_components(&mca_io_base_components_available, @@ -158,7 +158,7 @@ int mca_io_base_file_select(ompi_file_t *file, check them all. */ else { - opal_output_verbose(10, mca_io_base_output, + orte_output_verbose(10, mca_io_base_output, "io:base:file_select: Checking all available modules"); selectable = check_components(&mca_io_base_components_available, file, NULL, 0); @@ -221,7 +221,7 @@ int mca_io_base_file_select(ompi_file_t *file, /* Announce the winner */ - opal_output_verbose(10, mca_io_base_output, + orte_output_verbose(10, mca_io_base_output, "io:base:file_select: Selected io module %s", selected.ai_component.v1_0_0.io_version.mca_component_name); @@ -340,12 +340,12 @@ static avail_io_t *check_one_component(ompi_file_t *file, avail->ai_priority : 100; avail->ai_priority = (avail->ai_priority < 0) ? 0 : avail->ai_priority; - opal_output_verbose(10, mca_io_base_output, + orte_output_verbose(10, mca_io_base_output, "io:base:file_select: component available: %s, priority: %d", component->mca_component_name, avail->ai_priority); } else { - opal_output_verbose(10, mca_io_base_output, + orte_output_verbose(10, mca_io_base_output, "io:base:file_select: component not available: %s", component->mca_component_name); } diff --git a/ompi/mca/io/base/io_base_find_available.c b/ompi/mca/io/base/io_base_find_available.c index 2dfd700d8b..a65c7beea6 100644 --- a/ompi/mca/io/base/io_base_find_available.c +++ b/ompi/mca/io/base/io_base_find_available.c @@ -24,7 +24,7 @@ #include "mpi.h" #include "ompi/constants.h" #include "opal/class/opal_list.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "opal/mca/mca.h" #include "opal/mca/base/base.h" #include "opal/mca/base/mca_base_component_repository.h" @@ -142,7 +142,7 @@ static int init_query(const mca_base_component_t *m, { int ret; - opal_output_verbose(10, mca_io_base_output, + orte_output_verbose(10, mca_io_base_output, "io:find_available: querying io component %s", m->mca_component_name); @@ -157,7 +157,7 @@ static int init_query(const mca_base_component_t *m, } else { /* Unrecognized io API version */ - opal_output_verbose(10, mca_io_base_output, + orte_output_verbose(10, mca_io_base_output, "io:find_available: unrecognized io API version (%d.%d.%d)", m->mca_type_major_version, m->mca_type_minor_version, @@ -169,14 +169,14 @@ static int init_query(const mca_base_component_t *m, /* Query done -- look at the return value to see what happened */ if (OMPI_SUCCESS != ret) { - opal_output_verbose(10, mca_io_base_output, + orte_output_verbose(10, mca_io_base_output, "io:find_available: io component %s is not available", m->mca_component_name); if (NULL != m->mca_close_component) { m->mca_close_component(); } } else { - opal_output_verbose(10, mca_io_base_output, + orte_output_verbose(10, mca_io_base_output, "io:find_available: io component %s is available", m->mca_component_name); } diff --git a/ompi/mca/io/base/io_base_open.c b/ompi/mca/io/base/io_base_open.c index c2fd0733e9..6f9b66ec3f 100644 --- a/ompi/mca/io/base/io_base_open.c +++ b/ompi/mca/io/base/io_base_open.c @@ -21,10 +21,13 @@ #include #include "ompi/class/ompi_free_list.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "opal/mca/mca.h" #include "opal/mca/base/base.h" #include "opal/mca/base/mca_base_param.h" + +#include "orte/util/output.h" + #include "ompi/mca/io/io.h" #include "ompi/mca/io/base/base.h" #include "ompi/mca/io/base/io_base_request.h" @@ -63,7 +66,7 @@ int mca_io_base_open(void) { /* Open an output stream for this framework */ - mca_io_base_output = opal_output_open(NULL); + mca_io_base_output = orte_output_open(NULL, "IO", "DEBUG", NULL); /* Create some parameters */ diff --git a/ompi/mca/mpool/base/mpool_base_init.c b/ompi/mca/mpool/base/mpool_base_init.c index d8494ed44c..57a41829c7 100644 --- a/ompi/mca/mpool/base/mpool_base_init.c +++ b/ompi/mca/mpool/base/mpool_base_init.c @@ -18,7 +18,7 @@ #include "ompi_config.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "opal/mca/mca.h" #include "opal/mca/base/base.h" #include "ompi/mca/mpool/mpool.h" diff --git a/ompi/mca/mpool/base/mpool_base_mem_cb.c b/ompi/mca/mpool/base/mpool_base_mem_cb.c index 69cb42bb4d..d52cbe0b4b 100644 --- a/ompi/mca/mpool/base/mpool_base_mem_cb.c +++ b/ompi/mca/mpool/base/mpool_base_mem_cb.c @@ -20,7 +20,7 @@ * @file */ #include "ompi_config.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "mpool_base_mem_cb.h" #include "base.h" #include "orte/types.h" @@ -53,7 +53,7 @@ void mca_mpool_base_mem_cb(void* base, size_t size, void* cbdata, base, size); if(rc != OMPI_SUCCESS && true == warn) { - opal_output(0, "Memory %p:%lu cannot be freed from the " + orte_output(0, "Memory %p:%lu cannot be freed from the " "registration cache. Possible memory corruption.\n", base, (unsigned long)size); warn = false; diff --git a/ompi/mca/mpool/base/mpool_base_tree.c b/ompi/mca/mpool/base/mpool_base_tree.c index 1851425def..3375816505 100644 --- a/ompi/mca/mpool/base/mpool_base_tree.c +++ b/ompi/mca/mpool/base/mpool_base_tree.c @@ -25,7 +25,7 @@ #include "ompi_config.h" #include "opal/mca/mca.h" -#include "opal/util/show_help.h" +#include "orte/util/output.h" #include "orte/util/name_fns.h" #include "orte/util/proc_info.h" #include "orte/runtime/orte_globals.h" @@ -171,13 +171,13 @@ void mca_mpool_base_tree_print(void) if (num_leaks <= ompi_debug_show_mpi_alloc_mem_leaks || ompi_debug_show_mpi_alloc_mem_leaks < 0) { - opal_show_help("help-mpool-base.txt", "all mem leaks", + orte_show_help("help-mpool-base.txt", "all mem leaks", true, ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), orte_process_info.nodename, orte_process_info.pid, leak_msg); } else { int i = num_leaks - ompi_debug_show_mpi_alloc_mem_leaks; - opal_show_help("help-mpool-base.txt", "some mem leaks", + orte_show_help("help-mpool-base.txt", "some mem leaks", true, ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), orte_process_info.nodename, orte_process_info.pid, leak_msg, i, diff --git a/ompi/mca/mpool/rdma/mpool_rdma_component.c b/ompi/mca/mpool/rdma/mpool_rdma_component.c index d2520931b9..7a0ab98393 100644 --- a/ompi/mca/mpool/rdma/mpool_rdma_component.c +++ b/ompi/mca/mpool/rdma/mpool_rdma_component.c @@ -21,7 +21,7 @@ #define OMPI_DISABLE_ENABLE_MEM_DEBUG 1 #include "ompi_config.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "opal/mca/base/base.h" #include "opal/mca/base/mca_base_param.h" #include "mpool_rdma.h" diff --git a/ompi/mca/mpool/rdma/mpool_rdma_module.c b/ompi/mca/mpool/rdma/mpool_rdma_module.c index 208d8d00e4..6da5fa2820 100644 --- a/ompi/mca/mpool/rdma/mpool_rdma_module.c +++ b/ompi/mca/mpool/rdma/mpool_rdma_module.c @@ -27,7 +27,7 @@ #include "orte/util/proc_info.h" #include "orte/util/name_fns.h" #include "orte/runtime/orte_globals.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "ompi/mca/mpool/rdma/mpool_rdma.h" #include #include @@ -431,7 +431,7 @@ void mca_mpool_rdma_finalize(struct mca_mpool_base_module_t *mpool) /* Statistic */ if(true == mca_mpool_rdma_component.print_stats) { - opal_output(0, "%s rdma: stats " + orte_output(0, "%s rdma: stats " "(hit/miss/found/not found/evicted): %d/%d/%d/%d/%d\n", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), mpool_rdma->stat_cache_hit, mpool_rdma->stat_cache_miss, diff --git a/ompi/mca/mpool/sm/mpool_sm_component.c b/ompi/mca/mpool/sm/mpool_sm_component.c index b92616572f..632a69e500 100644 --- a/ompi/mca/mpool/sm/mpool_sm_component.c +++ b/ompi/mca/mpool/sm/mpool_sm_component.c @@ -25,13 +25,16 @@ #include #endif /* HAVE_STDLIB_H */ #include -#include "opal/util/output.h" +#include "orte/util/output.h" #include "opal/mca/base/base.h" #include "opal/mca/base/mca_base_param.h" + +#include "orte/util/output.h" +#include "orte/util/proc_info.h" + #include "ompi/mca/allocator/base/base.h" #include "mpool_sm.h" #include "ompi/mca/common/sm/common_sm_mmap.h" -#include "orte/util/proc_info.h" #include "ompi/proc/proc.h" /* @@ -123,7 +126,7 @@ static int mca_mpool_sm_open(void) "Enable verbose output for mpool sm component", false, false, 0, &value); if (value != 0) { - mca_mpool_sm_component.verbose = opal_output_open(NULL); + mca_mpool_sm_component.verbose = orte_output_open(NULL, "MPOOL", "SM", "DEBUG", NULL); } else { mca_mpool_sm_component.verbose = -1; } @@ -169,36 +172,36 @@ static mca_mpool_base_module_t* mca_mpool_sm_init( errno = 0; max_size = strtol(max_size_param, (char **)NULL, 10); if (errno == ERANGE) { - opal_output(0, "mca_mpool_sm_init: max_size overflows! set to default (%ld)", default_max); + orte_output(0, "mca_mpool_sm_init: max_size overflows! set to default (%ld)", default_max); max_size = default_max; } else if (errno == EINVAL) { - opal_output(0, "mca_mpool_sm_init: invalid max_size entered. set it to (%ld)", default_max); + orte_output(0, "mca_mpool_sm_init: invalid max_size entered. set it to (%ld)", default_max); max_size = default_max; } errno = 0; min_size = strtol(min_size_param, (char **)NULL, 10); if (errno == ERANGE) { - opal_output(0, "mca_mpool_sm_init: min_size overflows! set to default (%ld)", default_min); + orte_output(0, "mca_mpool_sm_init: min_size overflows! set to default (%ld)", default_min); min_size = default_min; } else if (errno == EINVAL) { - opal_output(0, "mca_mpool_sm_init: invalid min_size entered. set it to (%ld)", default_min); + orte_output(0, "mca_mpool_sm_init: invalid min_size entered. set it to (%ld)", default_min); min_size = default_min; } errno = 0; peer_size = strtol(peer_size_param, (char **)NULL, 10); if (errno == ERANGE) { - opal_output(0, "mca_mpool_sm_init: peer_size overflows! set to default (%ld)", default_peer); + orte_output(0, "mca_mpool_sm_init: peer_size overflows! set to default (%ld)", default_peer); peer_size = default_peer; } else if (errno == EINVAL) { - opal_output(0, "mca_mpool_sm_init: invalid peer_size entered. set it to (%ld)", default_peer); + orte_output(0, "mca_mpool_sm_init: invalid peer_size entered. set it to (%ld)", default_peer); peer_size = default_peer; } /* more checks... */ if (min_size > max_size) { - opal_output(0, "mca_mpool_sm_init: adjusting max_size to be min_size (%ld)", + orte_output(0, "mca_mpool_sm_init: adjusting max_size to be min_size (%ld)", min_size); max_size = min_size; } @@ -210,7 +213,7 @@ static mca_mpool_base_module_t* mca_mpool_sm_init( * set sm_size to max_size. */ if ((double)LONG_MAX / num_local_procs < peer_size) { /* enable verbose would show if sm_size overflows */ - opal_output(mca_mpool_sm_component.verbose, + orte_output(mca_mpool_sm_component.verbose, "mca_mpool_sm_init: sm_size overflows, set sm_size to max_size (%ld)", LONG_MAX); mca_mpool_sm_component.sm_size = max_size; @@ -234,10 +237,10 @@ static mca_mpool_base_module_t* mca_mpool_sm_init( mca_base_component_list_item_t* item = (mca_base_component_list_item_t*) opal_list_get_first(&mca_allocator_base_components); allocator_component = (mca_allocator_base_component_t*)item->cli_component; - opal_output(0, "mca_mpool_sm_init: unable to locate allocator: %s - using %s\n", + orte_output(0, "mca_mpool_sm_init: unable to locate allocator: %s - using %s\n", mca_mpool_sm_component.sm_allocator_name, allocator_component->allocator_version.mca_component_name); } else { - opal_output(0, "mca_mpool_sm_init: unable to locate allocator: %s\n", + orte_output(0, "mca_mpool_sm_init: unable to locate allocator: %s\n", mca_mpool_sm_component.sm_allocator_name); return NULL; } @@ -254,7 +257,7 @@ static mca_mpool_base_module_t* mca_mpool_sm_init( return NULL; } - opal_output(mca_mpool_sm_component.verbose, + orte_output(mca_mpool_sm_component.verbose, "mca_mpool_sm_init: shared memory size used: (%ld)", mca_mpool_sm_component.sm_size); @@ -264,7 +267,7 @@ static mca_mpool_base_module_t* mca_mpool_sm_init( file_name,sizeof(mca_common_sm_mmap_t), 8 ) )) { - opal_output(0, "mca_mpool_sm_init: unable to create shared memory mapping (%s)", file_name); + orte_output(0, "mca_mpool_sm_init: unable to create shared memory mapping (%s)", file_name); free(file_name); return NULL; } @@ -275,7 +278,7 @@ static mca_mpool_base_module_t* mca_mpool_sm_init( allocator_component->allocator_init(true, mca_common_sm_mmap_seg_alloc, NULL, NULL); if(NULL == mpool_module->sm_allocator) { - opal_output(0, "mca_mpool_sm_init: unable to initialize allocator"); + orte_output(0, "mca_mpool_sm_init: unable to initialize allocator"); return NULL; } diff --git a/ompi/mca/mpool/sm/mpool_sm_module.c b/ompi/mca/mpool/sm/mpool_sm_module.c index be7437e001..1efab2e169 100644 --- a/ompi/mca/mpool/sm/mpool_sm_module.c +++ b/ompi/mca/mpool/sm/mpool_sm_module.c @@ -18,7 +18,7 @@ #include "ompi_config.h" #include -#include "opal/util/output.h" +#include "orte/util/output.h" #include "ompi/mca/mpool/sm/mpool_sm.h" #include "ompi/mca/common/sm/common_sm_mmap.h" diff --git a/ompi/mca/mtl/base/mtl_base_component.c b/ompi/mca/mtl/base/mtl_base_component.c index f17675f038..5610554725 100644 --- a/ompi/mca/mtl/base/mtl_base_component.c +++ b/ompi/mca/mtl/base/mtl_base_component.c @@ -20,7 +20,10 @@ #include "opal/mca/mca.h" #include "opal/mca/base/base.h" -#include "opal/util/output.h" +#include "orte/util/output.h" + +#include "orte/util/output.h" + #include "ompi/constants.h" #include "ompi/mca/mtl/mtl.h" #include "ompi/mca/mtl/base/base.h" @@ -48,7 +51,7 @@ int ompi_mtl_base_open(void) { /* setup the output stream */ - ompi_mtl_base_output = opal_output_open(NULL); + ompi_mtl_base_output = orte_output_open(NULL, "MTL", "DEBUG", NULL); /* Open up all available components */ if (OMPI_SUCCESS != @@ -93,24 +96,24 @@ ompi_mtl_base_select(bool enable_progress_threads, component = (mca_mtl_base_component_t *) cli->cli_component; if (NULL == component->mtl_init) { - opal_output_verbose( 10, ompi_mtl_base_output, + orte_output_verbose( 10, ompi_mtl_base_output, "select: no init function; ignoring component %s", component->mtl_version.mca_component_name ); continue; } - opal_output_verbose( 10, ompi_mtl_base_output, + orte_output_verbose( 10, ompi_mtl_base_output, "select: initializing %s component %s", component->mtl_version.mca_type_name, component->mtl_version.mca_component_name ); module = component->mtl_init(enable_progress_threads, enable_mpi_threads); if (NULL == module) { - opal_output_verbose( 10, ompi_mtl_base_output, + orte_output_verbose( 10, ompi_mtl_base_output, "select: init returned failure for component %s", component->mtl_version.mca_component_name ); continue; } - opal_output_verbose( 10, ompi_mtl_base_output, + orte_output_verbose( 10, ompi_mtl_base_output, "select: init returned success"); ompi_mtl_base_selected_component = component; @@ -126,11 +129,11 @@ ompi_mtl_base_select(bool enable_progress_threads, /* All done */ if (NULL == module) { - opal_output_verbose( 10, ompi_mtl_base_output, + orte_output_verbose( 10, ompi_mtl_base_output, "select: no component selected"); return OMPI_ERR_NOT_FOUND; } else { - opal_output_verbose( 10, ompi_mtl_base_output, + orte_output_verbose( 10, ompi_mtl_base_output, "select: component %s selected", ompi_mtl_base_selected_component-> mtl_version.mca_component_name ); diff --git a/ompi/mca/mtl/mx/mtl_mx.c b/ompi/mca/mtl/mx/mtl_mx.c index b7331ed583..c25330b4ef 100644 --- a/ompi/mca/mtl/mx/mtl_mx.c +++ b/ompi/mca/mtl/mx/mtl_mx.c @@ -86,7 +86,7 @@ int ompi_mtl_mx_module_init(){ if(mx_return != MX_SUCCESS) { - opal_output(ompi_mtl_base_output, "Error in mx_open_endpoint (error %s)\n", mx_strerror(mx_return)); + orte_output(ompi_mtl_base_output, "Error in mx_open_endpoint (error %s)\n", mx_strerror(mx_return)); return OMPI_ERROR; } @@ -95,7 +95,7 @@ int ompi_mtl_mx_module_init(){ &ompi_mtl_mx.mx_endpoint_addr); if(mx_return != MX_SUCCESS) { - opal_output(ompi_mtl_base_output, "Error in mx_get_endpoint_addr (error %s)\n", mx_strerror(mx_return)); + orte_output(ompi_mtl_base_output, "Error in mx_get_endpoint_addr (error %s)\n", mx_strerror(mx_return)); return OMPI_ERROR; } @@ -103,7 +103,7 @@ int ompi_mtl_mx_module_init(){ &(ompi_mtl_mx.mx_addr.endpoint_id) ); if(mx_return != MX_SUCCESS) { - opal_output(ompi_mtl_base_output, "Error in mx_decompose_endpoint_addr (error %s)\n", mx_strerror(mx_return)); + orte_output(ompi_mtl_base_output, "Error in mx_decompose_endpoint_addr (error %s)\n", mx_strerror(mx_return)); return OMPI_ERROR; } @@ -131,7 +131,7 @@ ompi_mtl_mx_finalize(struct mca_mtl_base_module_t* mtl) { /* free resources */ mx_return = mx_close_endpoint(ompi_mtl_mx.mx_endpoint); if(mx_return != MX_SUCCESS){ - opal_output(ompi_mtl_base_output, "Error in mx_close_endpoint (error %s)\n", mx_strerror(mx_return)); + orte_output(ompi_mtl_base_output, "Error in mx_close_endpoint (error %s)\n", mx_strerror(mx_return)); return OMPI_ERROR; } @@ -197,7 +197,7 @@ int ompi_mtl_mx_progress( void ) { &result); if( OPAL_UNLIKELY(mx_return != MX_SUCCESS) ) { - opal_output(ompi_mtl_base_output, "Error in mx_ipeek (error %s)\n", mx_strerror(mx_return)); + orte_output(ompi_mtl_base_output, "Error in mx_ipeek (error %s)\n", mx_strerror(mx_return)); } if(result) { completed++; @@ -206,11 +206,11 @@ int ompi_mtl_mx_progress( void ) { &mx_status, &result); if( OPAL_UNLIKELY(mx_return != MX_SUCCESS) ) { - opal_output(ompi_mtl_base_output, "Error in mx_test (error %s)\n", mx_strerror(mx_return)); + orte_output(ompi_mtl_base_output, "Error in mx_test (error %s)\n", mx_strerror(mx_return)); abort(); } if( OPAL_UNLIKELY(0 == result) ) { - opal_output(ompi_mtl_base_output, "Error in ompi_mtl_mx_progress, mx_ipeek returned a request, mx_test on the request resulted failure.\n"); + orte_output(ompi_mtl_base_output, "Error in ompi_mtl_mx_progress, mx_ipeek returned a request, mx_test on the request resulted failure.\n"); abort(); } mtl_mx_request = (mca_mtl_mx_request_t*) mx_status.context; diff --git a/ompi/mca/mtl/mx/mtl_mx_component.c b/ompi/mca/mtl/mx/mtl_mx_component.c index 8c66207f49..0d367a5518 100644 --- a/ompi/mca/mtl/mx/mtl_mx_component.c +++ b/ompi/mca/mtl/mx/mtl_mx_component.c @@ -20,7 +20,7 @@ #include "opal/event/event.h" #include "opal/mca/base/mca_base_param.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "ompi/datatype/convertor.h" #include "ompi/mca/mtl/base/base.h" #include "ompi/mca/common/mx/common_mx.h" diff --git a/ompi/mca/mtl/mx/mtl_mx_endpoint.c b/ompi/mca/mtl/mx/mtl_mx_endpoint.c index dacf18217c..fc17c7acb3 100644 --- a/ompi/mca/mtl/mx/mtl_mx_endpoint.c +++ b/ompi/mca/mtl/mx/mtl_mx_endpoint.c @@ -21,7 +21,7 @@ #include #include #include "ompi/types.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "mtl_mx.h" #include "mtl_mx_types.h" #include "mtl_mx_endpoint.h" @@ -93,7 +93,7 @@ mca_mtl_mx_endpoint_t* mca_mtl_mx_endpoint_create(ompi_proc_t* ompi_proc) { if(MX_SUCCESS != mx_nic_id_to_hostname( mx_peer->nic_id, peer_name)) { sprintf( peer_name, "unknown %lx nic_id", (long)mx_peer->nic_id ); } - opal_output(ompi_mtl_base_output, + orte_output(ompi_mtl_base_output, "mx_connect fail for %s with key %x (error %s)\n", peer_name, ompi_mtl_mx.mx_filter, mx_strerror(mx_return) ); return NULL; diff --git a/ompi/mca/mtl/mx/mtl_mx_probe.c b/ompi/mca/mtl/mx/mtl_mx_probe.c index 9fe6800246..c10b5c2558 100644 --- a/ompi/mca/mtl/mx/mtl_mx_probe.c +++ b/ompi/mca/mtl/mx/mtl_mx_probe.c @@ -54,7 +54,7 @@ ompi_mtl_mx_iprobe(struct mca_mtl_base_module_t* mtl, &mx_status, &result); if (MX_SUCCESS != ret) { - opal_output(ompi_mtl_base_output, "Error in mx_iprobe (error %s)\n", mx_strerror(ret)); + orte_output(ompi_mtl_base_output, "Error in mx_iprobe (error %s)\n", mx_strerror(ret)); return OMPI_ERROR; } diff --git a/ompi/mca/mtl/mx/mtl_mx_recv.c b/ompi/mca/mtl/mx/mtl_mx_recv.c index 99a1ec3368..d52ef51218 100644 --- a/ompi/mca/mtl/mx/mtl_mx_recv.c +++ b/ompi/mca/mtl/mx/mtl_mx_recv.c @@ -61,7 +61,7 @@ ompi_mtl_mx_irecv(struct mca_mtl_base_module_t* mtl, src, tag); - OPAL_OUTPUT_VERBOSE((50, ompi_mtl_base_output, + ORTE_OUTPUT_VERBOSE((50, ompi_mtl_base_output, "recv bits: 0x%016" PRIu64 " 0x%016" PRIu64 "\n", match_bits, mask_bits)); @@ -73,7 +73,7 @@ ompi_mtl_mx_irecv(struct mca_mtl_base_module_t* mtl, mtl_mx_request, &mtl_mx_request->mx_request); if(mx_return != MX_SUCCESS) { - opal_output(ompi_mtl_base_output, "Error in mx_irecv (error %s)\n", mx_strerror(mx_return)); + orte_output(ompi_mtl_base_output, "Error in mx_irecv (error %s)\n", mx_strerror(mx_return)); return OMPI_ERROR; } diff --git a/ompi/mca/mtl/mx/mtl_mx_send.c b/ompi/mca/mtl/mx/mtl_mx_send.c index 80a6a42005..a42cbc82d2 100644 --- a/ompi/mca/mtl/mx/mtl_mx_send.c +++ b/ompi/mca/mtl/mx/mtl_mx_send.c @@ -60,7 +60,7 @@ ompi_mtl_mx_send(struct mca_mtl_base_module_t* mtl, mtl_mx_request.convertor = convertor; mtl_mx_request.type = OMPI_MTL_MX_ISEND; - OPAL_OUTPUT_VERBOSE((50, ompi_mtl_base_output, + ORTE_OUTPUT_VERBOSE((50, ompi_mtl_base_output, "issend bits: 0x%016" PRIu64 "\n", match_bits)); @@ -90,7 +90,7 @@ ompi_mtl_mx_send(struct mca_mtl_base_module_t* mtl, if(MX_SUCCESS != mx_nic_id_to_hostname( mx_endpoint->mx_peer->nic_id, peer_name)) { sprintf( peer_name, "unknown %lx nic_id", (long)mx_endpoint->mx_peer->nic_id ); } - opal_output(ompi_mtl_base_output, "Error in %s (error %s) sending to %s\n", + orte_output(ompi_mtl_base_output, "Error in %s (error %s) sending to %s\n", where, mx_strerror(mx_return), peer_name); /* Free buffer if needed */ @@ -106,11 +106,11 @@ ompi_mtl_mx_send(struct mca_mtl_base_module_t* mtl, &mx_status, &result); if( OPAL_UNLIKELY(mx_return != MX_SUCCESS) ) { - opal_output(ompi_mtl_base_output, "Error in mx_wait (error %s)\n", mx_strerror(mx_return)); + orte_output(ompi_mtl_base_output, "Error in mx_wait (error %s)\n", mx_strerror(mx_return)); abort(); } if( OPAL_UNLIKELY(result && mx_status.code != MX_STATUS_SUCCESS) ) { - opal_output(ompi_mtl_base_output, + orte_output(ompi_mtl_base_output, "Error in ompi_mtl_mx_send, mx_wait returned something other than MX_STATUS_SUCCESS: mx_status.code = %d.\n", mx_status.code); abort(); @@ -155,7 +155,7 @@ ompi_mtl_mx_isend(struct mca_mtl_base_module_t* mtl, mtl_mx_request->convertor = convertor; mtl_mx_request->type = OMPI_MTL_MX_ISEND; - OPAL_OUTPUT_VERBOSE((50, ompi_mtl_base_output, + ORTE_OUTPUT_VERBOSE((50, ompi_mtl_base_output, "issend bits: 0x%016" PRIu64 "\n", match_bits)); if(mode == MCA_PML_BASE_SEND_SYNCHRONOUS) { @@ -184,7 +184,7 @@ ompi_mtl_mx_isend(struct mca_mtl_base_module_t* mtl, if(MX_SUCCESS != mx_nic_id_to_hostname( mx_endpoint->mx_peer->nic_id, peer_name)) { sprintf( peer_name, "unknown %lx nic_id", (long)mx_endpoint->mx_peer->nic_id ); } - opal_output(ompi_mtl_base_output, "Error in %s (error %s) sending to %s\n", + orte_output(ompi_mtl_base_output, "Error in %s (error %s) sending to %s\n", where, mx_strerror(mx_return), peer_name); return OMPI_ERROR; } diff --git a/ompi/mca/mtl/portals/mtl_portals.c b/ompi/mca/mtl/portals/mtl_portals.c index dc470c69ff..3c268e39bd 100644 --- a/ompi/mca/mtl/portals/mtl_portals.c +++ b/ompi/mca/mtl/portals/mtl_portals.c @@ -67,7 +67,7 @@ static int ompi_mtl_portals_catchall_callback(ptl_event_t *ev, ompi_mtl_portals_request_t *ptl_request) { - opal_output(fileno(stderr),"ERROR - received catchall event\n"); + orte_output(fileno(stderr),"ERROR - received catchall event\n"); abort(); @@ -338,14 +338,14 @@ ompi_mtl_portals_progress(void) ret = ptl_request->event_callback(&ev, ptl_request); if (OMPI_SUCCESS != ret) { - opal_output(0, " Error returned from the even callback. Error code - %d \n",ret); + orte_output(0, " Error returned from the even callback. Error code - %d \n",ret); abort(); } } } else if (PTL_EQ_EMPTY == ret) { break; } else { - opal_output(0, " Error returned from PtlEQGet. Error code - %d \n",ret); + orte_output(0, " Error returned from PtlEQGet. Error code - %d \n",ret); abort(); } } diff --git a/ompi/mca/mtl/portals/mtl_portals_recv.c b/ompi/mca/mtl/portals/mtl_portals_recv.c index 70f9061364..18d09b26f0 100644 --- a/ompi/mca/mtl/portals/mtl_portals_recv.c +++ b/ompi/mca/mtl/portals/mtl_portals_recv.c @@ -56,7 +56,7 @@ ompi_mtl_portals_rendezvous_get(ptl_event_t *ev, ret = PtlMDBind(ompi_mtl_portals.ptl_ni_h, md, PTL_UNLINK, &md_h); if (PTL_OK != ret) { - opal_output(fileno(stderr)," Error returned from PtlMDBind(). Error code - %d \n",ret); + orte_output(fileno(stderr)," Error returned from PtlMDBind(). Error code - %d \n",ret); abort(); } @@ -70,7 +70,7 @@ ompi_mtl_portals_rendezvous_get(ptl_event_t *ev, ev->hdr_data, 0); if (PTL_OK != ret) { - opal_output(fileno(stderr)," Error returned from PtlGet. Error code - %d \n",ret); + orte_output(fileno(stderr)," Error returned from PtlGet. Error code - %d \n",ret); abort(); } @@ -95,7 +95,7 @@ ompi_mtl_portals_recv_progress(ptl_event_t *ev, /* get the data */ ret = ompi_mtl_portals_rendezvous_get(ev, ptl_request); if ( OMPI_SUCCESS != ret ) { - opal_output(fileno(stderr)," Error returned from ompi_mtl_portals_rendezvous_get(). Error code - %d \n",ret); + orte_output(fileno(stderr)," Error returned from ompi_mtl_portals_rendezvous_get(). Error code - %d \n",ret); return ret; } } @@ -116,7 +116,7 @@ ompi_mtl_portals_recv_progress(ptl_event_t *ev, ptl_request->super.ompi_req->req_status._count = ev->mlength; - OPAL_OUTPUT_VERBOSE((50, ompi_mtl_base_output, + ORTE_OUTPUT_VERBOSE((50, ompi_mtl_base_output, "recv complete: 0x%016llx\n", ev->match_bits)); ptl_request->super.completion_callback(&ptl_request->super); @@ -133,7 +133,7 @@ ompi_mtl_portals_recv_progress(ptl_event_t *ev, ptl_request->super.ompi_req->req_status._count = ev->mlength; - OPAL_OUTPUT_VERBOSE((50, ompi_mtl_base_output, + ORTE_OUTPUT_VERBOSE((50, ompi_mtl_base_output, "recv complete: 0x%016llx\n", ev->match_bits)); ptl_request->super.completion_callback(&ptl_request->super); @@ -198,11 +198,11 @@ ompi_mtl_portals_get_data(ompi_mtl_portals_event_t *recv_event, ret = PtlMDBind(ompi_mtl_portals.ptl_ni_h, md, PTL_UNLINK, &md_h); if (PTL_OK != ret) { - opal_output(fileno(stderr)," Error returned from PtlMDBind. Error code - %d \n",ret); + orte_output(fileno(stderr)," Error returned from PtlMDBind. Error code - %d \n",ret); abort(); } - OPAL_OUTPUT_VERBOSE((50, ompi_mtl_base_output, + ORTE_OUTPUT_VERBOSE((50, ompi_mtl_base_output, "acking recv: 0x%016llx\n", recv_event->ev.match_bits)); @@ -215,7 +215,7 @@ ompi_mtl_portals_get_data(ompi_mtl_portals_event_t *recv_event, 0, 0); if (PTL_OK != ret) { - opal_output(fileno(stderr)," Error returned from PtlPut. Error code - %d \n",ret); + orte_output(fileno(stderr)," Error returned from PtlPut. Error code - %d \n",ret); abort(); } } @@ -235,7 +235,7 @@ ompi_mtl_portals_get_data(ompi_mtl_portals_event_t *recv_event, ptl_request->super.ompi_req->req_status._count = recv_event->ev.mlength; - OPAL_OUTPUT_VERBOSE((50, ompi_mtl_base_output, + ORTE_OUTPUT_VERBOSE((50, ompi_mtl_base_output, "recv complete: 0x%016llx\n", recv_event->ev.match_bits)); @@ -246,7 +246,7 @@ ompi_mtl_portals_get_data(ompi_mtl_portals_event_t *recv_event, ret = ompi_mtl_datatype_recv_buf(convertor, &md.start, &buflen, &ptl_request->free_after); if (OMPI_SUCCESS != ret) { - opal_output(fileno(stderr)," Error returned from ompi_mtl_datatype_recv_buf. Error code - %d \n",ret); + orte_output(fileno(stderr)," Error returned from ompi_mtl_datatype_recv_buf. Error code - %d \n",ret); abort(); } md.length = (recv_event->ev.rlength > buflen) ? buflen : recv_event->ev.rlength; @@ -261,7 +261,7 @@ ompi_mtl_portals_get_data(ompi_mtl_portals_event_t *recv_event, ret = PtlMDBind(ompi_mtl_portals.ptl_ni_h, md, PTL_RETAIN, &md_h); if (PTL_OK != ret) { - opal_output(fileno(stderr)," Error returned from ompi_mtl_datatype_recv_buf. Error code - %d \n",ret); + orte_output(fileno(stderr)," Error returned from ompi_mtl_datatype_recv_buf. Error code - %d \n",ret); abort(); } @@ -274,7 +274,7 @@ ompi_mtl_portals_get_data(ompi_mtl_portals_event_t *recv_event, recv_event->ev.hdr_data, 0); if (PTL_OK != ret) { - opal_output(fileno(stderr)," Error returned from PtlGet. Error code - %d \n",ret); + orte_output(fileno(stderr)," Error returned from PtlGet. Error code - %d \n",ret); abort(); } @@ -309,7 +309,7 @@ ompi_mtl_portals_match_up_put_end(ptl_seq_t link) } /* should never get here */ - opal_output(fileno(stderr)," ompi_mtl_portals_match_up_put_end failed \n"); + orte_output(fileno(stderr)," ompi_mtl_portals_match_up_put_end failed \n"); abort(); } @@ -349,11 +349,11 @@ ompi_mtl_portals_wait_for_put_end(ptl_seq_t link) /* otherwise match it up */ ompi_mtl_portals_match_up_put_end(ev.link); } else { - opal_output(fileno(stderr)," Unrecognised event type - %d - ompi_mtl_portals_wait_for_put_end : %d \n",ev.type,ret); + orte_output(fileno(stderr)," Unrecognised event type - %d - ompi_mtl_portals_wait_for_put_end : %d \n",ev.type,ret); abort(); } } else { - opal_output(fileno(stderr)," Error returned in ompi_mtl_portals_wait_for_put_end from PtlEQWait : %d \n",ret); + orte_output(fileno(stderr)," Error returned in ompi_mtl_portals_wait_for_put_end from PtlEQWait : %d \n",ret); abort(); } } @@ -405,13 +405,13 @@ ompi_mtl_portals_search_unex_events(ptl_match_bits_t match_bits, /* can't be the one we want */ ompi_mtl_portals_match_up_put_end(ev.link); } else { - opal_output(fileno(stderr)," Unrecognised event type - %d - ompi_mtl_portals_search_unex_events : %d \n",ev.type,ret); + orte_output(fileno(stderr)," Unrecognised event type - %d - ompi_mtl_portals_search_unex_events : %d \n",ev.type,ret); abort(); } } else if (PTL_EQ_EMPTY == ret) { break; } else { - opal_output(fileno(stderr)," Error returned in ompi_mtl_portals_search_unex_events from PtlEQWait : %d \n",ret); + orte_output(fileno(stderr)," Error returned in ompi_mtl_portals_search_unex_events from PtlEQWait : %d \n",ret); abort(); } } @@ -489,7 +489,7 @@ ompi_mtl_portals_irecv(struct mca_mtl_base_module_t* mtl, PTL_SET_RECV_BITS(match_bits, ignore_bits, comm->c_contextid, src, tag); - OPAL_OUTPUT_VERBOSE((50, ompi_mtl_base_output, + ORTE_OUTPUT_VERBOSE((50, ompi_mtl_base_output, "recv bits: 0x%016llx 0x%016llx\n", match_bits, ignore_bits)); @@ -519,7 +519,7 @@ restart_search: ret = ompi_mtl_datatype_recv_buf(convertor, &md.start, &buflen, &ptl_request->free_after); if (OMPI_SUCCESS != ret) { - opal_output(fileno(stderr)," Error returned from ompi_mtl_datatype_recv_buf(). Error code - %d \n",ret); + orte_output(fileno(stderr)," Error returned from ompi_mtl_datatype_recv_buf(). Error code - %d \n",ret); abort(); } did_once = true; diff --git a/ompi/mca/mtl/portals/mtl_portals_recv_short.c b/ompi/mca/mtl/portals/mtl_portals_recv_short.c index 44980d9e95..9c84bd069c 100644 --- a/ompi/mca/mtl/portals/mtl_portals_recv_short.c +++ b/ompi/mca/mtl/portals/mtl_portals_recv_short.c @@ -20,7 +20,7 @@ #include "ompi_config.h" #include "ompi/constants.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "mtl_portals.h" #include "mtl_portals_recv_short.h" diff --git a/ompi/mca/mtl/portals/mtl_portals_send.c b/ompi/mca/mtl/portals/mtl_portals_send.c index d6c97141e4..48fa7f4426 100644 --- a/ompi/mca/mtl/portals/mtl_portals_send.c +++ b/ompi/mca/mtl/portals/mtl_portals_send.c @@ -44,7 +44,7 @@ ompi_mtl_portals_medium_callback(ptl_event_t *ev, ompi_mtl_portals_request_t *pt free(ev->md.start); } - OPAL_OUTPUT_VERBOSE((50, ompi_mtl_base_output, + ORTE_OUTPUT_VERBOSE((50, ompi_mtl_base_output, "send complete: 0x%016llx\n", ev->match_bits)); @@ -58,7 +58,7 @@ ompi_mtl_portals_medium_callback(ptl_event_t *ev, ompi_mtl_portals_request_t *pt break; default: - opal_output(fileno(stderr)," Unexpected event type %d in ompi_mtl_portals_medium_callback()\n",ev->type); + orte_output(fileno(stderr)," Unexpected event type %d in ompi_mtl_portals_medium_callback()\n",ev->type); /* abort(); */ } @@ -84,7 +84,7 @@ ompi_mtl_portals_long_callback(ptl_event_t *ev, struct ompi_mtl_portals_request_ free(ev->md.start); } - OPAL_OUTPUT_VERBOSE((50, ompi_mtl_base_output, + ORTE_OUTPUT_VERBOSE((50, ompi_mtl_base_output, "send complete: 0x%016llx\n", ev->match_bits)); @@ -98,7 +98,7 @@ ompi_mtl_portals_long_callback(ptl_event_t *ev, struct ompi_mtl_portals_request_ break; default: - opal_output(fileno(stderr)," Unexpected event type %d in ompi_mtl_portals_long_callback()\n",ev->type); + orte_output(fileno(stderr)," Unexpected event type %d in ompi_mtl_portals_long_callback()\n",ev->type); abort(); } @@ -118,7 +118,7 @@ ompi_mtl_portals_long_rendezvous_callback(ptl_event_t *ev, struct ompi_mtl_porta free(ev->md.start); } - OPAL_OUTPUT_VERBOSE((50, ompi_mtl_base_output, + ORTE_OUTPUT_VERBOSE((50, ompi_mtl_base_output, "send complete: 0x%016llx\n", ev->match_bits)); @@ -131,7 +131,7 @@ ompi_mtl_portals_long_rendezvous_callback(ptl_event_t *ev, struct ompi_mtl_porta break; default: - opal_output(fileno(stderr)," Unexpected event type %d in ompi_mtl_portals_long_callback()\n",ev->type); + orte_output(fileno(stderr)," Unexpected event type %d in ompi_mtl_portals_long_callback()\n",ev->type); abort(); } @@ -157,7 +157,7 @@ ompi_mtl_portals_sync_callback(ptl_event_t *ev, struct ompi_mtl_portals_request_ free(ev->md.start); } - OPAL_OUTPUT_VERBOSE((50, ompi_mtl_base_output, + ORTE_OUTPUT_VERBOSE((50, ompi_mtl_base_output, "send complete: 0x%016llx\n", ev->match_bits)); @@ -171,7 +171,7 @@ ompi_mtl_portals_sync_callback(ptl_event_t *ev, struct ompi_mtl_portals_request_ break; default: - opal_output(fileno(stderr)," Unexpected event type %d in ompi_mtl_portals_sync_callback()\n",ev->type); + orte_output(fileno(stderr)," Unexpected event type %d in ompi_mtl_portals_sync_callback()\n",ev->type); abort(); } @@ -526,7 +526,7 @@ ompi_mtl_portals_sync_isend( void *start, int length, int contextid, int localra break; \ \ default: \ - opal_output(fileno(stderr),"Unexpected msg type\n"); \ + orte_output(fileno(stderr),"Unexpected msg type\n"); \ \ } \ } diff --git a/ompi/mca/mtl/portals/mtl_portals_send_short.c b/ompi/mca/mtl/portals/mtl_portals_send_short.c index 70f9aa0b94..6ecf1743b6 100644 --- a/ompi/mca/mtl/portals/mtl_portals_send_short.c +++ b/ompi/mca/mtl/portals/mtl_portals_send_short.c @@ -38,7 +38,7 @@ ompi_mtl_portals_short_callback(ptl_event_t *ev, ompi_mtl_portals_request_t *ptl break; default: - opal_output(fileno(stderr)," Unexpected event type %d in ompi_mtl_portals_short_callback()\n",ev->type); + orte_output(fileno(stderr)," Unexpected event type %d in ompi_mtl_portals_short_callback()\n",ev->type); abort(); } diff --git a/ompi/mca/mtl/psm/mtl_psm.c b/ompi/mca/mtl/psm/mtl_psm.c index 69b86474c1..b7efb2a3e7 100644 --- a/ompi/mca/mtl/psm/mtl_psm.c +++ b/ompi/mca/mtl/psm/mtl_psm.c @@ -64,12 +64,12 @@ ompi_mtl_psm_errhandler(psm_ep_t ep, const psm_error_t error, case PSM_EP_NO_PORTS_AVAIL: case PSM_EP_NO_NETWORK: case PSM_EP_INVALID_UUID_KEY: - opal_output(0, "Open MPI failed to open a PSM endpoint: %s\n", error_string); + orte_output(0, "Open MPI failed to open a PSM endpoint: %s\n", error_string); break; /* We can't handle any other errors than the ones above */ default: - opal_output(0, "Open MPI detected an unexpected PSM error in opening " + orte_output(0, "Open MPI detected an unexpected PSM error in opening " "an endpoint: %s\n", error_string); return psm_error_defer(token); break; @@ -94,7 +94,7 @@ int ompi_mtl_psm_module_init() { if (!generated_key || (strlen(generated_key) != 33) || sscanf(generated_key, "%016llx-%016llx", &uu[0], &uu[1]) != 2) { - opal_output(0, "Error obtaining unique transport key from ORTE " + orte_output(0, "Error obtaining unique transport key from ORTE " "(orte_precondition_transpots %s the environment)\n", generated_key ? "could not be parsed from" : "not present in"); @@ -107,7 +107,7 @@ int ompi_mtl_psm_module_init() { err = psm_ep_open(unique_job_key, NULL, &ep, &epid); if (err) { - opal_output(0, "Error in psm_ep_open (error %s)\n", + orte_output(0, "Error in psm_ep_open (error %s)\n", psm_error_get_string(err)); return OMPI_ERROR; } @@ -121,7 +121,7 @@ int ompi_mtl_psm_module_init() { 0, &mq); if (err) { - opal_output(0, "Error in psm_mq_init (error %s)\n", + orte_output(0, "Error in psm_mq_init (error %s)\n", psm_error_get_string(err)); return OMPI_ERROR; } @@ -134,7 +134,7 @@ int ompi_mtl_psm_module_init() { ompi_modex_send( &mca_mtl_psm_component.super.mtl_version, &ompi_mtl_psm.epid, sizeof(psm_epid_t))) { - opal_output(0, "Open MPI couldn't send PSM epid to head node process"); + orte_output(0, "Open MPI couldn't send PSM epid to head node process"); return OMPI_ERROR; } @@ -153,21 +153,21 @@ ompi_mtl_psm_finalize(struct mca_mtl_base_module_t* mtl) { /* free resources */ err = psm_mq_finalize(ompi_mtl_psm.mq); if (err) { - opal_output(0, "Error in psm_mq_finalize (error %s)\n", + orte_output(0, "Error in psm_mq_finalize (error %s)\n", psm_error_get_string(err)); return OMPI_ERROR; } err = psm_ep_close(ompi_mtl_psm.ep, PSM_EP_CLOSE_GRACEFUL, 1*1e9); if (err) { - opal_output(0, "Error in psm_ep_close (error %s)\n", + orte_output(0, "Error in psm_ep_close (error %s)\n", psm_error_get_string(err)); return OMPI_ERROR; } err = psm_finalize(); if (err) { - opal_output(0, "Error in psm_finalize (error %s)\n", + orte_output(0, "Error in psm_finalize (error %s)\n", psm_error_get_string(err)); return OMPI_ERROR; } @@ -256,7 +256,7 @@ ompi_mtl_psm_add_procs(struct mca_mtl_base_module_t *mtl, if (err) { char *errstr = (char *) ompi_mtl_psm_connect_error_msg(err); if (errstr == NULL) { - opal_output(0, "PSM returned unhandled/unknown connect error: %s\n", + orte_output(0, "PSM returned unhandled/unknown connect error: %s\n", psm_error_get_string(err)); } for (i = 0; i < (int) nprocs; i++) { @@ -264,13 +264,13 @@ ompi_mtl_psm_add_procs(struct mca_mtl_base_module_t *mtl, errstr = (char *) ompi_mtl_psm_connect_error_msg(thiserr); if (proc_errors[thiserr] == 0) { proc_errors[thiserr] = 1; - opal_output(0, "PSM EP connect error (%s):", + orte_output(0, "PSM EP connect error (%s):", errstr ? errstr : "unknown connect error"); for (j = 0; j < (int) nprocs; j++) { if (errs_out[j] == thiserr) - opal_output(0, " %s", procs[j]->proc_hostname); + orte_output(0, " %s", procs[j]->proc_hostname); } - opal_output(0, "\n"); + orte_output(0, "\n"); } } @@ -373,7 +373,7 @@ int ompi_mtl_psm_progress( void ) { while (1); error: - opal_output(0, "Error in psm progress function: %s\n", + orte_output(0, "Error in psm progress function: %s\n", psm_error_get_string(err)); return 1; } diff --git a/ompi/mca/mtl/psm/mtl_psm_component.c b/ompi/mca/mtl/psm/mtl_psm_component.c index 641d9eb8d6..a8da097d31 100644 --- a/ompi/mca/mtl/psm/mtl_psm_component.c +++ b/ompi/mca/mtl/psm/mtl_psm_component.c @@ -21,7 +21,7 @@ #include "opal/event/event.h" #include "opal/mca/base/mca_base_param.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "ompi/datatype/convertor.h" #include "mtl_psm.h" @@ -99,7 +99,7 @@ ompi_mtl_psm_component_init(bool enable_progress_threads, err = psm_error_register_handler(NULL /* no ep */, PSM_ERRHANDLER_NOP); if (err) { - opal_output(0, "Error in psm_error_register_handler (error %s)\n", + orte_output(0, "Error in psm_error_register_handler (error %s)\n", psm_error_get_string(err)); return NULL; } @@ -111,7 +111,7 @@ ompi_mtl_psm_component_init(bool enable_progress_threads, err = psm_init(&verno_major, &verno_minor); if (err) { - opal_output(0, "Error in psm_init (error %s)\n", + orte_output(0, "Error in psm_init (error %s)\n", psm_error_get_string(err)); return NULL; } diff --git a/ompi/mca/mtl/psm/mtl_psm_endpoint.c b/ompi/mca/mtl/psm/mtl_psm_endpoint.c index 13638b2ed9..b27a6ccdd8 100644 --- a/ompi/mca/mtl/psm/mtl_psm_endpoint.c +++ b/ompi/mca/mtl/psm/mtl_psm_endpoint.c @@ -25,7 +25,7 @@ #include "orte/mca/oob/base/base.h" #include "orte/mca/rml/rml.h" #include "orte/mca/errmgr/errmgr.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "mtl_psm.h" #include "mtl_psm_types.h" #include "mtl_psm_endpoint.h" diff --git a/ompi/mca/mtl/psm/mtl_psm_recv.c b/ompi/mca/mtl/psm/mtl_psm_recv.c index aaad4566c8..743cf0fa4f 100644 --- a/ompi/mca/mtl/psm/mtl_psm_recv.c +++ b/ompi/mca/mtl/psm/mtl_psm_recv.c @@ -70,7 +70,7 @@ ompi_mtl_psm_irecv(struct mca_mtl_base_module_t* mtl, &mtl_psm_request->psm_request); if (err) { - opal_output(0, "Error in psm_mq_irecv (error %s)\n", psm_error_get_string(err)); + orte_output(0, "Error in psm_mq_irecv (error %s)\n", psm_error_get_string(err)); return OMPI_ERROR; } diff --git a/ompi/mca/osc/base/osc_base_open.c b/ompi/mca/osc/base/osc_base_open.c index 94f02bcf97..0c1638ed70 100644 --- a/ompi/mca/osc/base/osc_base_open.c +++ b/ompi/mca/osc/base/osc_base_open.c @@ -20,6 +20,9 @@ #include "opal/mca/mca.h" #include "opal/mca/base/base.h" #include "opal/mca/base/mca_base_param.h" + +#include "orte/util/output.h" + #include "ompi/mca/osc/osc.h" #include "ompi/mca/osc/base/base.h" @@ -48,7 +51,7 @@ ompi_osc_base_open(void) int ret; /* setup the output stream */ - ompi_osc_base_output = opal_output_open(NULL); + ompi_osc_base_output = orte_output_open(NULL, "OSC", "DEBUG", NULL); /* initialize the base code */ OBJ_CONSTRUCT(&ompi_osc_base_open_components, opal_list_t); diff --git a/ompi/mca/osc/pt2pt/osc_pt2pt.c b/ompi/mca/osc/pt2pt/osc_pt2pt.c index a7e92ce7ee..cdc977c154 100644 --- a/ompi/mca/osc/pt2pt/osc_pt2pt.c +++ b/ompi/mca/osc/pt2pt/osc_pt2pt.c @@ -36,7 +36,7 @@ ompi_osc_pt2pt_module_free(ompi_win_t *win) int tmp; ompi_osc_pt2pt_module_t *module = P2P_MODULE(win); - opal_output_verbose(1, ompi_osc_base_output, + orte_output_verbose(1, ompi_osc_base_output, "pt2pt component destroying window with id %d", ompi_comm_get_cid(module->p2p_comm)); diff --git a/ompi/mca/osc/pt2pt/osc_pt2pt_component.c b/ompi/mca/osc/pt2pt/osc_pt2pt_component.c index f8e17f4b6e..cbcc27eecb 100644 --- a/ompi/mca/osc/pt2pt/osc_pt2pt_component.c +++ b/ompi/mca/osc/pt2pt/osc_pt2pt_component.c @@ -217,7 +217,7 @@ ompi_osc_pt2pt_component_finalize(void) if (0 != (num_modules = opal_hash_table_get_size(&mca_osc_pt2pt_component.p2p_c_modules))) { - opal_output(ompi_osc_base_output, + orte_output(ompi_osc_base_output, "WARNING: There were %d Windows created but not freed.", (int) num_modules); #if OMPI_ENABLE_PROGRESS_THREADS @@ -287,7 +287,7 @@ ompi_osc_pt2pt_component_select(ompi_win_t *win, ret = ompi_comm_dup(comm, &(module->p2p_comm), 0); if (ret != OMPI_SUCCESS) goto cleanup; - opal_output_verbose(1, ompi_osc_base_output, + orte_output_verbose(1, ompi_osc_base_output, "pt2pt component creating window with id %d", ompi_comm_get_cid(module->p2p_comm)); @@ -539,7 +539,7 @@ component_fragment_cb(ompi_osc_pt2pt_mpireq_t *mpireq) datatype = ompi_osc_base_datatype_create(proc, &payload); if (NULL == datatype) { - opal_output(ompi_osc_base_output, + orte_output(ompi_osc_base_output, "Error recreating datatype. Aborting."); ompi_mpi_abort(module->p2p_comm, 1, false); } @@ -669,7 +669,7 @@ component_fragment_cb(ompi_osc_pt2pt_mpireq_t *mpireq) break; default: - opal_output_verbose(5, ompi_osc_base_output, + orte_output_verbose(5, ompi_osc_base_output, "received one-sided packet for with unknown type"); } diff --git a/ompi/mca/osc/pt2pt/osc_pt2pt_data_move.c b/ompi/mca/osc/pt2pt/osc_pt2pt_data_move.c index 981149750d..5cdcbbb6ad 100644 --- a/ompi/mca/osc/pt2pt/osc_pt2pt_data_move.c +++ b/ompi/mca/osc/pt2pt/osc_pt2pt_data_move.c @@ -22,7 +22,7 @@ #include "osc_pt2pt_data_move.h" #include "osc_pt2pt_buffer.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "opal/util/arch.h" #include "opal/sys/atomic.h" #include "ompi/mca/pml/pml.h" @@ -93,7 +93,7 @@ ompi_osc_pt2pt_sendreq_send_long_cb(ompi_osc_pt2pt_mpireq_t *mpireq) (ompi_osc_pt2pt_sendreq_t*) longreq->mpireq.cbdata; int32_t count; - OPAL_OUTPUT_VERBOSE((50, ompi_osc_base_output, + ORTE_OUTPUT_VERBOSE((50, ompi_osc_base_output, "%d completed long sendreq to %d", ompi_comm_rank(sendreq->req_module->p2p_comm), sendreq->req_target_rank)); @@ -277,7 +277,7 @@ ompi_osc_pt2pt_sendreq_send(ompi_osc_pt2pt_module_t *module, #endif /* send fragment */ - OPAL_OUTPUT_VERBOSE((51, ompi_osc_base_output, + ORTE_OUTPUT_VERBOSE((51, ompi_osc_base_output, "%d sending sendreq to %d", ompi_comm_rank(sendreq->req_module->p2p_comm), sendreq->req_target_rank)); @@ -307,7 +307,7 @@ ompi_osc_pt2pt_sendreq_send(ompi_osc_pt2pt_module_t *module, longreq->mpireq.cbfunc = ompi_osc_pt2pt_sendreq_send_long_cb; longreq->mpireq.cbdata = sendreq; - OPAL_OUTPUT_VERBOSE((50, ompi_osc_base_output, + ORTE_OUTPUT_VERBOSE((50, ompi_osc_base_output, "%d starting long sendreq to %d (%d)", ompi_comm_rank(sendreq->req_module->p2p_comm), sendreq->req_target_rank, @@ -564,7 +564,7 @@ ompi_osc_pt2pt_sendreq_recv_put(ompi_osc_pt2pt_module_t *module, ompi_osc_base_datatype_create(proc, &inbuf); if (NULL == datatype) { - opal_output(ompi_osc_base_output, + orte_output(ompi_osc_base_output, "Error recreating datatype. Aborting."); ompi_mpi_abort(module->p2p_comm, 1, false); } @@ -708,7 +708,7 @@ ompi_osc_pt2pt_sendreq_recv_accum_long_cb(ompi_osc_pt2pt_mpireq_t *mpireq) /* unlock the window for accumulates */ OPAL_THREAD_UNLOCK(&longreq->req_module->p2p_acc_lock); - OPAL_OUTPUT_VERBOSE((50, ompi_osc_base_output, + ORTE_OUTPUT_VERBOSE((50, ompi_osc_base_output, "%d finished receiving long accum message from %d", ompi_comm_rank(longreq->req_module->p2p_comm), header->hdr_origin)); @@ -740,7 +740,7 @@ ompi_osc_pt2pt_sendreq_recv_accum(ompi_osc_pt2pt_module_t *module, ((unsigned long)header->hdr_target_disp * module->p2p_win->w_disp_unit); if (NULL == datatype) { - opal_output(ompi_osc_base_output, + orte_output(ompi_osc_base_output, "Error recreating datatype. Aborting."); ompi_mpi_abort(module->p2p_comm, 1, false); } @@ -856,7 +856,7 @@ ompi_osc_pt2pt_sendreq_recv_accum(ompi_osc_pt2pt_module_t *module, inmsg_mark_complete(module); - OPAL_OUTPUT_VERBOSE((50, ompi_osc_base_output, + ORTE_OUTPUT_VERBOSE((50, ompi_osc_base_output, "%d received accum message from %d", ompi_comm_rank(module->p2p_comm), header->hdr_origin)); @@ -899,7 +899,7 @@ ompi_osc_pt2pt_sendreq_recv_accum(ompi_osc_pt2pt_module_t *module, module->p2p_comm, &(longreq->mpireq.request)); - OPAL_OUTPUT_VERBOSE((50, ompi_osc_base_output, + ORTE_OUTPUT_VERBOSE((50, ompi_osc_base_output, "%d started long recv accum message from %d (%d)", ompi_comm_rank(module->p2p_comm), header->hdr_origin, diff --git a/ompi/mca/osc/pt2pt/osc_pt2pt_sync.c b/ompi/mca/osc/pt2pt/osc_pt2pt_sync.c index f387da9b76..072dcd45b1 100644 --- a/ompi/mca/osc/pt2pt/osc_pt2pt_sync.c +++ b/ompi/mca/osc/pt2pt/osc_pt2pt_sync.c @@ -107,7 +107,7 @@ ompi_osc_pt2pt_module_fence(int assert, ompi_win_t *win) return ret; } - OPAL_OUTPUT_VERBOSE((50, ompi_osc_base_output, + ORTE_OUTPUT_VERBOSE((50, ompi_osc_base_output, "fence: waiting on %d in and %d out", module->p2p_num_pending_in, module->p2p_num_pending_out)); @@ -123,7 +123,7 @@ ompi_osc_pt2pt_module_fence(int assert, ompi_win_t *win) ret = ompi_osc_pt2pt_sendreq_send(module, req); if (OMPI_SUCCESS != ret) { - opal_output_verbose(5, ompi_osc_base_output, + orte_output_verbose(5, ompi_osc_base_output, "fence: failure in starting sendreq (%d). " "Will try later.", ret); @@ -267,7 +267,7 @@ ompi_osc_pt2pt_module_complete(ompi_win_t *win) ret = ompi_osc_pt2pt_sendreq_send(module, req); if (OMPI_SUCCESS != ret) { - opal_output_verbose(5, ompi_osc_base_output, + orte_output_verbose(5, ompi_osc_base_output, "complete: failure in starting sendreq (%d). Will try later.", ret); opal_list_append(&(module->p2p_copy_pending_sendreqs), item); @@ -413,7 +413,7 @@ ompi_osc_pt2pt_module_lock(int lock_type, ompi_win_remove_mode(win, OMPI_WIN_FENCE); ompi_win_append_mode(win, OMPI_WIN_ACCESS_EPOCH | OMPI_WIN_LOCK_ACCESS); - OPAL_OUTPUT_VERBOSE((50, ompi_osc_base_output, + ORTE_OUTPUT_VERBOSE((50, ompi_osc_base_output, "%d: sending lock request to %d", ompi_comm_rank(module->p2p_comm), target)); @@ -460,7 +460,7 @@ ompi_osc_pt2pt_module_unlock(int target, OPAL_THREAD_UNLOCK(&module->p2p_lock); /* send the unlock request */ - OPAL_OUTPUT_VERBOSE((50, ompi_osc_base_output, + ORTE_OUTPUT_VERBOSE((50, ompi_osc_base_output, "%d: sending unlock request to %d with %d requests", ompi_comm_rank(module->p2p_comm), target, out_count)); @@ -478,7 +478,7 @@ ompi_osc_pt2pt_module_unlock(int target, ret = ompi_osc_pt2pt_sendreq_send(module, req); if (OMPI_SUCCESS != ret) { - opal_output_verbose(5, ompi_osc_base_output, + orte_output_verbose(5, ompi_osc_base_output, "unlock: failure in starting sendreq (%d). Will try later.", ret); opal_list_append(&(module->p2p_copy_pending_sendreqs), item); @@ -492,7 +492,7 @@ ompi_osc_pt2pt_module_unlock(int target, } OPAL_THREAD_UNLOCK(&module->p2p_lock); - OPAL_OUTPUT_VERBOSE((50, ompi_osc_base_output, + ORTE_OUTPUT_VERBOSE((50, ompi_osc_base_output, "%d: finished unlock to %d", ompi_comm_rank(module->p2p_comm), target)); @@ -517,13 +517,13 @@ ompi_osc_pt2pt_passive_lock(ompi_osc_pt2pt_module_t *module, if (lock_type == MPI_LOCK_EXCLUSIVE) { if (module->p2p_lock_status == 0) { module->p2p_lock_status = MPI_LOCK_EXCLUSIVE; - OPAL_OUTPUT_VERBOSE((50, ompi_osc_base_output, + ORTE_OUTPUT_VERBOSE((50, ompi_osc_base_output, "%d: setting lock status to EXCLUSIVE (from %d)", ompi_comm_rank(module->p2p_comm), origin)); ompi_win_append_mode(module->p2p_win, OMPI_WIN_EXPOSE_EPOCH); send_ack = true; } else { - OPAL_OUTPUT_VERBOSE((50, ompi_osc_base_output, + ORTE_OUTPUT_VERBOSE((50, ompi_osc_base_output, "%d: queuing lock request from %d (type=%d)", ompi_comm_rank(module->p2p_comm), origin, lock_type)); new_pending = OBJ_NEW(ompi_osc_pt2pt_pending_lock_t); @@ -535,13 +535,13 @@ ompi_osc_pt2pt_passive_lock(ompi_osc_pt2pt_module_t *module, if (module->p2p_lock_status != MPI_LOCK_EXCLUSIVE) { module->p2p_lock_status = MPI_LOCK_SHARED; module->p2p_shared_count++; - OPAL_OUTPUT_VERBOSE((50, ompi_osc_base_output, + ORTE_OUTPUT_VERBOSE((50, ompi_osc_base_output, "%d: setting lock status to SHARED (from %d), count %d", ompi_comm_rank(module->p2p_comm), origin, module->p2p_shared_count)); ompi_win_append_mode(module->p2p_win, OMPI_WIN_EXPOSE_EPOCH); send_ack = true; } else { - OPAL_OUTPUT_VERBOSE((50, ompi_osc_base_output, + ORTE_OUTPUT_VERBOSE((50, ompi_osc_base_output, "%d: queuing lock request from %d (type=%d)", ompi_comm_rank(module->p2p_comm), origin, lock_type)); new_pending = OBJ_NEW(ompi_osc_pt2pt_pending_lock_t); @@ -555,7 +555,7 @@ ompi_osc_pt2pt_passive_lock(ompi_osc_pt2pt_module_t *module, OPAL_THREAD_UNLOCK(&(module->p2p_lock)); if (send_ack) { - OPAL_OUTPUT_VERBOSE((50, ompi_osc_base_output, + ORTE_OUTPUT_VERBOSE((50, ompi_osc_base_output, "%d: sending lock ack to %d", ompi_comm_rank(module->p2p_comm), origin)); ompi_osc_pt2pt_control_send(module, proc, @@ -578,7 +578,7 @@ ompi_osc_pt2pt_passive_unlock(ompi_osc_pt2pt_module_t *module, assert(module->p2p_lock_status != 0); - OPAL_OUTPUT_VERBOSE((50, ompi_osc_base_output, + ORTE_OUTPUT_VERBOSE((50, ompi_osc_base_output, "%d: received unlock request from %d with %d requests\n", ompi_comm_rank(module->p2p_comm), origin, count)); @@ -614,7 +614,7 @@ ompi_osc_pt2pt_passive_unlock_complete(ompi_osc_pt2pt_module_t *module) module->p2p_lock_status = 0; } else { module->p2p_shared_count -= opal_list_get_size(&module->p2p_unlocks_pending); - OPAL_OUTPUT_VERBOSE((50, ompi_osc_base_output, + ORTE_OUTPUT_VERBOSE((50, ompi_osc_base_output, "%d: decrementing shared count to %d", ompi_comm_rank(module->p2p_comm), module->p2p_shared_count)); @@ -635,7 +635,7 @@ ompi_osc_pt2pt_passive_unlock_complete(ompi_osc_pt2pt_module_t *module) /* issue whichever unlock acks we should issue */ while (NULL != (new_pending = (ompi_osc_pt2pt_pending_lock_t*) opal_list_remove_first(©_unlock_acks))) { - OPAL_OUTPUT_VERBOSE((50, ompi_osc_base_output, + ORTE_OUTPUT_VERBOSE((50, ompi_osc_base_output, "%d: sending unlock ack to proc %d", ompi_comm_rank(module->p2p_comm), new_pending->proc->proc_name.vpid)); @@ -655,7 +655,7 @@ ompi_osc_pt2pt_passive_unlock_complete(ompi_osc_pt2pt_module_t *module) new_pending = (ompi_osc_pt2pt_pending_lock_t*) opal_list_remove_first(&(module->p2p_locks_pending)); if (NULL != new_pending) { - OPAL_OUTPUT_VERBOSE((50, ompi_osc_base_output, + ORTE_OUTPUT_VERBOSE((50, ompi_osc_base_output, "%d: sending lock ack to proc %d", ompi_comm_rank(module->p2p_comm), new_pending->proc->proc_name.vpid)); diff --git a/ompi/mca/osc/rdma/osc_rdma.c b/ompi/mca/osc/rdma/osc_rdma.c index 5aa7e32909..f0dbb7fa7c 100644 --- a/ompi/mca/osc/rdma/osc_rdma.c +++ b/ompi/mca/osc/rdma/osc_rdma.c @@ -37,7 +37,7 @@ ompi_osc_rdma_module_free(ompi_win_t *win) int tmp, i; ompi_osc_rdma_module_t *module = GET_MODULE(win); - opal_output_verbose(1, ompi_osc_base_output, + orte_output_verbose(1, ompi_osc_base_output, "rdma component destroying window with id %d", ompi_comm_get_cid(module->m_comm)); diff --git a/ompi/mca/osc/rdma/osc_rdma_comm.c b/ompi/mca/osc/rdma/osc_rdma_comm.c index 9a34a793d3..150afb8c82 100644 --- a/ompi/mca/osc/rdma/osc_rdma_comm.c +++ b/ompi/mca/osc/rdma/osc_rdma_comm.c @@ -236,7 +236,7 @@ ompi_osc_rdma_module_put(void *origin_addr, int origin_count, ret = ompi_osc_rdma_sendreq_send(module, sendreq); if (OMPI_SUCCESS != ret) { - opal_output(0, "rdma_senreq_send from put failed: %d", ret); + orte_output(0, "rdma_senreq_send from put failed: %d", ret); OPAL_THREAD_LOCK(&module->m_lock); sendreq->req_module->m_num_pending_out -= 1; opal_list_append(&(module->m_pending_sendreqs), diff --git a/ompi/mca/osc/rdma/osc_rdma_component.c b/ompi/mca/osc/rdma/osc_rdma_component.c index aabe862b1e..6c729c20e6 100644 --- a/ompi/mca/osc/rdma/osc_rdma_component.c +++ b/ompi/mca/osc/rdma/osc_rdma_component.c @@ -240,7 +240,7 @@ ompi_osc_rdma_component_finalize(void) if (0 != (num_modules = opal_hash_table_get_size(&mca_osc_rdma_component.c_modules))) { - opal_output(ompi_osc_base_output, + orte_output(ompi_osc_base_output, "WARNING: There were %d Windows created but not freed.", (int) num_modules); #if OMPI_ENABLE_PROGRESS_THREADS @@ -324,7 +324,7 @@ ompi_osc_rdma_component_select(ompi_win_t *win, ret = ompi_comm_dup(comm, &module->m_comm, 0); if (ret != OMPI_SUCCESS) goto cleanup; - opal_output_verbose(1, ompi_osc_base_output, + orte_output_verbose(1, ompi_osc_base_output, "rdma component creating window with id %d", ompi_comm_get_cid(module->m_comm)); @@ -455,7 +455,7 @@ ompi_osc_rdma_component_select(ompi_win_t *win, } if (OMPI_SUCCESS != ret) goto cleanup; - OPAL_OUTPUT_VERBOSE((50, ompi_osc_base_output, + ORTE_OUTPUT_VERBOSE((50, ompi_osc_base_output, "done creating window %d", ompi_comm_get_cid(module->m_comm))); return OMPI_SUCCESS; @@ -619,7 +619,7 @@ component_fragment_cb(struct mca_btl_base_module_t *btl, datatype = ompi_osc_base_datatype_create(proc, &payload); if (NULL == datatype) { - opal_output(ompi_osc_base_output, + orte_output(ompi_osc_base_output, "Error recreating datatype. Aborting."); ompi_mpi_abort(module->m_comm, 1, false); } @@ -875,12 +875,12 @@ component_fragment_cb(struct mca_btl_base_module_t *btl, endpoint = (mca_bml_base_endpoint_t*) proc->proc_bml; bml_btl = mca_bml_base_btl_array_find(&endpoint->btl_rdma, btl); if (NULL == bml_btl) { - opal_output(ompi_osc_base_output, + orte_output(ompi_osc_base_output, "received rdma info for unknown btl from rank %d", origin); return; } else { - OPAL_OUTPUT_VERBOSE((1, ompi_osc_base_output, + ORTE_OUTPUT_VERBOSE((1, ompi_osc_base_output, "received rdma info from rank %d for BTL %s", origin, bml_btl->btl-> @@ -911,7 +911,7 @@ component_fragment_cb(struct mca_btl_base_module_t *btl, default: /* BWB - FIX ME - this sucks */ - opal_output(ompi_osc_base_output, + orte_output(ompi_osc_base_output, "received packet for Window with unknown type"); } diff --git a/ompi/mca/osc/rdma/osc_rdma_data_move.c b/ompi/mca/osc/rdma/osc_rdma_data_move.c index 478c8eed59..5f3716caf0 100644 --- a/ompi/mca/osc/rdma/osc_rdma_data_move.c +++ b/ompi/mca/osc/rdma/osc_rdma_data_move.c @@ -24,7 +24,7 @@ #include "osc_rdma_data_move.h" #include "osc_rdma_obj_convert.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "opal/util/arch.h" #include "opal/sys/atomic.h" #include "ompi/mca/bml/bml.h" @@ -190,7 +190,7 @@ ompi_osc_rdma_sendreq_rdma(ompi_osc_rdma_module_t *module, descriptor->des_dst[0].seg_key.key64 = rdma_btl->peer_seg_key; #if 0 - opal_output(0, "putting to %d: 0x%lx(%d), %d, %d", + orte_output(0, "putting to %d: 0x%lx(%d), %d, %d", target, descriptor->des_dst[0].seg_addr.lval, descriptor->des_dst[0].seg_len, rdma_btl->rdma_order, @@ -258,7 +258,7 @@ ompi_osc_rdma_sendreq_send_long_cb(ompi_osc_rdma_longreq_t *longreq) (ompi_osc_rdma_sendreq_t*) longreq->cbdata; int32_t count; - OPAL_OUTPUT_VERBOSE((50, ompi_osc_base_output, + ORTE_OUTPUT_VERBOSE((50, ompi_osc_base_output, "%d completed long sendreq to %d", ompi_comm_rank(sendreq->req_module->m_comm), sendreq->req_target_rank)); @@ -332,7 +332,7 @@ ompi_osc_rdma_sendreq_send_cb(struct mca_btl_base_module_t* btl, longreq->cbfunc = ompi_osc_rdma_sendreq_send_long_cb; longreq->cbdata = sendreq; - OPAL_OUTPUT_VERBOSE((50, ompi_osc_base_output, + ORTE_OUTPUT_VERBOSE((50, ompi_osc_base_output, "%d starting long sendreq to %d (%d)", ompi_comm_rank(sendreq->req_module->m_comm), sendreq->req_target_rank, @@ -577,7 +577,7 @@ ompi_osc_rdma_sendreq_send(ompi_osc_rdma_module_t *module, #endif /* send fragment */ - OPAL_OUTPUT_VERBOSE((50, ompi_osc_base_output, + ORTE_OUTPUT_VERBOSE((50, ompi_osc_base_output, "%d sending sendreq to %d", ompi_comm_rank(sendreq->req_module->m_comm), sendreq->req_target_rank)); @@ -785,7 +785,7 @@ ompi_osc_rdma_sendreq_recv_put_long_cb(ompi_osc_rdma_longreq_t *longreq) OBJ_RELEASE(longreq->req_datatype); ompi_osc_rdma_longreq_free(longreq); - OPAL_OUTPUT_VERBOSE((50, ompi_osc_base_output, + ORTE_OUTPUT_VERBOSE((50, ompi_osc_base_output, "%d finished receiving long put message", ompi_comm_rank(longreq->req_module->m_comm))); @@ -806,7 +806,7 @@ ompi_osc_rdma_sendreq_recv_put(ompi_osc_rdma_module_t *module, ompi_osc_base_datatype_create(proc, inbuf); if (NULL == datatype) { - opal_output(ompi_osc_base_output, + orte_output(ompi_osc_base_output, "Error recreating datatype. Aborting."); ompi_mpi_abort(module->m_comm, 1, false); } @@ -847,7 +847,7 @@ ompi_osc_rdma_sendreq_recv_put(ompi_osc_rdma_module_t *module, inmsg_mark_complete(module); *inbuf = ((char*) *inbuf) + header->hdr_msg_length; - OPAL_OUTPUT_VERBOSE((50, ompi_osc_base_output, + ORTE_OUTPUT_VERBOSE((50, ompi_osc_base_output, "%d received put message from %d", ompi_comm_rank(module->m_comm), header->hdr_origin)); @@ -869,7 +869,7 @@ ompi_osc_rdma_sendreq_recv_put(ompi_osc_rdma_module_t *module, module->m_comm, &(longreq->request)); - OPAL_OUTPUT_VERBOSE((50, ompi_osc_base_output, + ORTE_OUTPUT_VERBOSE((50, ompi_osc_base_output, "%d started long recv put message from %d (%d)", ompi_comm_rank(module->m_comm), header->hdr_origin, @@ -956,7 +956,7 @@ ompi_osc_rdma_sendreq_recv_accum_long_cb(ompi_osc_rdma_longreq_t *longreq) /* unlock the window for accumulates */ OPAL_THREAD_UNLOCK(&longreq->req_module->m_acc_lock); - OPAL_OUTPUT_VERBOSE((50, ompi_osc_base_output, + ORTE_OUTPUT_VERBOSE((50, ompi_osc_base_output, "%d finished receiving long accum message from %d", ompi_comm_rank(longreq->req_module->m_comm), header->hdr_origin)); @@ -986,7 +986,7 @@ ompi_osc_rdma_sendreq_recv_accum(ompi_osc_rdma_module_t *module, ompi_osc_base_datatype_create(proc, payload); if (NULL == datatype) { - opal_output(ompi_osc_base_output, + orte_output(ompi_osc_base_output, "Error recreating datatype. Aborting."); ompi_mpi_abort(module->m_comm, 1, false); } @@ -1108,7 +1108,7 @@ ompi_osc_rdma_sendreq_recv_accum(ompi_osc_rdma_module_t *module, inmsg_mark_complete(module); - OPAL_OUTPUT_VERBOSE((50, ompi_osc_base_output, + ORTE_OUTPUT_VERBOSE((50, ompi_osc_base_output, "%d received accum message from %d", ompi_comm_rank(module->m_comm), header->hdr_origin)); @@ -1153,7 +1153,7 @@ ompi_osc_rdma_sendreq_recv_accum(ompi_osc_rdma_module_t *module, module->m_comm, &(longreq->request)); - OPAL_OUTPUT_VERBOSE((50, ompi_osc_base_output, + ORTE_OUTPUT_VERBOSE((50, ompi_osc_base_output, "%d started long recv accum message from %d (%d)", ompi_comm_rank(module->m_comm), header->hdr_origin, diff --git a/ompi/mca/osc/rdma/osc_rdma_obj_convert.h b/ompi/mca/osc/rdma/osc_rdma_obj_convert.h index 55059ecf9f..62a049ed08 100644 --- a/ompi/mca/osc/rdma/osc_rdma_obj_convert.h +++ b/ompi/mca/osc/rdma/osc_rdma_obj_convert.h @@ -34,7 +34,7 @@ ompi_osc_rdma_windx_to_module(uint32_t windx) windx, (void**) (&module)); if (OMPI_SUCCESS != ret) { - opal_output(0, "Could not translate windx %d to a local MPI_Win instance", + orte_output(0, "Could not translate windx %d to a local MPI_Win instance", windx); return NULL; } diff --git a/ompi/mca/osc/rdma/osc_rdma_sync.c b/ompi/mca/osc/rdma/osc_rdma_sync.c index 0c84f7cfac..bd49106ee4 100644 --- a/ompi/mca/osc/rdma/osc_rdma_sync.c +++ b/ompi/mca/osc/rdma/osc_rdma_sync.c @@ -167,7 +167,7 @@ ompi_osc_rdma_module_fence(int assert, ompi_win_t *win) module->m_num_pending_in += incoming_reqs; module->m_num_pending_out += num_outgoing; - OPAL_OUTPUT_VERBOSE((50, ompi_osc_base_output, + ORTE_OUTPUT_VERBOSE((50, ompi_osc_base_output, "fence: waiting on %d in and %d out, now %d, %d", incoming_reqs, num_outgoing, @@ -484,7 +484,7 @@ ompi_osc_rdma_module_lock(int lock_type, ompi_win_remove_mode(win, OMPI_WIN_FENCE); ompi_win_append_mode(win, OMPI_WIN_ACCESS_EPOCH | OMPI_WIN_LOCK_ACCESS); - OPAL_OUTPUT_VERBOSE((50, ompi_osc_base_output, + ORTE_OUTPUT_VERBOSE((50, ompi_osc_base_output, "%d sending lock request to %d", ompi_comm_rank(module->m_comm), target)); /* generate a lock request */ @@ -532,7 +532,7 @@ ompi_osc_rdma_module_unlock(int target, OPAL_THREAD_UNLOCK(&module->m_lock); /* send the unlock request */ - OPAL_OUTPUT_VERBOSE((50, ompi_osc_base_output, + ORTE_OUTPUT_VERBOSE((50, ompi_osc_base_output, "%d sending unlock request to %d with %d requests", ompi_comm_rank(module->m_comm), target, out_count)); @@ -600,7 +600,7 @@ ompi_osc_rdma_passive_lock(ompi_osc_rdma_module_t *module, ompi_win_append_mode(module->m_win, OMPI_WIN_EXPOSE_EPOCH); send_ack = true; } else { - OPAL_OUTPUT_VERBOSE((50, ompi_osc_base_output, + ORTE_OUTPUT_VERBOSE((50, ompi_osc_base_output, "%d queuing lock request from %d (%d)", ompi_comm_rank(module->m_comm), origin, lock_type)); @@ -616,7 +616,7 @@ ompi_osc_rdma_passive_lock(ompi_osc_rdma_module_t *module, ompi_win_append_mode(module->m_win, OMPI_WIN_EXPOSE_EPOCH); send_ack = true; } else { - OPAL_OUTPUT_VERBOSE((50, ompi_osc_base_output, + ORTE_OUTPUT_VERBOSE((50, ompi_osc_base_output, "queuing lock request from %d (%d) lock_type:%d", ompi_comm_rank(module->m_comm), origin, lock_type)); @@ -631,7 +631,7 @@ ompi_osc_rdma_passive_lock(ompi_osc_rdma_module_t *module, OPAL_THREAD_UNLOCK(&(module->m_lock)); if (send_ack) { - OPAL_OUTPUT_VERBOSE((50, ompi_osc_base_output, + ORTE_OUTPUT_VERBOSE((50, ompi_osc_base_output, "%d sending lock ack to %d", ompi_comm_rank(module->m_comm), origin)); ompi_osc_rdma_control_send(module, proc, @@ -654,7 +654,7 @@ ompi_osc_rdma_passive_unlock(ompi_osc_rdma_module_t *module, assert(module->m_lock_status != 0); - OPAL_OUTPUT_VERBOSE((50, ompi_osc_base_output, + ORTE_OUTPUT_VERBOSE((50, ompi_osc_base_output, "received unlock request from %d with %d requests\n", origin, count)); @@ -706,7 +706,7 @@ ompi_osc_rdma_passive_unlock_complete(ompi_osc_rdma_module_t *module) /* issue whichever unlock acks we should issue */ while (NULL != (new_pending = (ompi_osc_rdma_pending_lock_t*) opal_list_remove_first(©_unlock_acks))) { - OPAL_OUTPUT_VERBOSE((50, ompi_osc_base_output, + ORTE_OUTPUT_VERBOSE((50, ompi_osc_base_output, "sending unlock reply to proc")); ompi_osc_rdma_control_send(module, new_pending->proc, @@ -735,7 +735,7 @@ ompi_osc_rdma_passive_unlock_complete(ompi_osc_rdma_module_t *module) OPAL_THREAD_UNLOCK(&(module->m_lock)); if (NULL != new_pending) { - OPAL_OUTPUT_VERBOSE((50, ompi_osc_base_output, + ORTE_OUTPUT_VERBOSE((50, ompi_osc_base_output, "sending lock request to proc")); ompi_osc_rdma_control_send(module, new_pending->proc, diff --git a/ompi/mca/pml/base/pml_base_ft.c b/ompi/mca/pml/base/pml_base_ft.c index fb6df64102..58bdfcb005 100644 --- a/ompi/mca/pml/base/pml_base_ft.c +++ b/ompi/mca/pml/base/pml_base_ft.c @@ -31,7 +31,7 @@ int mca_pml_base_ft_event(int state) int ret; #if 0 - opal_output(0, "pml:base: ft_event: Called (%d)!!\n", state); + orte_output(0, "pml:base: ft_event: Called (%d)!!\n", state); #endif if(OPAL_CRS_CHECKPOINT == state) { @@ -56,7 +56,7 @@ int mca_pml_base_ft_event(int state) * - MPool(s) */ if( OMPI_SUCCESS != (ret = mca_bml.bml_ft_event(state))) { - opal_output(0, "pml:base: ft_event: BML ft_event function failed: %d\n", + orte_output(0, "pml:base: ft_event: BML ft_event function failed: %d\n", ret); } diff --git a/ompi/mca/pml/base/pml_base_open.c b/ompi/mca/pml/base/pml_base_open.c index f51c041baf..7cef404799 100644 --- a/ompi/mca/pml/base/pml_base_open.c +++ b/ompi/mca/pml/base/pml_base_open.c @@ -26,7 +26,10 @@ #endif /* HAVE_UNIST_H */ #include "opal/mca/mca.h" #include "opal/mca/base/base.h" -#include "opal/util/output.h" +#include "orte/util/output.h" + +#include "orte/util/output.h" + #include "ompi/constants.h" #include "ompi/mca/pml/pml.h" #include "ompi/mca/pml/base/base.h" @@ -99,8 +102,8 @@ int mca_pml_base_open(void) false, false, 0, &value); - mca_pml_base_output = opal_output_open(NULL); - opal_output_set_verbosity(mca_pml_base_output, value); + mca_pml_base_output = orte_output_open(NULL, "PML", "DEBUG", NULL); + orte_output_set_verbosity(mca_pml_base_output, value); /* Open up all available components */ diff --git a/ompi/mca/pml/base/pml_base_select.c b/ompi/mca/pml/base/pml_base_select.c index c8b9c7bf85..23d8877fe7 100644 --- a/ompi/mca/pml/base/pml_base_select.c +++ b/ompi/mca/pml/base/pml_base_select.c @@ -20,8 +20,7 @@ #include "ompi_config.h" #include "opal/class/opal_list.h" -#include "opal/util/show_help.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "opal/runtime/opal_progress.h" #include "opal/mca/mca.h" #include "opal/mca/base/base.h" @@ -98,7 +97,7 @@ int mca_pml_base_select(bool enable_progress_threads, } if(!found_pml && opal_pointer_array_get_size(&mca_pml_base_pml)) { - opal_output_verbose( 10, mca_pml_base_output, + orte_output_verbose( 10, mca_pml_base_output, "select: component %s not in the include list", component->pmlm_version.mca_component_name ); @@ -107,14 +106,14 @@ int mca_pml_base_select(bool enable_progress_threads, /* if there is no init function - ignore it */ if (NULL == component->pmlm_init) { - opal_output_verbose( 10, mca_pml_base_output, + orte_output_verbose( 10, mca_pml_base_output, "select: no init function; ignoring component %s", component->pmlm_version.mca_component_name ); continue; } /* Init component to get its priority */ - opal_output_verbose( 10, mca_pml_base_output, + orte_output_verbose( 10, mca_pml_base_output, "select: initializing %s component %s", component->pmlm_version.mca_type_name, component->pmlm_version.mca_component_name ); @@ -122,18 +121,18 @@ int mca_pml_base_select(bool enable_progress_threads, module = component->pmlm_init(&priority, enable_progress_threads, enable_mpi_threads); if (NULL == module) { - opal_output_verbose( 10, mca_pml_base_output, + orte_output_verbose( 10, mca_pml_base_output, "select: init returned failure for component %s", component->pmlm_version.mca_component_name ); continue; } - opal_output_verbose( 10, mca_pml_base_output, + orte_output_verbose( 10, mca_pml_base_output, "select: init returned priority %d", priority ); #if OPAL_ENABLE_FT == 1 /* Determine if this is the wrapper component */ if( priority <= PML_SELECT_WRAPPER_PRIORITY) { - opal_output_verbose( 10, mca_pml_base_output, + orte_output_verbose( 10, mca_pml_base_output, "pml:select: Wrapper Component: Component %s was determined to be a Wrapper PML with priority %d", component->pmlm_version.mca_component_name, priority ); wrapper_priority = priority; @@ -162,7 +161,7 @@ int mca_pml_base_select(bool enable_progress_threads, /* Finished querying all components. Check for the bozo case. */ if( NULL == best_component ) { - opal_show_help("help-mca-base.txt", "find-available:none-found", true, "pml"); + orte_show_help("help-mca-base.txt", "find-available:none-found", true, "pml"); for( i = 0; i < opal_pointer_array_get_size(&mca_pml_base_pml); i++) { char * tmp_val = NULL; tmp_val = (char *) opal_pointer_array_get_item(&mca_pml_base_pml, i); @@ -176,7 +175,7 @@ int mca_pml_base_select(bool enable_progress_threads, } } - opal_output_verbose( 10, mca_pml_base_output, + orte_output_verbose( 10, mca_pml_base_output, "selected %s best priority %d\n", best_component->pmlm_version.mca_component_name, best_priority); @@ -201,7 +200,7 @@ int mca_pml_base_select(bool enable_progress_threads, don't matter anymore) */ om->om_component->pmlm_finalize(); - opal_output_verbose(10, mca_pml_base_output, + orte_output_verbose(10, mca_pml_base_output, "select: component %s not selected / finalized", om->om_component->pmlm_version.mca_component_name); } @@ -233,7 +232,7 @@ int mca_pml_base_select(bool enable_progress_threads, mca_pml_base_selected_component = *best_component; mca_pml = *best_module; - opal_output_verbose( 10, mca_pml_base_output, + orte_output_verbose( 10, mca_pml_base_output, "select: component %s selected", mca_pml_base_selected_component.pmlm_version.mca_component_name ); @@ -249,7 +248,7 @@ int mca_pml_base_select(bool enable_progress_threads, /* If we have a wrapper then initalize it */ if( NULL != wrapper_component ) { priority = PML_SELECT_WRAPPER_PRIORITY; - opal_output_verbose( 10, mca_pml_base_output, + orte_output_verbose( 10, mca_pml_base_output, "pml:select: Wrapping: Component %s [%d] is being wrapped by component %s [%d]", mca_pml_base_selected_component.pmlm_version.mca_component_name, best_priority, @@ -324,12 +323,12 @@ mca_pml_base_pml_check_selected(const char *my_pml, if ((size != strlen(my_pml) + 1) || (0 != strcmp(my_pml, remote_pml))) { if (procs[i]->proc_hostname) { - opal_output(0, "%s selected pml %s, but peer %s on %s selected pml %s", + orte_output(0, "%s selected pml %s, but peer %s on %s selected pml %s", ORTE_NAME_PRINT(&ompi_proc_local()->proc_name), my_pml, ORTE_NAME_PRINT(&procs[i]->proc_name), procs[i]->proc_hostname, remote_pml); } else { - opal_output(0, "%s selected pml %s, but peer %s selected pml %s", + orte_output(0, "%s selected pml %s, but peer %s selected pml %s", ORTE_NAME_PRINT(&ompi_proc_local()->proc_name), my_pml, ORTE_NAME_PRINT(&procs[i]->proc_name), remote_pml); diff --git a/ompi/mca/pml/cm/pml_cm_component.c b/ompi/mca/pml/cm/pml_cm_component.c index 6f1a6f88b7..0ceb8f85c0 100644 --- a/ompi/mca/pml/cm/pml_cm_component.c +++ b/ompi/mca/pml/cm/pml_cm_component.c @@ -139,7 +139,7 @@ mca_pml_cm_component_init(int* priority, return NULL; } *priority = ompi_pml_cm.default_priority; - opal_output_verbose( 10, 0, + orte_output_verbose( 10, 0, "in cm pml priority is %d\n", *priority); /* find a useable MTL */ ret = ompi_mtl_base_select(enable_progress_threads, enable_mpi_threads); diff --git a/ompi/mca/pml/cm/pml_cm_recvreq.h b/ompi/mca/pml/cm/pml_cm_recvreq.h index 26c1f117c3..bd7edac6a5 100644 --- a/ompi/mca/pml/cm/pml_cm_recvreq.h +++ b/ompi/mca/pml/cm/pml_cm_recvreq.h @@ -185,7 +185,7 @@ do { \ #define MCA_PML_CM_HVY_RECV_REQUEST_START(request, ret) \ do { \ -/* opal_output(0, "posting hvy request %d\n", request); */ \ +/* orte_output(0, "posting hvy request %d\n", request); */ \ /* init/re-init the request */ \ request->req_base.req_pml_complete = false; \ request->req_base.req_ompi.req_complete = false; \ diff --git a/ompi/mca/pml/crcpw/pml_crcpw_component.c b/ompi/mca/pml/crcpw/pml_crcpw_component.c index af395e4330..4ffb00418a 100644 --- a/ompi/mca/pml/crcpw/pml_crcpw_component.c +++ b/ompi/mca/pml/crcpw/pml_crcpw_component.c @@ -19,6 +19,9 @@ #include "ompi_config.h" #include "opal/sys/cache.h" #include "opal/event/event.h" + +#include "orte/util/output.h" + #include "mpi.h" #include "ompi/mca/pml/pml.h" #include "ompi/mca/btl/btl.h" @@ -70,7 +73,7 @@ ompi_free_list_t pml_state_list; int mca_pml_crcpw_component_open(void) { - opal_output_verbose( 10, mca_pml_crcpw_component.output_handle, + orte_output_verbose( 10, mca_pml_crcpw_component.output_handle, "pml:crcpw: component_open: Open"); /* @@ -90,21 +93,21 @@ int mca_pml_crcpw_component_open(void) mca_pml_crcpw_component.verbose, &mca_pml_crcpw_component.verbose); - mca_pml_crcpw_component.output_handle = opal_output_open(NULL); + mca_pml_crcpw_component.output_handle = orte_output_open(NULL, "PML", "CRCPW", "DEBUG", NULL); if ( 0 != mca_pml_crcpw_component.verbose) { - opal_output_set_verbosity(mca_pml_crcpw_component.output_handle, + orte_output_set_verbosity(mca_pml_crcpw_component.output_handle, mca_pml_crcpw_component.verbose); } /* * Debug Output */ - opal_output_verbose(10, mca_pml_crcpw_component.output_handle, + orte_output_verbose(10, mca_pml_crcpw_component.output_handle, "pml:crcpw: open()"); - opal_output_verbose(20, mca_pml_crcpw_component.output_handle, + orte_output_verbose(20, mca_pml_crcpw_component.output_handle, "pml:crcpw: open: priority = %d", mca_pml_crcpw_component.priority); - opal_output_verbose(20, mca_pml_crcpw_component.output_handle, + orte_output_verbose(20, mca_pml_crcpw_component.output_handle, "pml:crcpw: open: verbosity = %d", mca_pml_crcpw_component.verbose); @@ -114,7 +117,7 @@ int mca_pml_crcpw_component_open(void) int mca_pml_crcpw_component_close(void) { - opal_output_verbose( 20, mca_pml_crcpw_component.output_handle, + orte_output_verbose( 20, mca_pml_crcpw_component.output_handle, "pml:crcpw: component_close: Close"); return OMPI_SUCCESS; @@ -131,7 +134,7 @@ mca_pml_base_module_t* mca_pml_crcpw_component_init(int* priority, * normal selection operation */ if(*priority == PML_SELECT_WRAPPER_PRIORITY ) { - opal_output_verbose( 20, mca_pml_crcpw_component.output_handle, + orte_output_verbose( 20, mca_pml_crcpw_component.output_handle, "pml:crcpw: component_init: Wrap the selected component %s", mca_pml_base_selected_component.pmlm_version.mca_component_name); @@ -139,7 +142,7 @@ mca_pml_base_module_t* mca_pml_crcpw_component_init(int* priority, mca_pml_crcpw_module.wrapped_pml_module = mca_pml; mca_pml_crcpw_component.pml_crcp_wrapped = true; - opal_output_verbose( 20, mca_pml_crcpw_component.output_handle, + orte_output_verbose( 20, mca_pml_crcpw_component.output_handle, "pml:crcpw: component_init: Initalize Wrapper"); OBJ_CONSTRUCT(&pml_state_list, ompi_free_list_t); @@ -154,7 +157,7 @@ mca_pml_base_module_t* mca_pml_crcpw_component_init(int* priority, NULL); } else { - opal_output_verbose( 20, mca_pml_crcpw_component.output_handle, + orte_output_verbose( 20, mca_pml_crcpw_component.output_handle, "pml:crcpw: component_init: Priority %d", mca_pml_crcpw_component.priority); } @@ -167,7 +170,7 @@ mca_pml_base_module_t* mca_pml_crcpw_component_init(int* priority, int mca_pml_crcpw_component_finalize(void) { - opal_output_verbose( 20, mca_pml_crcpw_component.output_handle, + orte_output_verbose( 20, mca_pml_crcpw_component.output_handle, "pml:crcpw: component_finalize: Finalize"); OBJ_DESTRUCT(&pml_state_list); diff --git a/ompi/mca/pml/dr/pml_dr.c b/ompi/mca/pml/dr/pml_dr.c index 2b48891301..bc785a54de 100644 --- a/ompi/mca/pml/dr/pml_dr.c +++ b/ompi/mca/pml/dr/pml_dr.c @@ -298,7 +298,7 @@ void mca_pml_dr_error_handler( struct mca_btl_base_module_t* btl, int32_t flags) { /* try failover ! */ - opal_output(0, "%s:%d:%s: failing BTL: %s", __FILE__, __LINE__, __func__, + orte_output(0, "%s:%d:%s: failing BTL: %s", __FILE__, __LINE__, __func__, btl->btl_component->btl_version.mca_component_name); mca_pml_dr_sendreq_cleanup_active(btl); mca_bml.bml_del_btl(btl); diff --git a/ompi/mca/pml/dr/pml_dr.h b/ompi/mca/pml/dr/pml_dr.h index ee060af153..1cd6be57f7 100644 --- a/ompi/mca/pml/dr/pml_dr.h +++ b/ompi/mca/pml/dr/pml_dr.h @@ -223,6 +223,6 @@ extern int mca_pml_dr_ft_event(int state); #define MCA_PML_DR_DEBUG_LEVEL -1 #define MCA_PML_DR_DEBUG(level,msg) \ if(level <= MCA_PML_DR_DEBUG_LEVEL){ \ - OPAL_OUTPUT(msg); \ + ORTE_OUTPUT(msg); \ } diff --git a/ompi/mca/pml/dr/pml_dr_recvfrag.c b/ompi/mca/pml/dr/pml_dr_recvfrag.c index b59a728dcf..956d648f53 100644 --- a/ompi/mca/pml/dr/pml_dr_recvfrag.c +++ b/ompi/mca/pml/dr/pml_dr_recvfrag.c @@ -154,7 +154,7 @@ void mca_pml_dr_recv_frag_callback( } ompi_comm = ompi_comm_lookup(hdr->hdr_common.hdr_ctx); if(NULL == ompi_comm ) { - OPAL_OUTPUT((0, "%s:%d: invalid communicator %d\n", + ORTE_OUTPUT((0, "%s:%d: invalid communicator %d\n", __FILE__, __LINE__, hdr->hdr_common.hdr_ctx)); return; } @@ -207,7 +207,7 @@ void mca_pml_dr_recv_frag_callback( ~(uint64_t) 0, hdr->hdr_rndv.hdr_msg_length); return; } else { - OPAL_OUTPUT((0, "%s:%d: the world as we know it is bad\n", __FILE__, __LINE__)); + ORTE_OUTPUT((0, "%s:%d: the world as we know it is bad\n", __FILE__, __LINE__)); orte_errmgr.abort(-1, NULL); } } @@ -240,7 +240,7 @@ void mca_pml_dr_recv_frag_callback( } else { ompi_comm = ompi_comm_lookup(hdr->hdr_common.hdr_ctx); if(NULL == ompi_comm) { - OPAL_OUTPUT((0, "%s:%d: the world as we know it is bad\n", __FILE__, __LINE__)); + ORTE_OUTPUT((0, "%s:%d: the world as we know it is bad\n", __FILE__, __LINE__)); orte_errmgr.abort(-1, NULL); } comm = (mca_pml_dr_comm_t*)ompi_comm->c_pml_comm; diff --git a/ompi/mca/pml/dr/pml_dr_vfrag.c b/ompi/mca/pml/dr/pml_dr_vfrag.c index 3620716bf0..4f03ebf144 100644 --- a/ompi/mca/pml/dr/pml_dr_vfrag.c +++ b/ompi/mca/pml/dr/pml_dr_vfrag.c @@ -80,12 +80,12 @@ static void mca_pml_dr_vfrag_wdog_timeout(int fd, short event, void* data) if(++vfrag->vf_wdog_cnt == mca_pml_dr.wdog_retry_max) { /* declare btl dead */ if(vfrag->bml_btl->btl) { - opal_output(0, "%s:%d:%s: failing BTL: %s", __FILE__, __LINE__, __func__, + orte_output(0, "%s:%d:%s: failing BTL: %s", __FILE__, __LINE__, __func__, vfrag->bml_btl->btl->btl_component->btl_version.mca_component_name); mca_pml_dr_sendreq_cleanup_active(vfrag->bml_btl->btl); mca_bml.bml_del_btl(vfrag->bml_btl->btl); } else { - opal_output(0, "%s:%d:%s: failing already failed BTL", __FILE__, __LINE__, __func__); + orte_output(0, "%s:%d:%s: failing already failed BTL", __FILE__, __LINE__, __func__); } mca_pml_dr_vfrag_reset(vfrag); } else if(NULL == vfrag->bml_btl->btl) { @@ -123,12 +123,12 @@ static void mca_pml_dr_vfrag_ack_timeout(int fd, short event, void* data) if(++vfrag->vf_ack_cnt == mca_pml_dr.ack_retry_max) { /* declare btl dead */ if(vfrag->bml_btl->btl) { - opal_output(0, "%s:%d:%s: failing BTL: %s", __FILE__, __LINE__, __func__, + orte_output(0, "%s:%d:%s: failing BTL: %s", __FILE__, __LINE__, __func__, vfrag->bml_btl->btl->btl_component->btl_version.mca_component_name); mca_pml_dr_sendreq_cleanup_active(vfrag->bml_btl->btl); mca_bml.bml_del_btl(vfrag->bml_btl->btl); } else { - opal_output(0, "%s:%d:%s: failing already failed BTL", __FILE__, __LINE__, __func__); + orte_output(0, "%s:%d:%s: failing already failed BTL", __FILE__, __LINE__, __func__); } mca_pml_dr_vfrag_reset(vfrag); } else if(NULL == vfrag->bml_btl->btl) { @@ -167,7 +167,7 @@ void mca_pml_dr_vfrag_reset(mca_pml_dr_vfrag_t* vfrag) /* make sure a path is available */ if(mca_bml_base_btl_array_get_size(&sendreq->req_endpoint->bml_endpoint->btl_eager) == 0 || mca_bml_base_btl_array_get_size(&sendreq->req_endpoint->bml_endpoint->btl_eager) == 0) { - opal_output(0, "%s:%d:%s: no path to peer", __FILE__, __LINE__, __func__); + orte_output(0, "%s:%d:%s: no path to peer", __FILE__, __LINE__, __func__); orte_errmgr.abort(-1, NULL); } if(vfrag->vf_offset == 0) { @@ -175,7 +175,7 @@ void mca_pml_dr_vfrag_reset(mca_pml_dr_vfrag_t* vfrag) } else { vfrag->bml_btl = mca_bml_base_btl_array_get_next(&sendreq->req_endpoint->bml_endpoint->btl_send); } - opal_output(0, "%s:%d:%s: selected new BTL: %s", __FILE__, __LINE__, __func__, + orte_output(0, "%s:%d:%s: selected new BTL: %s", __FILE__, __LINE__, __func__, vfrag->bml_btl->btl->btl_component->btl_version.mca_component_name); } diff --git a/ompi/mca/pml/ob1/pml_ob1.c b/ompi/mca/pml/ob1/pml_ob1.c index 37b13d247d..e29dd28e9c 100644 --- a/ompi/mca/pml/ob1/pml_ob1.c +++ b/ompi/mca/pml/ob1/pml_ob1.c @@ -293,7 +293,7 @@ int mca_pml_ob1_dump(struct ompi_communicator_t* comm, int verbose) mca_bml_base_endpoint_t* ep = (mca_bml_base_endpoint_t*)proc->ompi_proc->proc_bml; size_t n; - opal_output(0, "[Rank %d]\n", i); + orte_output(0, "[Rank %d]\n", i); /* dump all receive queues */ /* dump all btls */ @@ -416,7 +416,7 @@ void mca_pml_ob1_process_pending_packets(mca_bml_base_btl_t* bml_btl) return; break; default: - opal_output(0, "[%s:%d] wrong header type\n", + orte_output(0, "[%s:%d] wrong header type\n", __FILE__, __LINE__); break; } @@ -493,7 +493,7 @@ int mca_pml_ob1_ft_event( int state ) * references. */ if (OMPI_SUCCESS != (ret = ompi_proc_refresh())) { - opal_output(0, + orte_output(0, "pml:ob1: ft_event(Restart): proc_refresh Failed %d", ret); return ret; @@ -512,7 +512,7 @@ int mca_pml_ob1_ft_event( int state ) * - MPool(s) */ if( OMPI_SUCCESS != (ret = mca_bml.bml_ft_event(state))) { - opal_output(0, "pml:base: ft_event: BML ft_event function failed: %d\n", + orte_output(0, "pml:base: ft_event: BML ft_event function failed: %d\n", ret); } @@ -531,7 +531,7 @@ int mca_pml_ob1_ft_event( int state ) * BTLs will have republished their modex information. */ if (OMPI_SUCCESS != (ret = orte_grpcomm.modex(NULL))) { - opal_output(0, + orte_output(0, "pml:ob1: ft_event(Restart): Failed orte_grpcomm.modex() = %d", ret); return ret; @@ -542,13 +542,13 @@ int mca_pml_ob1_ft_event( int state ) * Add the new procs (BTLs redo modex recv's) */ if( OMPI_SUCCESS != (ret = mca_pml_ob1_add_procs(procs, num_procs) ) ) { - opal_output(0, "pml:ob1: ft_event(Restart): Failed in add_procs (%d)", ret); + orte_output(0, "pml:ob1: ft_event(Restart): Failed in add_procs (%d)", ret); return ret; } /* Is this barrier necessary ? JJH */ if (OMPI_SUCCESS != (ret = orte_grpcomm.barrier())) { - opal_output(0, "pml:ob1: ft_event(Restart): Failed in orte_grpcomm.barrier (%d)", ret); + orte_output(0, "pml:ob1: ft_event(Restart): Failed in orte_grpcomm.barrier (%d)", ret); return ret; } diff --git a/ompi/mca/pml/ob1/pml_ob1_component.c b/ompi/mca/pml/ob1/pml_ob1_component.c index d583ab7213..81b249ee91 100644 --- a/ompi/mca/pml/ob1/pml_ob1_component.c +++ b/ompi/mca/pml/ob1/pml_ob1_component.c @@ -130,14 +130,14 @@ static int mca_pml_ob1_component_open(void) allocator_component = mca_allocator_component_lookup( mca_pml_ob1.allocator_name ); if(NULL == allocator_component) { - opal_output(0, "mca_pml_ob1_component_open: can't find allocator: %s\n", mca_pml_ob1.allocator_name); + orte_output(0, "mca_pml_ob1_component_open: can't find allocator: %s\n", mca_pml_ob1.allocator_name); return OMPI_ERROR; } mca_pml_ob1.allocator = allocator_component->allocator_init(true, mca_pml_ob1_seg_alloc, mca_pml_ob1_seg_free, NULL); if(NULL == mca_pml_ob1.allocator) { - opal_output(0, "mca_pml_ob1_component_open: unable to initialize allocator\n"); + orte_output(0, "mca_pml_ob1_component_open: unable to initialize allocator\n"); return OMPI_ERROR; } @@ -166,7 +166,7 @@ mca_pml_ob1_component_init( int* priority, bool enable_progress_threads, bool enable_mpi_threads ) { - opal_output_verbose( 10, 0, + orte_output_verbose( 10, 0, "in ob1, my priority is %d\n", mca_pml_ob1.priority); if((*priority) > mca_pml_ob1.priority) { @@ -219,13 +219,13 @@ int mca_pml_ob1_component_fini(void) #if 0 if (mca_pml_base_send_requests.fl_num_allocated != mca_pml_base_send_requests.super.opal_list_length) { - opal_output(0, "ob1 send requests: %d allocated %d returned\n", + orte_output(0, "ob1 send requests: %d allocated %d returned\n", mca_pml_base_send_requests.fl_num_allocated, mca_pml_base_send_requests.super.opal_list_length); } if (mca_pml_base_recv_requests.fl_num_allocated != mca_pml_base_recv_requests.super.opal_list_length) { - opal_output(0, "ob1 recv requests: %d allocated %d returned\n", + orte_output(0, "ob1 recv requests: %d allocated %d returned\n", mca_pml_base_recv_requests.fl_num_allocated, mca_pml_base_recv_requests.super.opal_list_length); } diff --git a/ompi/mca/pml/ob1/pml_ob1_endpoint.h b/ompi/mca/pml/ob1/pml_ob1_endpoint.h index 3fe87d87cb..ebbfa8f5fb 100644 --- a/ompi/mca/pml/ob1/pml_ob1_endpoint.h +++ b/ompi/mca/pml/ob1/pml_ob1_endpoint.h @@ -21,7 +21,7 @@ #ifndef MCA_PML_OB1_ENDPOINT_H #define MCA_PML_OB1_ENDPOINT_H -#include "opal/util/output.h" +#include "orte/util/output.h" #include "ompi/mca/btl/btl.h" #if defined(c_plusplus) || defined(__cplusplus) extern "C" { diff --git a/ompi/mca/pml/ob1/pml_ob1_recvfrag.c b/ompi/mca/pml/ob1/pml_ob1_recvfrag.c index 457b3e097b..3e0212315b 100644 --- a/ompi/mca/pml/ob1/pml_ob1_recvfrag.c +++ b/ompi/mca/pml/ob1/pml_ob1_recvfrag.c @@ -360,7 +360,7 @@ static int mca_pml_ob1_recv_frag_match( mca_btl_base_module_t *btl, * store this fragment in a global list, and deliver it to the right * communicator once it get created. */ - opal_output( 0, "Dropped message for the non-existing communicator %d\n", + orte_output( 0, "Dropped message for the non-existing communicator %d\n", (int)hdr->hdr_ctx ); return OMPI_SUCCESS; } diff --git a/ompi/mca/pml/ob1/pml_ob1_recvreq.c b/ompi/mca/pml/ob1/pml_ob1_recvreq.c index 51a5506393..2494045097 100644 --- a/ompi/mca/pml/ob1/pml_ob1_recvreq.c +++ b/ompi/mca/pml/ob1/pml_ob1_recvreq.c @@ -443,7 +443,7 @@ static void mca_pml_ob1_recv_request_rget( } frag->rdma_bml = mca_bml_base_btl_array_find(&bml_endpoint->btl_rdma, btl); if( OPAL_UNLIKELY(NULL == frag->rdma_bml) ) { - opal_output(0, "[%s:%d] invalid bml for rdma get", __FILE__, __LINE__); + orte_output(0, "[%s:%d] invalid bml for rdma get", __FILE__, __LINE__); orte_errmgr.abort(-1, NULL); } frag->rdma_hdr.hdr_rget = *hdr; diff --git a/ompi/mca/pml/ob1/pml_ob1_sendreq.c b/ompi/mca/pml/ob1/pml_ob1_sendreq.c index 932392500e..85f8123627 100644 --- a/ompi/mca/pml/ob1/pml_ob1_sendreq.c +++ b/ompi/mca/pml/ob1/pml_ob1_sendreq.c @@ -73,7 +73,7 @@ void mca_pml_ob1_send_request_process_pending(mca_bml_base_btl_t *bml_btl) } break; default: - opal_output(0, "[%s:%d] wrong send request type\n", + orte_output(0, "[%s:%d] wrong send request type\n", __FILE__, __LINE__); break; } @@ -162,7 +162,7 @@ mca_pml_ob1_match_completion_free( struct mca_btl_base_module_t* btl, /* check completion status */ if( OPAL_UNLIKELY(OMPI_SUCCESS != status) ) { /* TSW - FIX */ - opal_output(0, "%s:%d FATAL", __FILE__, __LINE__); + orte_output(0, "%s:%d FATAL", __FILE__, __LINE__); orte_errmgr.abort(-1, NULL); } @@ -195,7 +195,7 @@ mca_pml_ob1_rndv_completion( mca_btl_base_module_t* btl, /* check completion status */ if( OPAL_UNLIKELY(OMPI_SUCCESS != status) ) { /* TSW - FIX */ - opal_output(0, "%s:%d FATAL", __FILE__, __LINE__); + orte_output(0, "%s:%d FATAL", __FILE__, __LINE__); orte_errmgr.abort(-1, NULL); } @@ -280,7 +280,7 @@ mca_pml_ob1_frag_completion( mca_btl_base_module_t* btl, /* check completion status */ if( OPAL_UNLIKELY(OMPI_SUCCESS != status) ) { /* TSW - FIX */ - opal_output(0, "%s:%d FATAL", __FILE__, __LINE__); + orte_output(0, "%s:%d FATAL", __FILE__, __LINE__); orte_errmgr.abort(-1, NULL); } diff --git a/ompi/mca/pml/v/mca/vprotocol/example/vprotocol_example_component.c b/ompi/mca/pml/v/mca/vprotocol/example/vprotocol_example_component.c index 7a3ffd14f1..b38400c91f 100644 --- a/ompi/mca/pml/v/mca/vprotocol/example/vprotocol_example_component.c +++ b/ompi/mca/pml/v/mca/vprotocol/example/vprotocol_example_component.c @@ -87,7 +87,7 @@ mca_pml_v_protocol_base_module_t *mca_vprotocol_example_component_init( int* pri * Some protocols requires sanity check about thread support (those making piecewise deterministic assumption) if(enable_mpi_threads) { - OPAL_OUTPUT_VERBOSE( mca_pml_v_verbose, mca_pml_v_output, "vprotocol_example.init: threads are enabled, and not supported by vprotocol example fault tolerant layer, will not load")); + ORTE_OUTPUT_VERBOSE( mca_pml_v_verbose, mca_pml_v_output, "vprotocol_example.init: threads are enabled, and not supported by vprotocol example fault tolerant layer, will not load")); return NULL; } */ diff --git a/ompi/mca/pml/v/mca/vprotocol/pessimist/vprotocol_pessimist_component.c b/ompi/mca/pml/v/mca/vprotocol/pessimist/vprotocol_pessimist_component.c index ffbbaf99cd..1efb7c43c0 100644 --- a/ompi/mca/pml/v/mca/vprotocol/pessimist/vprotocol_pessimist_component.c +++ b/ompi/mca/pml/v/mca/vprotocol/pessimist/vprotocol_pessimist_component.c @@ -90,7 +90,7 @@ static mca_vprotocol_base_module_t *mca_vprotocol_pessimist_component_init( int* /* sanity check */ if(enable_mpi_threads) { - opal_output(0, "vprotocol_pessimist: component_init: threads are enabled, and not supported by vprotocol pessimist fault tolerant layer, will not load"); + orte_output(0, "vprotocol_pessimist: component_init: threads are enabled, and not supported by vprotocol pessimist fault tolerant layer, will not load"); return NULL; } diff --git a/ompi/mca/pml/v/pml_v_output.c b/ompi/mca/pml/v/pml_v_output.c index 5aa82f0f83..05546de1e2 100644 --- a/ompi/mca/pml/v/pml_v_output.c +++ b/ompi/mca/pml/v/pml_v_output.c @@ -10,6 +10,8 @@ #include "ompi_config.h" +#include "orte/util/output.h" + #include "pml_v_output.h" #if defined(HAVE_UNISTD_H) @@ -45,12 +47,12 @@ int pml_v_output_open(char *output, int verbosity) { gethostname(hostname, 32); asprintf(&lds.lds_prefix, "[%s:%05d] pml_v: ", hostname, getpid()); lds.lds_verbose_level = verbosity; - pml_v_output = opal_output_open(&lds); + pml_v_output = orte_output_open(&lds, "PML", "V", "DEBUG", NULL); free(lds.lds_prefix); } return pml_v_output; } void pml_v_output_close(void) { - opal_output_close(pml_v_output); + orte_output_close(pml_v_output); } diff --git a/ompi/mca/pml/v/pml_v_output.h b/ompi/mca/pml/v/pml_v_output.h index 3f0fb9b911..c745935f83 100644 --- a/ompi/mca/pml/v/pml_v_output.h +++ b/ompi/mca/pml/v/pml_v_output.h @@ -11,7 +11,7 @@ #ifndef PML_V_OUTPUT_H_HAS_BEEN_INCLUDED #define PML_V_OUTPUT_H_HAS_BEEN_INCLUDED -#include "opal/util/output.h" +#include "orte/util/output.h" #include "opal_stdint.h" #include @@ -33,7 +33,7 @@ static inline void V_OUTPUT_ERR(const char *fmt, ... ) va_start(list, fmt); ret = vasprintf(&str, fmt, list); assert(-1 != ret); - opal_output(0, str); + orte_output(0, str); free(str); va_end(list); } @@ -42,15 +42,15 @@ static inline void V_OUTPUT_ERR(const char *fmt, ... ) */ #if defined(ACCEPT_C99) # define V_OUTPUT(ARGS...) \ - OPAL_OUTPUT((pml_v_output, __VA_ARGS__)) + ORTE_OUTPUT((pml_v_output, __VA_ARGS__)) # define V_OUTPUT_VERBOSE(V, ARGS...) \ - OPAL_OUTPUT_VERBOSE((V, pml_v_output, __VA_ARGS__)) + ORTE_OUTPUT_VERBOSE((V, pml_v_output, __VA_ARGS__)) #elif defined(__GNUC__) && !defined(__STDC__) # define V_OUTPUT(ARGS...) \ - OPAL_OUTPUT((pml_v_output, ARGS)) + ORTE_OUTPUT((pml_v_output, ARGS)) # define V_OUTPUT_VERBOSE(V, ARGS...) \ - OPAL_OUTPUT_VERBOSE((V, pml_v_output, ARGS)) + ORTE_OUTPUT_VERBOSE((V, pml_v_output, ARGS)) #elif OMPI_ENABLE_DEBUG /* No variadic macros available... So sad */ @@ -63,7 +63,7 @@ static inline void V_OUTPUT(const char* fmt, ... ) va_start(list, fmt); ret = vasprintf(&str, fmt, list); assert(-1 != ret); - opal_output(pml_v_output, str); + orte_output(pml_v_output, str); free(str); va_end(list); } @@ -75,7 +75,7 @@ static inline void V_OUTPUT_VERBOSE(int V, const char* fmt, ... ) { va_start(list, fmt); ret = vasprintf(&str, fmt, list); assert(-1 != ret); - opal_output_verbose(V, pml_v_output, str); + orte_output_verbose(V, pml_v_output, str); free(str); va_end(list); } diff --git a/ompi/mca/pubsub/base/pubsub_base_close.c b/ompi/mca/pubsub/base/pubsub_base_close.c index 182468f08e..ae6321cc68 100644 --- a/ompi/mca/pubsub/base/pubsub_base_close.c +++ b/ompi/mca/pubsub/base/pubsub_base_close.c @@ -19,7 +19,7 @@ #include "opal/mca/mca.h" #include "opal/mca/base/base.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "opal/mca/base/mca_base_param.h" #include "ompi/mca/pubsub/pubsub.h" diff --git a/ompi/mca/pubsub/base/pubsub_base_open.c b/ompi/mca/pubsub/base/pubsub_base_open.c index ad61a8b394..802d29f9ac 100644 --- a/ompi/mca/pubsub/base/pubsub_base_open.c +++ b/ompi/mca/pubsub/base/pubsub_base_open.c @@ -19,9 +19,11 @@ #include "opal/mca/mca.h" #include "opal/mca/base/base.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "opal/mca/base/mca_base_param.h" +#include "orte/util/output.h" + #include "ompi/mca/pubsub/pubsub.h" #include "ompi/mca/pubsub/base/base.h" @@ -42,7 +44,7 @@ ompi_pubsub_base_component_t ompi_pubsub_base_selected_component; int ompi_pubsub_base_open(void) { /* Debugging/Verbose output */ - ompi_pubsub_base_output = opal_output_open(NULL); + ompi_pubsub_base_output = orte_output_open(NULL, "PUBSUB", "DEBUG", NULL); /* Open up all available components */ if (OPAL_SUCCESS != diff --git a/ompi/mca/pubsub/base/pubsub_base_select.c b/ompi/mca/pubsub/base/pubsub_base_select.c index d9f3818cd8..858a23de38 100644 --- a/ompi/mca/pubsub/base/pubsub_base_select.c +++ b/ompi/mca/pubsub/base/pubsub_base_select.c @@ -19,7 +19,7 @@ #include "opal/mca/mca.h" #include "opal/mca/base/base.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "opal/mca/base/mca_base_param.h" #include "opal/mca/base/mca_base_component_repository.h" diff --git a/ompi/mca/pubsub/orte/pubsub_orte.c b/ompi/mca/pubsub/orte/pubsub_orte.c index 920050b6b3..c6687c2e73 100644 --- a/ompi/mca/pubsub/orte/pubsub_orte.c +++ b/ompi/mca/pubsub/orte/pubsub_orte.c @@ -24,7 +24,7 @@ #include #include -#include "opal/util/show_help.h" +#include "orte/util/output.h" #include "opal/util/argv.h" #include "opal/util/opal_getcwd.h" @@ -64,7 +64,7 @@ static bool server_setup=false; static void setup_server(void) { - OPAL_OUTPUT_VERBOSE((1, ompi_pubsub_base_output, + ORTE_OUTPUT_VERBOSE((1, ompi_pubsub_base_output, "%s pubsub:orte: setting up server at URI %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), (NULL == mca_pubsub_orte_component.server_uri) ? "NULL" : mca_pubsub_orte_component.server_uri)); @@ -86,7 +86,7 @@ static void setup_server(void) /* flag setup as completed */ server_setup = true; - OPAL_OUTPUT_VERBOSE((1, ompi_pubsub_base_output, + ORTE_OUTPUT_VERBOSE((1, ompi_pubsub_base_output, "%s pubsub:orte: server %s setup", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(&mca_pubsub_orte_component.server))); @@ -116,7 +116,7 @@ static int publish ( char *service_name, ompi_info_t *info, char *port_name ) ompi_info_get_bool(info, "ompi_global_scope", &global_scope, &flag); - OPAL_OUTPUT_VERBOSE((1, ompi_pubsub_base_output, + ORTE_OUTPUT_VERBOSE((1, ompi_pubsub_base_output, "%s pubsub:orte: publishing service %s scope %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), service_name, global_scope ? "Global" : "Local")); @@ -133,7 +133,7 @@ static int publish ( char *service_name, ompi_info_t *info, char *port_name ) * if that server wasn't contacted */ if (!mca_pubsub_orte_component.server_found) { - opal_show_help("help-ompi-pubsub-orte.txt", "pubsub-orte:no-server", + orte_show_help("help-ompi-pubsub-orte.txt", "pubsub-orte:no-server", true, (long)ORTE_PROC_MY_NAME->vpid, "publish to"); return OMPI_ERR_NOT_FOUND; } @@ -232,7 +232,7 @@ static char* lookup ( char *service_name, ompi_info_t *info ) if (NULL != tokens) { if ((num_tokens = opal_argv_count(tokens)) > 2) { /* too many values in the comma-delimited list */ - opal_show_help("help-ompi-pubsub-orte.txt", + orte_show_help("help-ompi-pubsub-orte.txt", "pubsub-orte:too-many-orders", true, (long)ORTE_PROC_MY_NAME->vpid, (long)num_tokens); @@ -246,7 +246,7 @@ static char* lookup ( char *service_name, ompi_info_t *info ) lookup[i] = GLOBAL; } else { /* unrecognized value -- that's an error */ - opal_show_help("help-ompi-pubsub-orte.txt", + orte_show_help("help-ompi-pubsub-orte.txt", "pubsub-orte:unknown-order", true, (long)ORTE_PROC_MY_NAME->vpid); return NULL; @@ -260,7 +260,7 @@ static char* lookup ( char *service_name, ompi_info_t *info ) } } - OPAL_OUTPUT_VERBOSE((1, ompi_pubsub_base_output, + ORTE_OUTPUT_VERBOSE((1, ompi_pubsub_base_output, "%s pubsub:orte: lookup service %s scope %d", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), service_name, lookup[0])); @@ -271,7 +271,7 @@ static char* lookup ( char *service_name, ompi_info_t *info ) /* if the user provided an info key, then we at least must * be given one place to look */ - opal_show_help("help-ompi-pubsub-orte.txt", + orte_show_help("help-ompi-pubsub-orte.txt", "pubsub-orte:unknown-order", true, (long)ORTE_PROC_MY_NAME->vpid); return NULL; @@ -287,7 +287,7 @@ static char* lookup ( char *service_name, ompi_info_t *info ) /* if we were told to look global first and no server is * present, then that is an error */ - opal_show_help("help-ompi-pubsub-orte.txt", "pubsub-orte:no-server", + orte_show_help("help-ompi-pubsub-orte.txt", "pubsub-orte:no-server", true, (long)ORTE_PROC_MY_NAME->vpid, "lookup from"); return NULL; } @@ -307,7 +307,7 @@ static char* lookup ( char *service_name, ompi_info_t *info ) * if that server wasn't contacted */ if (!mca_pubsub_orte_component.server_found) { - opal_show_help("help-ompi-pubsub-orte.txt", + orte_show_help("help-ompi-pubsub-orte.txt", "pubsub-orte:no-server", true, (long)ORTE_PROC_MY_NAME->vpid, "lookup from"); @@ -316,7 +316,7 @@ static char* lookup ( char *service_name, ompi_info_t *info ) info_host = &mca_pubsub_orte_component.server; } else { /* unknown host! */ - opal_show_help("help-ompi-pubsub-orte.txt", + orte_show_help("help-ompi-pubsub-orte.txt", "pubsub-orte:unknown-order", true, (long)ORTE_PROC_MY_NAME->vpid); return NULL; @@ -406,7 +406,7 @@ static int unpublish ( char *service_name, ompi_info_t *info ) ompi_info_get_bool(info, "ompi_global_scope", &global_scope, &flag); - OPAL_OUTPUT_VERBOSE((1, ompi_pubsub_base_output, + ORTE_OUTPUT_VERBOSE((1, ompi_pubsub_base_output, "%s pubsub:orte: unpublish service %s scope %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), service_name, global_scope ? "Global" : "Local")); @@ -423,7 +423,7 @@ static int unpublish ( char *service_name, ompi_info_t *info ) * if that server wasn't contacted */ if (!mca_pubsub_orte_component.server_found) { - opal_show_help("help-ompi-pubsub-orte.txt", "pubsub-orte:no-server", + orte_show_help("help-ompi-pubsub-orte.txt", "pubsub-orte:no-server", true); return OMPI_ERR_NOT_FOUND; } diff --git a/ompi/mca/rcache/rb/rcache_rb.c b/ompi/mca/rcache/rb/rcache_rb.c index 728616630f..4ea5fb65f9 100644 --- a/ompi/mca/rcache/rb/rcache_rb.c +++ b/ompi/mca/rcache/rb/rcache_rb.c @@ -22,7 +22,7 @@ #include "rcache_rb.h" #include "rcache_rb_tree.h" #include "rcache_rb_mru.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "ompi/mca/mpool/base/base.h" /** diff --git a/ompi/mca/rcache/vma/rcache_vma.c b/ompi/mca/rcache/vma/rcache_vma.c index e6fd51c804..c2899183d7 100644 --- a/ompi/mca/rcache/vma/rcache_vma.c +++ b/ompi/mca/rcache/vma/rcache_vma.c @@ -25,7 +25,7 @@ #include "ompi/mca/rcache/rcache.h" #include "rcache_vma.h" #include "rcache_vma_tree.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "ompi/mca/mpool/base/base.h" /** diff --git a/ompi/mca/topo/base/topo_base_close.c b/ompi/mca/topo/base/topo_base_close.c index d084082f91..dfc39b1dee 100644 --- a/ompi/mca/topo/base/topo_base_close.c +++ b/ompi/mca/topo/base/topo_base_close.c @@ -19,7 +19,7 @@ #include -#include "opal/util/output.h" +#include "orte/util/output.h" #include "ompi/constants.h" #include "opal/mca/mca.h" #include "opal/mca/base/base.h" @@ -45,7 +45,7 @@ int mca_topo_base_close(void) } /* Close the output stream for this framework */ - opal_output_close (mca_topo_base_output); + orte_output_close (mca_topo_base_output); /* * All done diff --git a/ompi/mca/topo/base/topo_base_comm_select.c b/ompi/mca/topo/base/topo_base_comm_select.c index a66a5f1a60..e6ec690da7 100644 --- a/ompi/mca/topo/base/topo_base_comm_select.c +++ b/ompi/mca/topo/base/topo_base_comm_select.c @@ -26,7 +26,7 @@ #include "opal/mca/base/base.h" #include "ompi/mca/topo/topo.h" #include "ompi/mca/topo/base/base.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "ompi/communicator/communicator.h" @@ -100,7 +100,7 @@ int mca_topo_base_comm_select (struct ompi_communicator_t *comm, snprintf(name, sizeof(name), "%s (cid %d)", comm->c_name, comm->c_contextid); name[sizeof(name) - 1] = '\0'; - opal_output_verbose(10, mca_topo_base_output, + orte_output_verbose(10, mca_topo_base_output, "topo:base:comm_select: new communicator: %s", name); @@ -115,7 +115,7 @@ int mca_topo_base_comm_select (struct ompi_communicator_t *comm, str = &(preferred->mca_component_name[0]); - opal_output_verbose(10, mca_topo_base_output, + orte_output_verbose(10, mca_topo_base_output, "topo:base:comm_select: Checking preferred component: %s", str); @@ -166,7 +166,7 @@ int mca_topo_base_comm_select (struct ompi_communicator_t *comm, name_array = opal_argv_split (names, ','); num_names = opal_argv_count (name_array); - opal_output_verbose(10, mca_topo_base_output, + orte_output_verbose(10, mca_topo_base_output, "topo:base:comm_Select: Checking all available module"); /* since there are somethings which the mca requested through the @@ -185,7 +185,7 @@ int mca_topo_base_comm_select (struct ompi_communicator_t *comm, /* convert the opal_list_item_t returned into the proper type */ cpli = (mca_base_component_priority_list_item_t *) item; component = (mca_topo_base_component_t *) cpli->super.cli_component; - opal_output_verbose(10, mca_topo_base_output, + orte_output_verbose(10, mca_topo_base_output, "select: initialising %s component %s", component->topom_version.mca_type_name, component->topom_version.mca_component_name); @@ -212,7 +212,7 @@ int mca_topo_base_comm_select (struct ompi_communicator_t *comm, if (0 == opal_list_get_size(selectable)) { was_selectable_constructed = true; OBJ_RELEASE (selectable); - opal_output_verbose (10, mca_topo_base_output, + orte_output_verbose (10, mca_topo_base_output, "topo:base:comm_select: preferred modules were not available"); return OMPI_ERROR; } @@ -233,7 +233,7 @@ int mca_topo_base_comm_select (struct ompi_communicator_t *comm, */ cpli = (mca_base_component_priority_list_item_t *) item; component = (mca_topo_base_component_t *) cpli->super.cli_component; - opal_output_verbose(10, mca_topo_base_output, + orte_output_verbose(10, mca_topo_base_output, "select: initialising %s component %s", component->topom_version.mca_type_name, component->topom_version.mca_component_name); @@ -242,7 +242,7 @@ int mca_topo_base_comm_select (struct ompi_communicator_t *comm, * we can call the query function only if there is a function :-) */ if (NULL == component->topom_comm_query) { - opal_output_verbose(10, mca_topo_base_output, + orte_output_verbose(10, mca_topo_base_output, "select: no query, ignoring the component"); } else { /* @@ -257,10 +257,10 @@ int mca_topo_base_comm_select (struct ompi_communicator_t *comm, /* * query did not return any action which can be used */ - opal_output_verbose(10, mca_topo_base_output, + orte_output_verbose(10, mca_topo_base_output, "select: query returned failure"); } else { - opal_output_verbose(10, mca_topo_base_output, + orte_output_verbose(10, mca_topo_base_output, "select: query returned priority %d", priority); /* @@ -364,7 +364,7 @@ int mca_topo_base_comm_select (struct ompi_communicator_t *comm, * unquery. Hence this check is necessary */ (void) om->om_component->topom_comm_unquery(comm); - opal_output_verbose(10, mca_topo_base_output, + orte_output_verbose(10, mca_topo_base_output, "select: component %s is not selected", om->om_component->topom_version.mca_component_name); } /* end if */ @@ -372,7 +372,7 @@ int mca_topo_base_comm_select (struct ompi_communicator_t *comm, OBJ_RELEASE(om); } /* traversing through the entire list */ - opal_output_verbose(10, mca_topo_base_output, + orte_output_verbose(10, mca_topo_base_output, "select: component %s selected", best_component->topom_version.mca_component_name); diff --git a/ompi/mca/topo/base/topo_base_find_available.c b/ompi/mca/topo/base/topo_base_find_available.c index 54a3e99239..183ce97da6 100644 --- a/ompi/mca/topo/base/topo_base_find_available.c +++ b/ompi/mca/topo/base/topo_base_find_available.c @@ -23,7 +23,7 @@ #include "mpi.h" #include "opal/class/opal_list.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "opal/mca/mca.h" #include "opal/mca/base/base.h" #include "opal/mca/base/mca_base_component_repository.h" @@ -101,7 +101,7 @@ int mca_topo_base_find_available(bool enable_progress_threads, /* Need to free all items in the list */ OBJ_DESTRUCT(&mca_topo_base_components_available); mca_topo_base_components_available_valid = false; - opal_output_verbose (10, mca_topo_base_output, + orte_output_verbose (10, mca_topo_base_output, "topo:find_available: no topo components available!"); return OMPI_ERROR; } @@ -118,7 +118,7 @@ static int init_query(const mca_base_component_t *m, { int ret; - opal_output_verbose(10, mca_topo_base_output, + orte_output_verbose(10, mca_topo_base_output, "topo:find_available: querying topo component %s", m->mca_component_name); @@ -130,7 +130,7 @@ static int init_query(const mca_base_component_t *m, enable_mpi_threads); } else { /* unrecognised API version */ - opal_output_verbose(10, mca_topo_base_output, + orte_output_verbose(10, mca_topo_base_output, "topo:find_available:unrecognised topo API version (%d.%d.%d)", m->mca_type_major_version, m->mca_type_minor_version, @@ -140,14 +140,14 @@ static int init_query(const mca_base_component_t *m, /* Query done -- look at return value to see what happened */ if (OMPI_SUCCESS != ret) { - opal_output_verbose(10, mca_topo_base_output, + orte_output_verbose(10, mca_topo_base_output, "topo:find_available topo component %s is not available", m->mca_component_name); if (NULL != m->mca_close_component) { m->mca_close_component(); } } else { - opal_output_verbose(10, mca_topo_base_output, + orte_output_verbose(10, mca_topo_base_output, "topo:find_avalable: topo component %s is available", m->mca_component_name); diff --git a/ompi/mca/topo/base/topo_base_open.c b/ompi/mca/topo/base/topo_base_open.c index 95e64598de..7231bbb3e2 100644 --- a/ompi/mca/topo/base/topo_base_open.c +++ b/ompi/mca/topo/base/topo_base_open.c @@ -21,10 +21,13 @@ #include #include "ompi/constants.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "opal/class/opal_list.h" #include "opal/mca/mca.h" #include "opal/mca/base/base.h" + +#include "orte/util/output.h" + #include "ompi/mca/topo/base/base.h" /* @@ -57,7 +60,7 @@ bool mca_topo_base_components_opened_valid = false; int mca_topo_base_open(void) { /* Open the topo framework output stream */ - mca_topo_base_output = opal_output_open(NULL); + mca_topo_base_output = orte_output_open(NULL, "TOPO", "DEBUG", NULL); /* Open up all available components */ if (OMPI_SUCCESS != diff --git a/ompi/mpi/c/abort.c b/ompi/mpi/c/abort.c index 7db38120cb..ac39871b23 100644 --- a/ompi/mpi/c/abort.c +++ b/ompi/mpi/c/abort.c @@ -49,7 +49,7 @@ int MPI_Abort(MPI_Comm comm, int errorcode) OMPI_ERR_INIT_FINALIZE(FUNC_NAME); } - opal_output(0, "MPI_ABORT invoked on rank %d in communicator %s with errorcode %d\n", + orte_output(0, "MPI_ABORT invoked on rank %d in communicator %s with errorcode %d\n", ompi_comm_rank(comm), comm->c_name, errorcode); return ompi_mpi_abort(comm, errorcode, true); } diff --git a/ompi/mpi/c/comm_spawn.c b/ompi/mpi/c/comm_spawn.c index d6e76d8061..be165694cf 100644 --- a/ompi/mpi/c/comm_spawn.c +++ b/ompi/mpi/c/comm_spawn.c @@ -19,7 +19,7 @@ #include "ompi_config.h" #include -#include "opal/util/show_help.h" +#include "orte/util/output.h" #include "ompi/info/info.h" #include "ompi/mpi/c/bindings.h" #include "ompi/mca/dpm/dpm.h" diff --git a/ompi/mpi/c/comm_spawn_multiple.c b/ompi/mpi/c/comm_spawn_multiple.c index 7c5b28a5b6..135fe6a278 100644 --- a/ompi/mpi/c/comm_spawn_multiple.c +++ b/ompi/mpi/c/comm_spawn_multiple.c @@ -19,7 +19,7 @@ #include "ompi_config.h" #include -#include "opal/util/show_help.h" +#include "orte/util/output.h" #include "ompi/mpi/c/bindings.h" #include "ompi/info/info.h" #include "ompi/mca/dpm/dpm.h" diff --git a/ompi/mpi/c/init.c b/ompi/mpi/c/init.c index 9b6d793ba5..b069ab22c8 100644 --- a/ompi/mpi/c/init.c +++ b/ompi/mpi/c/init.c @@ -22,7 +22,7 @@ #include -#include "opal/util/show_help.h" +#include "orte/util/output.h" #include "ompi/mpi/c/bindings.h" #include "ompi/constants.h" @@ -48,14 +48,14 @@ int MPI_Init(int *argc, char ***argv) if (ompi_mpi_finalized) { if (0 == ompi_comm_rank(MPI_COMM_WORLD)) { - opal_show_help("help-mpi-api.txt", "mpi-function-after-finalize", + orte_show_help("help-mpi-api.txt", "mpi-function-after-finalize", true, FUNC_NAME); } return ompi_errhandler_invoke(NULL, NULL, OMPI_ERRHANDLER_TYPE_COMM, MPI_ERR_OTHER, FUNC_NAME); } else if (ompi_mpi_initialized) { if (0 == ompi_comm_rank(MPI_COMM_WORLD)) { - opal_show_help("help-mpi-api.txt", "mpi-initialize-twice", + orte_show_help("help-mpi-api.txt", "mpi-initialize-twice", true, FUNC_NAME); } return OMPI_ERRHANDLER_INVOKE(MPI_COMM_WORLD, MPI_ERR_OTHER, FUNC_NAME); diff --git a/ompi/mpi/c/init_thread.c b/ompi/mpi/c/init_thread.c index 8165f316a2..b39978d215 100644 --- a/ompi/mpi/c/init_thread.c +++ b/ompi/mpi/c/init_thread.c @@ -18,7 +18,7 @@ #include "ompi_config.h" -#include "opal/util/show_help.h" +#include "orte/util/output.h" #include "ompi/mpi/c/bindings.h" #include "ompi/constants.h" @@ -59,14 +59,14 @@ int MPI_Init_thread(int *argc, char ***argv, int required, if (ompi_mpi_finalized) { if (0 == ompi_comm_rank(MPI_COMM_WORLD)) { - opal_show_help("help-mpi-api.txt", "mpi-function-after-finalize", + orte_show_help("help-mpi-api.txt", "mpi-function-after-finalize", true, FUNC_NAME); } return ompi_errhandler_invoke(NULL, NULL, OMPI_ERRHANDLER_TYPE_COMM, MPI_ERR_OTHER, FUNC_NAME); } else if (ompi_mpi_initialized) { if (0 == ompi_comm_rank(MPI_COMM_WORLD)) { - opal_show_help("help-mpi-api.txt", "mpi-initialize-twice", + orte_show_help("help-mpi-api.txt", "mpi-initialize-twice", true, FUNC_NAME); } return OMPI_ERRHANDLER_INVOKE(MPI_COMM_WORLD, MPI_ERR_OTHER, FUNC_NAME); diff --git a/ompi/mpi/c/wtick.c b/ompi/mpi/c/wtick.c index bcfff880cd..8ceef8a2d4 100644 --- a/ompi/mpi/c/wtick.c +++ b/ompi/mpi/c/wtick.c @@ -48,7 +48,7 @@ double MPI_Wtick(void) return 0.000001; #elif defined(__WINDOWS__) if( (opal_timer_t)0 == opal_timer_base_get_freq() ) { - opal_output( 0, "No timer frequency\n" ); + orte_output( 0, "No timer frequency\n" ); } return (double)opal_timer_base_get_freq(); #else diff --git a/ompi/proc/proc.c b/ompi/proc/proc.c index b97204bb6f..6b1528e5ce 100644 --- a/ompi/proc/proc.c +++ b/ompi/proc/proc.c @@ -22,8 +22,7 @@ #include #include "opal/threads/mutex.h" -#include "opal/util/output.h" -#include "opal/util/show_help.h" +#include "orte/util/output.h" #include "opal/util/arch.h" #include "opal/dss/dss.h" @@ -128,7 +127,7 @@ int ompi_proc_init(void) OBJ_RELEASE(proc->proc_convertor); proc->proc_convertor = ompi_convertor_create(proc->proc_arch, 0); #else - opal_show_help("help-mpi-runtime", + orte_show_help("help-mpi-runtime", "heterogeneous-support-unavailable", true, orte_process_info.nodename, proc->proc_hostname == NULL ? "" : @@ -301,7 +300,7 @@ int ompi_proc_refresh(void) { OBJ_RELEASE(proc->proc_convertor); proc->proc_convertor = ompi_convertor_create(proc->proc_arch, 0); #else - opal_show_help("help-mpi-runtime", + orte_show_help("help-mpi-runtime", "heterogeneous-support-unavailable", true, orte_process_info.nodename, proc->proc_hostname == NULL ? "" : @@ -440,7 +439,7 @@ ompi_proc_unpack(opal_buffer_t* buf, OBJ_RELEASE(plist[i]->proc_convertor); plist[i]->proc_convertor = ompi_convertor_create(plist[i]->proc_arch, 0); #else - opal_show_help("help-mpi-runtime", + orte_show_help("help-mpi-runtime", "heterogeneous-support-unavailable", true, orte_process_info.nodename, new_hostname == NULL ? "" : diff --git a/ompi/runtime/ompi_cr.c b/ompi/runtime/ompi_cr.c index 08afd3d46e..03f445137e 100644 --- a/ompi/runtime/ompi_cr.c +++ b/ompi/runtime/ompi_cr.c @@ -39,7 +39,7 @@ #include /* for mkfifo */ #endif /* HAVE_SYS_STAT_H */ -#include "opal/util/output.h" +#include "orte/util/output.h" #include "opal/event/event.h" #include "opal/mca/crs/crs.h" #include "opal/mca/crs/base/base.h" @@ -49,6 +49,7 @@ #include "orte/mca/snapc/snapc.h" #include "orte/mca/snapc/base/base.h" #include "orte/runtime/runtime.h" +#include "orte/util/output.h" #include "ompi/constants.h" #include "ompi/mca/pml/pml.h" @@ -152,13 +153,13 @@ int ompi_cr_init(void) 0, &val); if(0 != val) { - ompi_cr_output = opal_output_open(NULL); - opal_output_set_verbosity(ompi_cr_output, val); + ompi_cr_output = orte_output_open(NULL, "OMPI", "CR", "DEBUG", NULL); + orte_output_set_verbosity(ompi_cr_output, val); } else { ompi_cr_output = opal_cr_output; } - opal_output_verbose(10, ompi_cr_output, + orte_output_verbose(10, ompi_cr_output, "ompi_cr: init: ompi_cr_init()"); /* Register the OMPI interlevel coordination callback */ @@ -172,7 +173,7 @@ int ompi_cr_init(void) */ int ompi_cr_finalize(void) { - opal_output_verbose(10, ompi_cr_output, + orte_output_verbose(10, ompi_cr_output, "ompi_cr: finalize: ompi_cr_finalize()"); return OMPI_SUCCESS; @@ -185,7 +186,7 @@ int ompi_cr_coord(int state) { int ret, exit_status = OMPI_SUCCESS; - opal_output_verbose(10, ompi_cr_output, + orte_output_verbose(10, ompi_cr_output, "ompi_cr: coord: ompi_cr_coord(%s)\n", opal_crs_base_state_str((opal_crs_state_type_t)state)); @@ -267,7 +268,7 @@ static int ompi_cr_coord_pre_ckpt(void) { /* * All the checkpoint heavey lifting in here... */ - opal_output_verbose(10, ompi_cr_output, + orte_output_verbose(10, ompi_cr_output, "ompi_cr: coord_pre_ckpt: ompi_cr_coord_pre_ckpt()\n"); /* @@ -296,7 +297,7 @@ static int ompi_cr_coord_pre_ckpt(void) { static int ompi_cr_coord_pre_restart(void) { int ret, exit_status = OMPI_SUCCESS; - opal_output_verbose(10, ompi_cr_output, + orte_output_verbose(10, ompi_cr_output, "ompi_cr: coord_pre_restart: ompi_cr_coord_pre_restart()"); /* @@ -320,7 +321,7 @@ static int ompi_cr_coord_pre_continue(void) { * Can not really do much until ORTE is up and running, * so defer action until the post_continue function. */ - opal_output_verbose(10, ompi_cr_output, + orte_output_verbose(10, ompi_cr_output, "ompi_cr: coord_pre_continue: ompi_cr_coord_pre_continue()"); return OMPI_SUCCESS; @@ -334,7 +335,7 @@ static int ompi_cr_coord_post_ckpt(void) { * Now that ORTE/OPAL are shutdown, we really can't do much * so assume pre_ckpt took care of everything. */ - opal_output_verbose(10, ompi_cr_output, + orte_output_verbose(10, ompi_cr_output, "ompi_cr: coord_post_ckpt: ompi_cr_coord_post_ckpt()"); return OMPI_SUCCESS; @@ -343,7 +344,7 @@ static int ompi_cr_coord_post_ckpt(void) { static int ompi_cr_coord_post_restart(void) { int ret, exit_status = OMPI_SUCCESS; - opal_output_verbose(10, ompi_cr_output, + orte_output_verbose(10, ompi_cr_output, "ompi_cr: coord_post_restart: ompi_cr_coord_post_restart()"); /* @@ -372,7 +373,7 @@ static int ompi_cr_coord_post_restart(void) { static int ompi_cr_coord_post_continue(void) { int ret, exit_status = OMPI_SUCCESS; - opal_output_verbose(10, ompi_cr_output, + orte_output_verbose(10, ompi_cr_output, "ompi_cr: coord_post_continue: ompi_cr_coord_post_continue()"); /* diff --git a/ompi/runtime/ompi_mpi_finalize.c b/ompi/runtime/ompi_mpi_finalize.c index 9bf22965c0..a44a3bec4e 100644 --- a/ompi/runtime/ompi_mpi_finalize.c +++ b/ompi/runtime/ompi_mpi_finalize.c @@ -40,7 +40,7 @@ #include "opal/runtime/opal_progress.h" #include "opal/mca/maffinity/base/base.h" #include "opal/mca/base/base.h" -#include "opal/util/show_help.h" +#include "orte/util/output.h" #include "opal/sys/atomic.h" #include "orte/util/proc_info.h" @@ -103,7 +103,7 @@ int ompi_mpi_finalize(void) pid_t pid = getpid(); gethostname(hostname, sizeof(hostname)); - opal_show_help("help-mpi-runtime.txt", + orte_show_help("help-mpi-runtime.txt", "mpi_finalize:invoked_multiple_times", true, hostname, pid); return MPI_ERR_OTHER; diff --git a/ompi/runtime/ompi_mpi_init.c b/ompi/runtime/ompi_mpi_init.c index 981525d18b..a866e129c2 100644 --- a/ompi/runtime/ompi_mpi_init.c +++ b/ompi/runtime/ompi_mpi_init.c @@ -36,7 +36,6 @@ #include "opal/runtime/opal_progress.h" #include "opal/threads/threads.h" #include "opal/util/argv.h" -#include "opal/util/show_help.h" #include "opal/util/stacktrace.h" #include "opal/util/num_procs.h" #include "opal/runtime/opal.h" @@ -50,6 +49,7 @@ #include "orte/mca/errmgr/errmgr.h" #include "orte/mca/grpcomm/grpcomm.h" #include "orte/runtime/orte_globals.h" +#include "orte/util/output.h" #include "ompi/constants.h" #include "ompi/mpi/f77/constants.h" @@ -302,7 +302,7 @@ int ompi_mpi_init(int argc, char **argv, int requested, int *provided) /* check for timing request - get stop time and report elapsed time if so */ if (timing && 0 == ORTE_PROC_MY_NAME->vpid) { gettimeofday(&ompistop, NULL); - opal_output(0, "ompi_mpi_init [%ld]: time from start to completion of orte_init %ld usec", + orte_output(0, "ompi_mpi_init [%ld]: time from start to completion of orte_init %ld usec", (long)ORTE_PROC_MY_NAME->vpid, (long int)((ompistop.tv_sec - ompistart.tv_sec)*1000000 + (ompistop.tv_usec - ompistart.tv_usec))); @@ -506,7 +506,7 @@ int ompi_mpi_init(int argc, char **argv, int requested, int *provided) /* check for timing request - get stop time and report elapsed time if so */ if (timing && 0 == ORTE_PROC_MY_NAME->vpid) { gettimeofday(&ompistop, NULL); - opal_output(0, "ompi_mpi_init[%ld]: time from completion of orte_init to modex %ld usec", + orte_output(0, "ompi_mpi_init[%ld]: time from completion of orte_init to modex %ld usec", (long)ORTE_PROC_MY_NAME->vpid, (long int)((ompistop.tv_sec - ompistart.tv_sec)*1000000 + (ompistop.tv_usec - ompistart.tv_usec))); @@ -523,7 +523,7 @@ int ompi_mpi_init(int argc, char **argv, int requested, int *provided) if (timing && 0 == ORTE_PROC_MY_NAME->vpid) { gettimeofday(&ompistop, NULL); - opal_output(0, "ompi_mpi_init[%ld]: time to execute modex %ld usec", + orte_output(0, "ompi_mpi_init[%ld]: time to execute modex %ld usec", (long)ORTE_PROC_MY_NAME->vpid, (long int)((ompistop.tv_sec - ompistart.tv_sec)*1000000 + (ompistop.tv_usec - ompistart.tv_usec))); @@ -607,7 +607,7 @@ int ompi_mpi_init(int argc, char **argv, int requested, int *provided) time if so, then start the clock again */ if (timing && 0 == ORTE_PROC_MY_NAME->vpid) { gettimeofday(&ompistop, NULL); - opal_output(0, "ompi_mpi_init[%ld]: time from stage 2 cast to complete oob wireup %ld usec", + orte_output(0, "ompi_mpi_init[%ld]: time from stage 2 cast to complete oob wireup %ld usec", (long)ORTE_PROC_MY_NAME->vpid, (long int)((ompistop.tv_sec - ompistart.tv_sec)*1000000 + (ompistop.tv_usec - ompistart.tv_usec))); @@ -748,7 +748,7 @@ int ompi_mpi_init(int argc, char **argv, int requested, int *provided) error: if (ret != OMPI_SUCCESS) { const char *err_msg = opal_strerror(ret); - opal_show_help("help-mpi-runtime", + orte_show_help("help-mpi-runtime", "mpi_init:startup:internal-failure", true, "MPI_INIT", "MPI_INIT", error, err_msg, ret); return ret; @@ -768,7 +768,7 @@ int ompi_mpi_init(int argc, char **argv, int requested, int *provided) /* check for timing request - get stop time and report elapsed time if so */ if (timing && 0 == ORTE_PROC_MY_NAME->vpid) { gettimeofday(&ompistop, NULL); - opal_output(0, "ompi_mpi_init[%ld]: time from oob wireup to complete mpi_init %ld usec", + orte_output(0, "ompi_mpi_init[%ld]: time from oob wireup to complete mpi_init %ld usec", (long)ORTE_PROC_MY_NAME->vpid, (long int)((ompistop.tv_sec - ompistart.tv_sec)*1000000 + (ompistop.tv_usec - ompistart.tv_usec))); diff --git a/ompi/runtime/ompi_mpi_params.c b/ompi/runtime/ompi_mpi_params.c index ebb05b6930..4eb620af90 100644 --- a/ompi/runtime/ompi_mpi_params.c +++ b/ompi/runtime/ompi_mpi_params.c @@ -29,8 +29,7 @@ #include "ompi/runtime/mpiruntime.h" #include "ompi/runtime/params.h" #include "ompi/datatype/datatype.h" -#include "opal/util/output.h" -#include "opal/util/show_help.h" +#include "orte/util/output.h" #include "opal/mca/base/mca_base_param.h" /* @@ -73,7 +72,7 @@ int ompi_mpi_register_params(void) value = 1; } if (0 == value) { - opal_show_help("help-mpi-runtime.txt", + orte_show_help("help-mpi-runtime.txt", "mpi-param-check-enabled-but-compiled-out", true); ompi_mpi_param_check = false; @@ -117,9 +116,9 @@ int ompi_mpi_register_params(void) value = 1; } if (0 == value) { - opal_output(0, "WARNING: MCA parameter mpi_no_free_handles set to true, but MPI"); - opal_output(0, "WARNING: parameter checking has been compiled out of Open MPI."); - opal_output(0, "WARNING: mpi_no_free_handles is therefore only partially effective!"); + orte_output(0, "WARNING: MCA parameter mpi_no_free_handles set to true, but MPI"); + orte_output(0, "WARNING: parameter checking has been compiled out of Open MPI."); + orte_output(0, "WARNING: mpi_no_free_handles is therefore only partially effective!"); } } @@ -224,7 +223,7 @@ int ompi_mpi_register_params(void) if (ompi_mpi_leave_pinned && ompi_mpi_leave_pinned_pipeline) { ompi_mpi_leave_pinned_pipeline = 0; - opal_show_help("help-mpi-runtime.txt", + orte_show_help("help-mpi-runtime.txt", "mpi-params:leave-pinned-and-pipeline-selected", true); } @@ -244,7 +243,7 @@ int ompi_mpi_register_params(void) value = 1; } if (0 == value) { - opal_show_help("help-mpi-runtime.txt", + orte_show_help("help-mpi-runtime.txt", "sparse groups enabled but compiled out", true); ompi_use_sparse_group_storage = false; @@ -273,7 +272,7 @@ int ompi_show_all_mca_params(int32_t rank, int requested, char *nodename) { /* Open the file if one is specified */ if (0 != strlen(ompi_mpi_show_mca_params_file)) { if ( NULL == (fp = fopen(ompi_mpi_show_mca_params_file, "w")) ) { - opal_output(0, "Unable to open file <%s> to write MCA parameters", ompi_mpi_show_mca_params_file); + orte_output(0, "Unable to open file <%s> to write MCA parameters", ompi_mpi_show_mca_params_file); return OMPI_ERR_FILE_OPEN_FAILURE; } fprintf(fp, "#\n"); @@ -303,7 +302,7 @@ int ompi_show_all_mca_params(int32_t rank, int requested, char *nodename) { if (0 != strlen(ompi_mpi_show_mca_params_file)) { fprintf(fp, "%s=%s\n", item->mbpp_full_name, value_string); } else { - opal_output(0, "%s=%s", item->mbpp_full_name, value_string); + orte_output(0, "%s=%s", item->mbpp_full_name, value_string); } free(value_string); diff --git a/ompi/tools/ompi-server/ompi-server.c b/ompi/tools/ompi-server/ompi-server.c index 52b53faa78..ee1c825642 100644 --- a/ompi/tools/ompi-server/ompi-server.c +++ b/ompi/tools/ompi-server/ompi-server.c @@ -41,9 +41,8 @@ #include "opal/event/event.h" #include "opal/mca/base/base.h" #include "opal/util/cmd_line.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "opal/util/printf.h" -#include "opal/util/show_help.h" #include "opal/util/argv.h" #include "opal/util/daemon_init.h" #include "opal/runtime/opal.h" @@ -119,7 +118,7 @@ int main(int argc, char *argv[]) argc, argv))) { char *args = NULL; args = opal_cmd_line_get_usage_msg(cmd_line); - opal_show_help("help-ompi-server.txt", "ompiserver:usage", false, + orte_show_help("help-ompi-server.txt", "ompiserver:usage", false, argv[0], args); free(args); return ret; @@ -129,7 +128,7 @@ int main(int argc, char *argv[]) if (help) { char *args = NULL; args = opal_cmd_line_get_usage_msg(cmd_line); - opal_show_help("help-ompi-server.txt", "ompiserver:usage", false, + orte_show_help("help-ompi-server.txt", "ompiserver:usage", false, argv[0], args); free(args); return 1; @@ -262,7 +261,7 @@ int main(int argc, char *argv[]) opal_progress_set_event_flag(OPAL_EVLOOP_ONCE); if (debug) { - opal_output(0, "%s ompi-server: up and running!", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME)); + orte_output(0, "%s ompi-server: up and running!", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME)); } /* wait to hear we are done */ @@ -282,7 +281,7 @@ static void shutdown_callback(int fd, short flags, void *arg) int ret; if (debug) { - opal_output(0, "%s ompi-server: finalizing", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME)); + orte_output(0, "%s ompi-server: finalizing", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME)); } /* Finalize and clean up ourselves */ diff --git a/ompi/tools/ompi_info/ompi_info.cc b/ompi/tools/ompi_info/ompi_info.cc index 2741a821d6..dfe428f684 100644 --- a/ompi/tools/ompi_info/ompi_info.cc +++ b/ompi/tools/ompi_info/ompi_info.cc @@ -41,10 +41,9 @@ #include "opal/class/opal_object.h" #include "opal/runtime/opal.h" #include "orte/runtime/runtime.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "opal/util/cmd_line.h" #include "opal/util/argv.h" -#include "opal/util/show_help.h" #include "ompi/communicator/communicator.h" #include "opal/mca/base/base.h" #include "ompi/tools/ompi_info/ompi_info.h" @@ -80,8 +79,8 @@ int main(int argc, char *argv[]) int i, len; // Initialize the argv parsing handle - if (OMPI_SUCCESS != opal_init_util()) { - opal_show_help("help-ompi_info.txt", "lib-call-fail", true, + if (OMPI_SUCCESS != orte_init(ORTE_TOOL)) { + orte_show_help("help-ompi_info.txt", "lib-call-fail", true, "opal_init_util", __FILE__, __LINE__, NULL); exit(ret); } @@ -89,7 +88,7 @@ int main(int argc, char *argv[]) cmd_line = OBJ_NEW(opal_cmd_line_t); if (NULL == cmd_line) { ret = errno; - opal_show_help("help-ompi_info.txt", "lib-call-fail", true, + orte_show_help("help-ompi_info.txt", "lib-call-fail", true, "opal_cmd_line_create", __FILE__, __LINE__, NULL); exit(ret); } @@ -137,7 +136,7 @@ int main(int argc, char *argv[]) // Get MCA parameters, if any */ if( OMPI_SUCCESS != mca_base_open() ) { - opal_show_help("help-ompi_info.txt", "lib-call-fail", true, "mca_base_open", __FILE__, __LINE__ ); + orte_show_help("help-ompi_info.txt", "lib-call-fail", true, "mca_base_open", __FILE__, __LINE__ ); exit(1); } mca_base_cmd_line_setup(cmd_line); @@ -154,7 +153,7 @@ int main(int argc, char *argv[]) } if (cmd_error || want_help) { char *usage = opal_cmd_line_get_usage_msg(cmd_line); - opal_show_help("help-ompi_info.txt", "usage", true, usage); + orte_show_help("help-ompi_info.txt", "usage", true, usage); free(usage); exit(cmd_error ? 1 : 0); } diff --git a/ompi/tools/ompi_info/param.cc b/ompi/tools/ompi_info/param.cc index 437f2bbca3..0bd147f3f1 100644 --- a/ompi/tools/ompi_info/param.cc +++ b/ompi/tools/ompi_info/param.cc @@ -37,7 +37,7 @@ #include "opal/mca/installdirs/installdirs.h" #include "opal/class/opal_value_array.h" #include "opal/util/printf.h" -#include "opal/util/show_help.h" +#include "orte/util/output.h" #include "opal/memoryhooks/memory.h" #include "opal/mca/base/mca_base_param.h" #include "ompi/tools/ompi_info/ompi_info.h" @@ -112,7 +112,7 @@ void ompi_info::do_params(bool want_all, bool want_internal) if (!found) { char *usage = opal_cmd_line_get_usage_msg(cmd_line); - opal_show_help("help-ompi_info.txt", "usage", true, usage); + orte_show_help("help-ompi_info.txt", "usage", true, usage); free(usage); exit(1); } @@ -285,7 +285,7 @@ void ompi_info::do_path(bool want_all, opal_cmd_line_t *cmd_line) show_path(path_sysconfdir, opal_install_dirs.sysconfdir); else { char *usage = opal_cmd_line_get_usage_msg(cmd_line); - opal_show_help("help-ompi_info.txt", "usage", true, usage); + orte_show_help("help-ompi_info.txt", "usage", true, usage); free(usage); exit(1); } diff --git a/opal/mca/filter/Makefile.am b/opal/mca/filter/Makefile.am new file mode 100644 index 0000000000..b287a494df --- /dev/null +++ b/opal/mca/filter/Makefile.am @@ -0,0 +1,41 @@ +# +# Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana +# University Research and Technology +# Corporation. All rights reserved. +# Copyright (c) 2004-2005 The University of Tennessee and The University +# of Tennessee Research Foundation. All rights +# reserved. +# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, +# University of Stuttgart. All rights reserved. +# Copyright (c) 2004-2005 The Regents of the University of California. +# All rights reserved. +# $COPYRIGHT$ +# +# Additional copyrights may follow +# +# $HEADER$ +# + +# main library setup +noinst_LTLIBRARIES = libmca_filter.la +libmca_filter_la_SOURCES = + +# header setup +nobase_opal_HEADERS = + +# local files +headers = filter.h +libmca_filter_la_SOURCES += $(headers) + +# Conditionally install the header files +if WANT_INSTALL_HEADERS +nobase_opal_HEADERS += $(headers) +opaldir = $(includedir)/openmpi/opal/mca/filter +else +opaldir = $(includedir) +endif + +include base/Makefile.am + +distclean-local: + rm -f base/static-components.h diff --git a/opal/mca/filter/base/Makefile.am b/opal/mca/filter/base/Makefile.am new file mode 100644 index 0000000000..5511f083a8 --- /dev/null +++ b/opal/mca/filter/base/Makefile.am @@ -0,0 +1,27 @@ +# +# Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana +# University Research and Technology +# Corporation. All rights reserved. +# Copyright (c) 2004-2005 The University of Tennessee and The University +# of Tennessee Research Foundation. All rights +# reserved. +# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, +# University of Stuttgart. All rights reserved. +# Copyright (c) 2004-2005 The Regents of the University of California. +# All rights reserved. +# $COPYRIGHT$ +# +# Additional copyrights may follow +# +# $HEADER$ +# + +headers += \ + base/base.h + +libmca_filter_la_SOURCES += \ + base/filter_base_open.c \ + base/filter_base_close.c \ + base/filter_base_select.c \ + base/filter_base_fns.c + diff --git a/opal/mca/filter/base/base.h b/opal/mca/filter/base/base.h new file mode 100644 index 0000000000..5f2f59e081 --- /dev/null +++ b/opal/mca/filter/base/base.h @@ -0,0 +1,75 @@ +/* + * Copyright (c) 2004-2008 The Trustees of Indiana University and Indiana + * University Research and Technology + * Corporation. All rights reserved. + * Copyright (c) 2004-2005 The University of Tennessee and The University + * of Tennessee Research Foundation. All rights + * reserved. + * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, + * University of Stuttgart. All rights reserved. + * Copyright (c) 2004-2005 The Regents of the University of California. + * All rights reserved. + * Copyright (c) 2007 Evergrid, Inc. All rights reserved. + * + * $COPYRIGHT$ + * + * Additional copyrights may follow + * + * $HEADER$ + */ +#ifndef OPAL_FILTER_BASE_H +#define OPAL_FILTER_BASE_H + +#include "opal_config.h" + +#include "opal/class/opal_list.h" + +#include "opal/mca/filter/filter.h" + +/* + * Global functions for MCA overall CRS + */ + +BEGIN_C_DECLS + +/** + * Initialize the FILTER MCA framework + * + * @retval OPAL_SUCCESS Upon success + * @retval OPAL_ERROR Upon failures + * + * This function is invoked during opal_init(); + */ +OPAL_DECLSPEC int opal_filter_base_open(void); + +/** + * Select an available component. + * + * @retval OPAL_SUCCESS Upon Success + * @retval OPAL_NOT_FOUND If no component can be selected + * @retval OPAL_ERROR Upon other failure + * + */ +OPAL_DECLSPEC int opal_filter_base_select(void); + +/** + * Finalize the FILTER MCA framework + * + * @retval OPAL_SUCCESS Upon success + * @retval OPAL_ERROR Upon failures + * + * This function is invoked during opal_finalize(); + */ +OPAL_DECLSPEC int opal_filter_base_close(void); + + +/**** No-op base functions ****/ +OPAL_DECLSPEC char* opal_filter_base_process(char *str, int major_id, int minor_id, int num_tags, char **tags); + +extern int opal_filter_base_output; +extern opal_list_t opal_filter_base_components_available; +extern opal_filter_base_component_t opal_filter_base_selected_component; + +END_C_DECLS + +#endif /* OPAL_FILTER_BASE_H */ diff --git a/opal/mca/filter/base/filter_base_close.c b/opal/mca/filter/base/filter_base_close.c new file mode 100644 index 0000000000..14099f53d0 --- /dev/null +++ b/opal/mca/filter/base/filter_base_close.c @@ -0,0 +1,38 @@ +/* + * Copyright (c) 2004-2007 The Trustees of Indiana University. + * All rights reserved. + * Copyright (c) 2004-2005 The Trustees of the University of Tennessee. + * All rights reserved. + * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, + * University of Stuttgart. All rights reserved. + * Copyright (c) 2004-2005 The Regents of the University of California. + * All rights reserved. + * $COPYRIGHT$ + * + * Additional copyrights may follow + * + * $HEADER$ + */ + +#include "opal_config.h" + +#include "opal/mca/mca.h" +#include "opal/mca/base/base.h" +#include "opal/include/opal/constants.h" +#include "opal/mca/filter/filter.h" +#include "opal/mca/filter/base/base.h" + +int opal_filter_base_close(void) +{ + /* Call the component's finalize routine */ + if( NULL != opal_filter.finalize ) { + opal_filter.finalize(); + } + + /* Close all available modules that are open */ + mca_base_components_close(opal_filter_base_output, + &opal_filter_base_components_available, + NULL); + + return OPAL_SUCCESS; +} diff --git a/opal/mca/filter/base/filter_base_fns.c b/opal/mca/filter/base/filter_base_fns.c new file mode 100644 index 0000000000..0e0652095d --- /dev/null +++ b/opal/mca/filter/base/filter_base_fns.c @@ -0,0 +1,28 @@ +/* + * Copyright (c) 2004-2008 The Trustees of Indiana University. + * All rights reserved. + * Copyright (c) 2004-2005 The Trustees of the University of Tennessee. + * All rights reserved. + * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, + * University of Stuttgart. All rights reserved. + * Copyright (c) 2004-2005 The Regents of the University of California. + * All rights reserved. + * Copyright (c) 2007 Evergrid, Inc. All rights reserved. + * + * $COPYRIGHT$ + * + * Additional copyrights may follow + * + * $HEADER$ + */ + +#include "opal_config.h" +#include "opal/include/opal/constants.h" + +#include "opal/mca/filter/filter.h" +#include "opal/mca/filter/base/base.h" + +char* opal_filter_base_process(char *str, int major_id, int minor_id, int num_tags, char **tags) +{ + return NULL; +} diff --git a/opal/mca/filter/base/filter_base_open.c b/opal/mca/filter/base/filter_base_open.c new file mode 100644 index 0000000000..76b2abdc9c --- /dev/null +++ b/opal/mca/filter/base/filter_base_open.c @@ -0,0 +1,63 @@ +/* + * Copyright (c) 2004-2007 The Trustees of Indiana University. + * All rights reserved. + * Copyright (c) 2004-2005 The Trustees of the University of Tennessee. + * All rights reserved. + * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, + * University of Stuttgart. All rights reserved. + * Copyright (c) 2004-2005 The Regents of the University of California. + * All rights reserved. + * Copyright (c) 2007 Evergrid, Inc. All rights reserved. + * + * $COPYRIGHT$ + * + * Additional copyrights may follow + * + * $HEADER$ + */ + +#include "opal_config.h" + +#include "opal/mca/mca.h" +#include "opal/mca/base/base.h" +#include "opal/include/opal/constants.h" +#include "opal/mca/filter/filter.h" +#include "opal/mca/filter/base/base.h" +#include "opal/util/output.h" + +#include "opal/mca/filter/base/static-components.h" + +/* + * Globals + */ +int opal_filter_base_output; +opal_filter_base_module_t opal_filter = { + NULL, + NULL, + opal_filter_base_process +}; + +opal_list_t opal_filter_base_components_available; +opal_filter_base_component_t opal_filter_base_selected_component; + +/** + * Function for finding and opening either all MCA components, + * or the one that was specifically requested via a MCA parameter. + */ +int opal_filter_base_open(void) +{ + opal_filter_base_output = opal_output_open(NULL); + + /* Open up all available components */ + if (OPAL_SUCCESS != + mca_base_components_open("filter", + opal_filter_base_output, + mca_filter_base_static_components, + &opal_filter_base_components_available, + true)) { + return OPAL_ERROR; + } + + + return OPAL_SUCCESS; +} diff --git a/opal/mca/filter/base/filter_base_select.c b/opal/mca/filter/base/filter_base_select.c new file mode 100644 index 0000000000..628a320d6d --- /dev/null +++ b/opal/mca/filter/base/filter_base_select.c @@ -0,0 +1,61 @@ +/* + * Copyright (c) 2004-2008 The Trustees of Indiana University. + * All rights reserved. + * Copyright (c) 2004-2005 The Trustees of the University of Tennessee. + * All rights reserved. + * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, + * University of Stuttgart. All rights reserved. + * Copyright (c) 2004-2005 The Regents of the University of California. + * All rights reserved. + * Copyright (c) 2007 Evergrid, Inc. All rights reserved. + * + * $COPYRIGHT$ + * + * Additional copyrights may follow + * + * $HEADER$ + */ + +#include "opal_config.h" + +#include "unistd.h" + +#include "opal/include/opal/constants.h" +#include "opal/util/output.h" +#include "opal/mca/mca.h" +#include "opal/mca/base/base.h" +#include "opal/mca/base/mca_base_param.h" + +#include "opal/mca/filter/filter.h" +#include "opal/mca/filter/base/base.h" + +int opal_filter_base_select(void) +{ + int exit_status = OPAL_SUCCESS; + opal_filter_base_component_t *best_component = NULL; + opal_filter_base_module_t *best_module = NULL; + + /* + * Select the best component - it is okay if there are NO + * components in this framework! + */ + if( OPAL_SUCCESS == mca_base_select("filter", opal_filter_base_output, + &opal_filter_base_components_available, + (mca_base_module_t **) &best_module, + (mca_base_component_t **) &best_component)) { + /* Save the winner - otherwise, we will just use the + * default module defined in opal_filter_base_open + */ + opal_filter_base_selected_component = *best_component; + opal_filter = *best_module; + } + + /* Initialize the module */ + if (NULL != opal_filter.init) { + if (OPAL_SUCCESS != opal_filter.init()) { + exit_status = OPAL_ERROR; + } + } + + return exit_status; +} diff --git a/opal/mca/filter/filter.h b/opal/mca/filter/filter.h new file mode 100644 index 0000000000..6727dfde6e --- /dev/null +++ b/opal/mca/filter/filter.h @@ -0,0 +1,100 @@ +/* + * Copyright (c) 2004-2008 The Trustees of Indiana University and Indiana + * University Research and Technology + * Corporation. All rights reserved. + * Copyright (c) 2004-2005 The University of Tennessee and The University + * of Tennessee Research Foundation. All rights + * reserved. + * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, + * University of Stuttgart. All rights reserved. + * Copyright (c) 2004-2005 The Regents of the University of California. + * All rights reserved. + * Copyright (c) 2007 Evergrid, Inc. All rights reserved. + * + * $COPYRIGHT$ + * + * Additional copyrights may follow + * + * $HEADER$ + */ +/** + * @file + * + * Filter output to format it for specific purposes + * such as XML or just do a no-op! + */ + +#ifndef MCA_FILTER_H +#define MCA_FILTER_H + +#include "opal_config.h" +#include "opal/mca/mca.h" +#include "opal/mca/base/base.h" +#include "opal/class/opal_object.h" + +BEGIN_C_DECLS + + +/** + * Module initialization function. + * Returns OPAL_SUCCESS + */ +typedef int (*opal_filter_base_module_init_fn_t)(void); + +/** + * Module finalization function. + * Returns OPAL_SUCCESS + */ +typedef int (*opal_filter_base_module_finalize_fn_t)(void); + +/** + * Process a string through the selected filter - returns + * filtered string that can be free'd by caller, or returns + * NULL if no filtering was done + */ +typedef char* (*opal_filter_base_module_process_fn_t)(char *str, int major_id, int minor_id, int num_tags, char **tags); + + +/** + * Structure for FILTER v1.0.0 components. + */ +struct opal_filter_base_component_1_0_0_t { + /** MCA base component */ + mca_base_component_t base_version; + /** MCA base data */ + mca_base_component_data_1_0_0_t base_data; +}; +typedef struct opal_filter_base_component_1_0_0_t opal_filter_base_component_1_0_0_t; +typedef struct opal_filter_base_component_1_0_0_t opal_filter_base_component_t; + +/** + * Structure for FILTER v1.0.0 modules + */ +struct opal_filter_base_module_1_0_0_t { + /** Initialization Function */ + opal_filter_base_module_init_fn_t init; + /** Finalization Function */ + opal_filter_base_module_finalize_fn_t finalize; + + /** Filter processing interface */ + opal_filter_base_module_process_fn_t process; + +}; +typedef struct opal_filter_base_module_1_0_0_t opal_filter_base_module_1_0_0_t; +typedef struct opal_filter_base_module_1_0_0_t opal_filter_base_module_t; + +OPAL_DECLSPEC extern opal_filter_base_module_t opal_filter; + +/** + * Macro for use in components that are of type FILTER v1.0.0 + */ +#define OPAL_FILTER_BASE_VERSION_1_0_0 \ + /* FILTER v1.0 is chained to MCA v1.0 */ \ + MCA_BASE_VERSION_1_0_0, \ + /* FILTER v1.0 */ \ + "filter", 1, 0, 0 + +END_C_DECLS + +#endif /* OPAL_FILTER_H */ + diff --git a/opal/mca/filter/xml/Makefile.am b/opal/mca/filter/xml/Makefile.am new file mode 100644 index 0000000000..d45252077d --- /dev/null +++ b/opal/mca/filter/xml/Makefile.am @@ -0,0 +1,47 @@ +# +# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana +# University Research and Technology +# Corporation. All rights reserved. +# Copyright (c) 2004-2005 The University of Tennessee and The University +# of Tennessee Research Foundation. All rights +# reserved. +# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, +# University of Stuttgart. All rights reserved. +# Copyright (c) 2004-2005 The Regents of the University of California. +# All rights reserved. +# $COPYRIGHT$ +# +# Additional copyrights may follow +# +# $HEADER$ +# + +AM_CPPFLAGS = $(filter_xml_CPPFLAGS) + +sources = \ + filter_xml.h \ + filter_xml_component.c \ + filter_xml_module.c + +# Make the output library in this directory, and name it either +# mca__.la (for DSO builds) or libmca__.la +# (for static builds). + +if OMPI_BUILD_filter_xml_DSO +component_noinst = +component_install = mca_filter_xml.la +else +component_noinst = libmca_filter_xml.la +component_install = +endif + +mcacomponentdir = $(pkglibdir) +mcacomponent_LTLIBRARIES = $(component_install) +mca_filter_xml_la_SOURCES = $(sources) +mca_filter_xml_la_LDFLAGS = -module -avoid-version $(filter_xml_LDFLAGS) +mca_filter_xml_la_LIBADD = $(filter_xml_LIBS) + +noinst_LTLIBRARIES = $(component_noinst) +libmca_filter_xml_la_SOURCES =$(sources) +libmca_filter_xml_la_LIBADD = $(filter_xml_LIBS) +libmca_filter_xml_la_LDFLAGS = -module -avoid-version $(filter_xml_LDFLAGS) diff --git a/opal/mca/filter/xml/configure.params b/opal/mca/filter/xml/configure.params new file mode 100644 index 0000000000..8fc44480a6 --- /dev/null +++ b/opal/mca/filter/xml/configure.params @@ -0,0 +1,22 @@ +# -*- shell-script -*- +# +# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana +# University Research and Technology +# Corporation. All rights reserved. +# Copyright (c) 2004-2005 The University of Tennessee and The University +# of Tennessee Research Foundation. All rights +# reserved. +# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, +# University of Stuttgart. All rights reserved. +# Copyright (c) 2004-2005 The Regents of the University of California. +# All rights reserved. +# Copyright (c) 2007 Los Alamos National Security, LLC. All rights +# reserved. +# $COPYRIGHT$ +# +# Additional copyrights may follow +# +# $HEADER$ +# + +PARAM_CONFIG_FILES="Makefile" diff --git a/opal/mca/filter/xml/filter_xml.h b/opal/mca/filter/xml/filter_xml.h new file mode 100644 index 0000000000..3797c37b2f --- /dev/null +++ b/opal/mca/filter/xml/filter_xml.h @@ -0,0 +1,46 @@ +/* + * Copyright (c) 2004-2008 The Trustees of Indiana University and Indiana + * University Research and Technology + * Corporation. All rights reserved. + * Copyright (c) 2004-2005 The University of Tennessee and The University + * of Tennessee Research Foundation. All rights + * reserved. + * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, + * University of Stuttgart. All rights reserved. + * Copyright (c) 2004-2005 The Regents of the University of California. + * All rights reserved. + * $COPYRIGHT$ + * + * Additional copyrights may follow + * + * $HEADER$ + */ + +/** + * @file + * + * Processor affinity for libnuma. + */ + + +#ifndef MCA_FILTER_XML_H +#define MCA_FILTER_XML_H + +#include "opal_config.h" + +#include "opal/mca/mca.h" +#include "opal/mca/filter/filter.h" + + +BEGIN_C_DECLS + +/** + * Globally exported variable + */ +OPAL_DECLSPEC extern const opal_filter_base_component_t mca_filter_xml_component; + +OPAL_DECLSPEC extern opal_filter_base_module_t opal_filter_xml_module; + +END_C_DECLS + +#endif /* MCA_FILTER_XML_H */ diff --git a/opal/mca/filter/xml/filter_xml_component.c b/opal/mca/filter/xml/filter_xml_component.c new file mode 100644 index 0000000000..07e42a31b7 --- /dev/null +++ b/opal/mca/filter/xml/filter_xml_component.c @@ -0,0 +1,116 @@ +/* + * Copyright (c) 2004-2008 The Trustees of Indiana University and Indiana + * University Research and Technology + * Corporation. All rights reserved. + * Copyright (c) 2004-2005 The University of Tennessee and The University + * of Tennessee Research Foundation. All rights + * reserved. + * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, + * University of Stuttgart. All rights reserved. + * Copyright (c) 2004-2005 The Regents of the University of California. + * All rights reserved. + * $COPYRIGHT$ + * + * Additional copyrights may follow + * + * $HEADER$ + */ + +#include "opal_config.h" + +#include "opal/constants.h" + +#include "opal/mca/base/mca_base_param.h" + +#include "opal/mca/filter/filter.h" +#include "filter_xml.h" + +/* + * Public string showing the filter ompi_filter component version number + */ +const char *opal_filter_xml_component_version_string = + "OPAL filter xml MCA component version " OPAL_VERSION; + +/* + * Local function + */ +static int xml_open(void); +static int xml_component_query(mca_base_module_t **module, int *priority); + +/* + * Instantiate the public struct with all of our public information + * and pointers to our public functions in it + */ + +const opal_filter_base_component_t mca_filter_xml_component = { + + /* First, the mca_component_t struct containing meta information + about the component itself */ + + { + /* Indicate that we are a filter v1.0.0 component (which also + implies a specific MCA version) */ + + OPAL_FILTER_BASE_VERSION_1_0_0, + + /* Component name and version */ + + "xml", + OPAL_MAJOR_VERSION, + OPAL_MINOR_VERSION, + OPAL_RELEASE_VERSION, + + /* Component open and close functions */ + + xml_open, + NULL, + xml_component_query + }, + + /* Next the MCA v1.0.0 component meta data */ + + { + /* The component is checkpoint ready */ + MCA_BASE_METADATA_PARAM_CHECKPOINT + } +}; + + +static int xml_open(void) +{ + return OPAL_SUCCESS; +} + +int xml_component_query(mca_base_module_t **module, int *priority) +{ + int index; + char *param; + + /* we can't currently handle this framework correctly, so we have + * to "hack" this to ensure this component is only selected + * when the user specifically requests it + */ + + index = mca_base_param_find("filter", NULL, NULL); + if (0 > index) { + /* wasn't specified - we can't be selected */ + *module = NULL; + *priority = -1; + return OPAL_SUCCESS; + } + + /* see if it was us */ + mca_base_param_lookup_string(index, ¶m); + if (NULL == param || 0 != strcmp(param, "xml")) { + /* not us */ + *module = NULL; + *priority = -1; + return OPAL_SUCCESS; + } + + /* was us! */ + *priority = 100; /* only selectable upon demand */ + *module = (mca_base_module_t *)&opal_filter_xml_module; + + return OPAL_SUCCESS; +} diff --git a/opal/mca/filter/xml/filter_xml_module.c b/opal/mca/filter/xml/filter_xml_module.c new file mode 100644 index 0000000000..2355c972e9 --- /dev/null +++ b/opal/mca/filter/xml/filter_xml_module.c @@ -0,0 +1,99 @@ +/* + * Copyright (c) 2004-2008 The Trustees of Indiana University and Indiana + * University Research and Technology + * Corporation. All rights reserved. + * Copyright (c) 2004-2005 The University of Tennessee and The University + * of Tennessee Research Foundation. All rights + * reserved. + * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, + * University of Stuttgart. All rights reserved. + * Copyright (c) 2004-2005 The Regents of the University of California. + * All rights reserved. + * $COPYRIGHT$ + * + * Additional copyrights may follow + * + * $HEADER$ + */ + +#include "opal_config.h" + +#include +#include + +#include "opal/constants.h" + +#include "opal/util/printf.h" + +#include "filter_xml.h" + + +/* + * Local functions + */ +static int xml_init(void); +static int xml_finalize(void); +static char* xml_process(char *str, int major_id, int minor_id, int num_tags, char **tags); + +/* + * module + */ +opal_filter_base_module_t opal_filter_xml_module = { + /* Initialization function */ + xml_init, + /* Finalize function */ + xml_finalize, + /* Process function */ + xml_process +}; + +static int xml_init(void) +{ + return OPAL_SUCCESS; +} + +static int xml_finalize(void) +{ + return OPAL_SUCCESS; +} + +static char* xml_process(char *str, int major_id, int minor_id, int num_tags, char **tags) +{ + char *tmp, *tmp2; + int i, len; + uint16_t major_up, major_dn; + + /* strip trailing newlines from the data */ + len = strlen(str)-1; + if (str[len] == '\n' || str[len] == '\r') { + str[len] = '\0'; + } + + /* convert internal newlines */ + for (i=0; i < len; i++) { + if (str[i] == '\n' || str[i] == '\r') { + str[i] = ';'; + } + } + + /* convert major-id */ + major_up = (0xffff0000 & major_id) >> 16; + major_dn = 0x0000ffff & major_id; + + tmp = NULL; + if (1 < num_tags) { + asprintf(&tmp, " | %s", (NULL == tags[1]) ? "UNKNOWN" : tags[1]); + for (i=2; i < num_tags; i++) { + asprintf(&tmp2, "%s | %s", tmp, (NULL == tags[i]) ? "UNKNOWN" : tags[i]); + free(tmp); + tmp = tmp2; + } + } + + asprintf(&tmp2, "", + major_up, major_dn, minor_id, + (NULL == tags[0]) ? "UNKNOWN" : tags[0], + (NULL == tmp) ? "" : tmp, str); + + return tmp2; +} diff --git a/opal/runtime/opal_finalize.c b/opal/runtime/opal_finalize.c index 0bb29fcf5b..066ddb5d17 100644 --- a/opal/runtime/opal_finalize.c +++ b/opal/runtime/opal_finalize.c @@ -9,6 +9,7 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. + * Copyright (c) 2008 Cisco Systems, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -28,6 +29,7 @@ #include "opal/util/if.h" #include "opal/util/net.h" #include "opal/util/keyval_parse.h" +#include "opal/util/show_help.h" #include "opal/memoryhooks/memory.h" #include "opal/mca/base/base.h" #include "opal/runtime/opal.h" @@ -38,6 +40,7 @@ #include "opal/mca/backtrace/base/base.h" #include "opal/mca/timer/base/base.h" #include "opal/mca/paffinity/base/base.h" +#include "opal/mca/filter/base/base.h" #include "opal/event/event.h" #include "opal/runtime/opal_progress.h" #include "opal/mca/carto/base/base.h" @@ -78,6 +81,9 @@ opal_finalize_util(void) /* finalize the trace system */ opal_trace_finalize(); + /* finalize the show_help system */ + opal_show_help_finalize(); + /* finalize the output system. This has to come *after* the malloc code, as the malloc code needs to call into this, but the malloc code turning off doesn't affect opal_output that @@ -132,6 +138,9 @@ opal_finalize(void) /* close the processor affinity base */ opal_paffinity_base_close(); + /* finalize the filter system */ + opal_filter_base_close(); + /* close the memcpy base */ opal_memcpy_base_close(); diff --git a/opal/runtime/opal_init.c b/opal/runtime/opal_init.c index b49e7e7641..6e8c46ac71 100644 --- a/opal/runtime/opal_init.c +++ b/opal/runtime/opal_init.c @@ -36,6 +36,7 @@ #include "opal/mca/paffinity/base/base.h" #include "opal/mca/timer/base/base.h" #include "opal/mca/memchecker/base/base.h" +#include "opal/mca/filter/base/base.h" #include "opal/dss/dss.h" #include "opal/mca/carto/base/base.h" @@ -192,6 +193,9 @@ opal_init_util(void) /* initialize the output system */ opal_output_init(); + /* initialize the help system */ + opal_show_help_init(); + /* register handler for errnum -> string converstion */ if (OPAL_SUCCESS != (ret = opal_error_register("OPAL", @@ -285,6 +289,16 @@ opal_init(void) goto return_error; } + /* initialize the filter system */ + if (OPAL_SUCCESS != (ret = opal_filter_base_open())) { + error = "opal_filter_open"; + goto return_error; + } + if (OPAL_SUCCESS != (ret = opal_filter_base_select())) { + error = "opal_filter_select"; + goto return_error; + } + /* open the processor affinity base */ opal_paffinity_base_open(); opal_paffinity_base_select(); diff --git a/opal/tools/wrappers/help-opal-wrapper.txt b/opal/tools/wrappers/help-opal-wrapper.txt index 22316dd5be..6c63502a5b 100644 --- a/opal/tools/wrappers/help-opal-wrapper.txt +++ b/opal/tools/wrappers/help-opal-wrapper.txt @@ -24,7 +24,7 @@ [no-language-support] Unfortunately, this installation of Open MPI was not compiled with %s support. As such, the %s compiler is non-functional. - +# [no-profiling-support] warning: "-lpmpi" was included on the command line indicating use of MPI warning: profiling layer. However, Open MPI was not compiled with support @@ -35,10 +35,10 @@ The Open MPI wrapper compiler was unable to find the specified compiler Note that this compiler was either specified at configure time or in one of several possible environment variables. - +# [version] %s: %s %s (Language: %s) - +# [usage] %s [-showme[:]] args @@ -50,19 +50,19 @@ one of several possible environment variables. -showme:libdirs Show list of library dirs added when linking -showme:libs Show list of libraries added when linking -showme:version Show version of %s - +# [file-not-found] %s could not find the file %s, needed for %s support. This may indicate an incomplete install and linking will likely fail. - +# [spawn-failed] Unable to call the compiler (%s). The failure return the error %s. The failed command was [%s]. - +# [compiler-failed] The child process (%s) exit with error %d. The failed command was [%s]. - +# [multiple-bit-flags] %s: options -32 and -64 must be used independently diff --git a/opal/util/output.c b/opal/util/output.c index f5a946a6e7..b0201f7cb1 100644 --- a/opal/util/output.c +++ b/opal/util/output.c @@ -9,7 +9,7 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2006 The Regents of the University of California. * All rights reserved. - * Copyright (c) 2007 Cisco, Inc. All rights reserved. + * Copyright (c) 2007-2008 Cisco, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -48,22 +48,11 @@ static char *output_dir = NULL; static char *output_prefix = NULL; -/* - * Private functions - */ -static void construct(opal_object_t *stream); -static int do_open(int output_id, opal_output_stream_t * lds); -static int open_file(int i); -static void free_descriptor(int output_id); -static void output(int output_id, const char *format, va_list arglist); - - /* * Internal data structures and helpers for the generalized output * stream mechanism. */ -struct output_desc_t -{ +typedef struct { bool ldi_used; bool ldi_enabled; int ldi_verbose_level; @@ -87,8 +76,21 @@ struct output_desc_t char *ldi_file_suffix; int ldi_fd; int ldi_file_num_lines_lost; -}; -typedef struct output_desc_t output_desc_t; + + int ldi_filter_flags; +} output_desc_t; + +/* + * Private functions + */ +static void construct(opal_object_t *stream); +static int do_open(int output_id, opal_output_stream_t * lds); +static int open_file(int i); +static void free_descriptor(int output_id); +static int make_string(char **no_newline_string, output_desc_t *ldi, + const char *format, va_list arglist); +static int output(int output_id, const char *format, va_list arglist); + #define OPAL_OUTPUT_MAX_STREAMS 32 #if defined(__WINDOWS__) || defined(HAVE_SYSLOG) @@ -143,6 +145,8 @@ bool opal_output_init(void) info[i].ldi_file_want_append = false; info[i].ldi_fd = -1; info[i].ldi_file_num_lines_lost = 0; + info[i].ldi_filter_flags = + OPAL_OUTPUT_FILTER_STDOUT | OPAL_OUTPUT_FILTER_STDERR; } /* Initialize the mutex that protects the output */ @@ -237,6 +241,7 @@ void opal_output_reopen_all(void) /* open all streams in append mode */ lds.lds_want_file_append = true; lds.lds_file_suffix = info[i].ldi_file_suffix; + lds.lds_filter_flags = info[i].ldi_filter_flags; /* * call opal_output_open to open the stream. The return value @@ -327,6 +332,63 @@ void opal_output_verbose(int level, int output_id, const char *format, ...) } +/* + * Send a message to a stream if the verbose level is high enough + */ +void opal_output_vverbose(int level, int output_id, const char *format, + va_list arglist) +{ + if (output_id >= 0 && output_id < OPAL_OUTPUT_MAX_STREAMS && + info[output_id].ldi_verbose_level >= level) { + output(output_id, format, arglist); + } +} + + +/* + * Send a message to a string if the verbose level is high enough + */ +char *opal_output_string(int level, int output_id, const char *format, ...) +{ + int rc; + char *ret = NULL; + + if (output_id >= 0 && output_id < OPAL_OUTPUT_MAX_STREAMS && + info[output_id].ldi_verbose_level >= level) { + va_list arglist; + va_start(arglist, format); + rc = make_string(&ret, &info[output_id], format, arglist); + va_end(arglist); + if (OPAL_SUCCESS != rc) { + ret = NULL; + } + } + + return ret; +} + + +/* + * Send a message to a string if the verbose level is high enough + */ +char *opal_output_vstring(int level, int output_id, const char *format, + va_list arglist) +{ + int rc; + char *ret = NULL; + + if (output_id >= 0 && output_id < OPAL_OUTPUT_MAX_STREAMS && + info[output_id].ldi_verbose_level >= level) { + rc = make_string(&ret, &info[output_id], format, arglist); + if (OPAL_SUCCESS != rc) { + ret = NULL; + } + } + + return ret; +} + + /* * Set the verbosity level of a stream */ @@ -405,6 +467,8 @@ static void construct(opal_object_t *obj) stream->lds_want_file = false; stream->lds_want_file_append = false; stream->lds_file_suffix = NULL; + stream->lds_filter_flags = + OPAL_OUTPUT_FILTER_STDOUT | OPAL_OUTPUT_FILTER_STDERR; } /* @@ -508,6 +572,8 @@ static int do_open(int output_id, opal_output_stream_t * lds) info[i].ldi_file_want_append = lds->lds_want_file_append; info[i].ldi_file_num_lines_lost = 0; + info[i].ldi_filter_flags = lds->lds_filter_flags; + /* Don't open a file in the session directory now -- do that lazily * so that if there's no output, we don't have an empty file */ @@ -607,16 +673,61 @@ static void free_descriptor(int output_id) } +static int make_string(char **no_newline_string, output_desc_t *ldi, + const char *format, va_list arglist) +{ + size_t len, total_len; + bool want_newline = false; + + /* Make the formatted string */ + + vasprintf(no_newline_string, format, arglist); + total_len = len = strlen(*no_newline_string); + if ('\n' != (*no_newline_string)[len - 1]) { + want_newline = true; + ++total_len; + } + if (NULL != ldi->ldi_prefix) { + total_len += strlen(ldi->ldi_prefix); + } + if (temp_str_len < total_len + want_newline) { + if (NULL != temp_str) { + free(temp_str); + } + temp_str = (char *) malloc(total_len * 2); + if (NULL == temp_str) { + return OPAL_ERR_OUT_OF_RESOURCE; + } + temp_str_len = total_len * 2; + } + if (NULL != ldi->ldi_prefix) { + if (want_newline) { + snprintf(temp_str, temp_str_len, "%s%s\n", ldi->ldi_prefix, + *no_newline_string); + } else { + snprintf(temp_str, temp_str_len, "%s%s", ldi->ldi_prefix, + *no_newline_string); + } + } else { + if (want_newline) { + snprintf(temp_str, temp_str_len, "%s\n", *no_newline_string); + } else { + snprintf(temp_str, temp_str_len, "%s", *no_newline_string); + } + } + + return OPAL_SUCCESS; +} + /* * Do the actual output. Take a va_list so that we can be called from * multiple different places, even functions that took "..." as input * arguments. */ -static void output(int output_id, const char *format, va_list arglist) +static int output(int output_id, const char *format, va_list arglist) { - size_t len, total_len; - bool want_newline = false; - char *str; + int rc = OPAL_SUCCESS; + char *str, *out = NULL; output_desc_t *ldi; /* Setup */ @@ -629,60 +740,63 @@ static void output(int output_id, const char *format, va_list arglist) if (output_id >= 0 && output_id < OPAL_OUTPUT_MAX_STREAMS && info[output_id].ldi_used && info[output_id].ldi_enabled) { + OPAL_THREAD_LOCK(&mutex); ldi = &info[output_id]; - /* Make the formatted string */ - - OPAL_THREAD_LOCK(&mutex); - vasprintf(&str, format, arglist); - total_len = len = strlen(str); - if ('\n' != str[len - 1]) { - want_newline = true; - ++total_len; - } - if (NULL != ldi->ldi_prefix) { - total_len += strlen(ldi->ldi_prefix); - } - if (temp_str_len < total_len + want_newline) { - if (NULL != temp_str) { - free(temp_str); - } - temp_str = (char *) malloc(total_len * 2); - temp_str_len = total_len * 2; - } - if (NULL != ldi->ldi_prefix) { - if (want_newline) { - snprintf(temp_str, temp_str_len, "%s%s\n", ldi->ldi_prefix, - str); - } else { - snprintf(temp_str, temp_str_len, "%s%s", ldi->ldi_prefix, - str); - } - } else { - if (want_newline) { - snprintf(temp_str, temp_str_len, "%s\n", str); - } else { - snprintf(temp_str, temp_str_len, "%s", str); - } + /* Make the strings */ + if (OPAL_SUCCESS != (rc = make_string(&str, ldi, format, arglist))) { + OPAL_THREAD_UNLOCK(&mutex); + return rc; } - /* Syslog output */ - + /* Syslog output -- does not use the newline-appended string */ #if defined(HAVE_SYSLOG) if (ldi->ldi_syslog) { - syslog(ldi->ldi_syslog_priority, "%s", str); + char *out = str; + if (ldi->ldi_filter_flags & OPAL_OUTPUT_FILTER_SYSLOG) { +#if 0 + /* JMS call the filter, perhaps like this */ + out = filter(str); + if (NULL == out) { + out = str; + } +#endif + } + syslog(ldi->ldi_syslog_priority, "%s", str); + if (out != str) { + free(out); + } } #endif + /* All others (stdout, stderr, file) use temp_str, potentially + with a newline appended */ + + out = temp_str; + if ((ldi->ldi_stdout && + ldi->ldi_filter_flags & OPAL_OUTPUT_FILTER_STDOUT) || + (ldi->ldi_stderr && + ldi->ldi_filter_flags & OPAL_OUTPUT_FILTER_STDERR) || + (ldi->ldi_file && + ldi->ldi_filter_flags & OPAL_OUTPUT_FILTER_FILE)) { +#if 0 + /* JMS call the filter, perhaps like this */ + out = filter(temp_str); + if (NULL == out) { + out = temp_str; + } +#endif + } + /* stdout output */ if (ldi->ldi_stdout) { - write(fileno(stdout), temp_str, (int)strlen(temp_str)); + write(fileno(stdout), out, (int)strlen(out)); fflush(stdout); } /* stderr output */ if (ldi->ldi_stderr) { - write(fileno(stderr),temp_str, (int)strlen(temp_str)); + write(fileno(stderr), out, (int)strlen(out)); fflush(stderr); } @@ -697,22 +811,36 @@ static void output(int output_id, const char *format, va_list arglist) ++ldi->ldi_file_num_lines_lost; } else if (ldi->ldi_file_num_lines_lost > 0) { char buffer[BUFSIZ]; + char *out = buffer; memset(buffer, 0, BUFSIZ); snprintf(buffer, BUFSIZ - 1, "[WARNING: %d lines lost because the Open MPI process session directory did\n not exist when opal_output() was invoked]\n", ldi->ldi_file_num_lines_lost); + if (ldi->ldi_filter_flags & OPAL_OUTPUT_FILTER_FILE) { +#if 0 + /* JMS call the filter */ + out = filter(buffer); + if (NULL == out) { + out = buffer; + } +#endif + } write(ldi->ldi_fd, buffer, (int)strlen(buffer)); ldi->ldi_file_num_lines_lost = 0; + if (out != buffer) { + free(out); + } } } if (ldi->ldi_fd != -1) { - write(ldi->ldi_fd, temp_str, (int)total_len); + write(ldi->ldi_fd, out, (int)strlen(out)); } } OPAL_THREAD_UNLOCK(&mutex); - free(str); } + + return rc; } int opal_output_get_verbosity(int output_id) diff --git a/opal/util/output.h b/opal/util/output.h index 4db29b903f..1efb297054 100644 --- a/opal/util/output.h +++ b/opal/util/output.h @@ -9,7 +9,7 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. - * Copyright (c) 2007 Cisco, Inc. All rights reserved. + * Copyright (c) 2007-2008 Cisco, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -80,6 +80,15 @@ BEGIN_C_DECLS +/** Flag to filter syslog output */ +#define OPAL_OUTPUT_FILTER_SYSLOG 0x01 +/** Flag to filter stdout output */ +#define OPAL_OUTPUT_FILTER_STDOUT 0x02 +/** Flag to filter stderr output */ +#define OPAL_OUTPUT_FILTER_STDERR 0x04 +/** Flag to filter file output */ +#define OPAL_OUTPUT_FILTER_FILE 0x08 + /** * \class opal_output_stream_t * @@ -214,6 +223,16 @@ struct opal_output_stream_t { * for details on what happens in this situation. */ char *lds_file_suffix; + + /** + * What outputs do we want passed through the filter first? + * + * Bit field indicating which of syslog, stdout, stderr, and file + * you want passed through the filter before sending to the + * output. Default is stdout, stderr filtered; syslog and file + * are not filtered. + */ + int lds_filter_flags; }; /** @@ -383,7 +402,36 @@ struct opal_output_stream_t { */ OPAL_DECLSPEC void opal_output_verbose(int verbose_level, int output_id, const char *format, ...) __opal_attribute_format__(__printf__, 3, 4); - + + /** + * Same as opal_output_verbose(), but takes a va_list form of varargs. + */ + OPAL_DECLSPEC void opal_output_vverbose(int verbose_level, int output_id, + const char *format, va_list ap); + + /** + * Send output to a string if the verbosity level is high enough. + * + * @param output_id Stream id returned from opal_output_open(). + * @param level Target verbosity level. + * @param format printf-style format string. + * @param varargs printf-style varargs list to fill the string + * specified by the format parameter. + * + * Exactly the same as opal_output_verbose(), except the output it + * sent to a string instead of to the stream. If the verbose + * level is not high enough, NULL is returned. The caller is + * responsible for free()'ing the returned string. + */ + OPAL_DECLSPEC char *opal_output_string(int verbose_level, int output_id, + const char *format, ...) __opal_attribute_format__(__printf__, 3, 4); + + /** + * Same as opal_output_string, but accepts a va_list form of varargs. + */ + OPAL_DECLSPEC char *opal_output_vstring(int verbose_level, int output_id, + const char *format, va_list ap); + /** * Set the verbosity level for a stream. * diff --git a/opal/util/show_help.c b/opal/util/show_help.c index 3f8e6dee5a..0d20f10121 100644 --- a/opal/util/show_help.c +++ b/opal/util/show_help.c @@ -9,6 +9,7 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. + * Copyright (c) 2008 Cisco Systems, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -28,16 +29,9 @@ #include "opal/util/printf.h" #include "opal/util/argv.h" #include "opal/util/os_path.h" +#include "opal/util/output.h" #include "opal/constants.h" -static int open_file(const char *base, const char *topic); -static int find_topic(const char *base, const char *topic); -static int read_message(char ***lines); -static int output(bool want_error_header, char **lines, - const char *base, const char *topic, - va_list arglist); -static int destroy_message(char **lines); - /* * Private variables @@ -48,37 +42,74 @@ static const char *default_language = "C"; #endif static const char *default_filename = "help-messages"; static const char *dash_line = "--------------------------------------------------------------------------\n"; +static int output_stream = -1; -int opal_show_help(const char *filename, const char *topic, - bool want_error_header, ...) +int opal_show_help_init(void) { - int ret; - va_list arglist; - char **array = NULL; + opal_output_stream_t lds; - if (OPAL_SUCCESS != (ret = open_file(filename, topic))) { - return ret; - } - if (OPAL_SUCCESS != (ret = find_topic(filename, topic))) { - fclose(opal_show_help_yyin); - return ret; + OBJ_CONSTRUCT(&lds, opal_output_stream_t); + lds.lds_want_stderr = true; + output_stream = opal_output_open(&lds); + + return OPAL_SUCCESS; +} + +int opal_show_help_finalize(void) +{ + opal_output_close(output_stream); + output_stream = -1; + return OPAL_SUCCESS; +} + +/* + * Make one big string with all the lines. This isn't the most + * efficient method in the world, but we're going for clarity here -- + * not optimization. :-) + */ +static int array2string(char **outstring, + bool want_error_header, char **lines) +{ + int i, count; + size_t len; + + /* See how much space we need */ + + len = want_error_header ? 2 * strlen(dash_line) : 0; + count = opal_argv_count(lines); + for (i = 0; i < count; ++i) { + if (NULL == lines[i]) { + break; + } + len += strlen(lines[i]) + 1; } - ret = read_message(&array); - opal_show_help_finish_parsing(); - fclose(opal_show_help_yyin); - if (OPAL_SUCCESS != ret) { - destroy_message(array); - return ret; + /* Malloc it out */ + + (*outstring) = (char*) malloc(len + 1); + if (NULL == *outstring) { + return OPAL_ERR_OUT_OF_RESOURCE; } - va_start(arglist, want_error_header); - output(want_error_header, array, filename, topic, arglist); - va_end(arglist); + /* Fill the big string */ - destroy_message(array); - return ret; + *(*outstring) = '\0'; + if (want_error_header) { + strcat(*outstring, dash_line); + } + for (i = 0; i < count; ++i) { + if (NULL == lines[i]) { + break; + } + strcat(*outstring, lines[i]); + strcat(*outstring, "\n"); + } + if (want_error_header) { + strcat(*outstring, dash_line); + } + + return OPAL_SUCCESS; } @@ -145,10 +176,7 @@ static int open_file(const char *base, const char *topic) /* If we still couldn't open it, then something is wrong */ if (NULL == opal_show_help_yyin) { - fprintf(stderr, dash_line); - fprintf(stderr, "Sorry! You were supposed to get help about:\n %s\nfrom the file:\n %s\n", topic, base); - fprintf(stderr, "But I couldn't find any file matching that name. Sorry!\n"); - fprintf(stderr, dash_line); + opal_output(output_stream, "%sSorry! You were supposed to get help about:\n %s\nfrom the file:\n %s\nBut I couldn't find any file matching that name. Sorry!\n%s", dash_line, topic, base, dash_line); return OPAL_ERR_NOT_FOUND; } @@ -193,10 +221,7 @@ static int find_topic(const char *base, const char *topic) break; case OPAL_SHOW_HELP_PARSE_DONE: - fprintf(stderr, dash_line); - fprintf(stderr, "Sorry! You were supposed to get help about:\n %s\nfrom the file:\n %s\n", topic, base); - fprintf(stderr, "But I couldn't find that topic in the file. Sorry!\n"); - fprintf(stderr, dash_line); + opal_output(output_stream, "%sSorry! You were supposed to get help about:\n %s\nfrom the file:\n %s\nBut I couldn't find that topic in the file. Sorry!\n%s", dash_line, topic, base, dash_line); return OPAL_ERR_NOT_FOUND; break; @@ -213,7 +238,7 @@ static int find_topic(const char *base, const char *topic) * We have an open file, and we're pointed at the right topic. So * read in all the lines in the topic and make a list of them. */ -static int read_message(char ***array) +static int read_topic(char ***array) { char *tmp; int token; @@ -239,82 +264,95 @@ static int read_message(char ***array) } -/* - * Make one big string with all the lines. This isn't the most - * efficient method in the world, but we're going for clarity here -- - * not optimization. :-) - */ -static int output(bool want_error_header, char **lines, - const char *base, const char *topic, - va_list arglist) +static int load_array(char ***array, const char *filename, const char *topic) { - int i, count; - size_t len; - char *concat; + int ret; - /* See how much space we need */ - - len = want_error_header ? 2 * strlen(dash_line) : 0; - count = opal_argv_count(lines); - for (i = 0; i < count; ++i) { - if (NULL == lines[i]) { - break; - } - len += strlen(lines[i]) + 1; + if (OPAL_SUCCESS != (ret = open_file(filename, topic))) { + return ret; + } + if (OPAL_SUCCESS != (ret = find_topic(filename, topic))) { + fclose(opal_show_help_yyin); + return ret; } - /* Malloc it out */ - - concat = (char*) malloc(len + 1); - if (NULL == concat) { - fprintf(stderr, dash_line); - fprintf(stderr, "Sorry! You were supposed to get help about:\n %s\nfrom the file:\n %s\n", topic, base); - fprintf(stderr, "But memory seems to be exhausted. Sorry!\n"); - fprintf(stderr, dash_line); - return OPAL_ERR_OUT_OF_RESOURCE; - } - - /* Fill the big string */ - - *concat = '\0'; - if (want_error_header) { - strcat(concat, dash_line); - } - for (i = 0; i < count; ++i) { - if (NULL == lines[i]) { - break; - } - strcat(concat, lines[i]); - strcat(concat, "\n"); - } - if (want_error_header) { - strcat(concat, dash_line); - } - - /* Apply formatting */ - vfprintf( stderr, concat, arglist ); - - /* All done */ - - free(concat); - return OPAL_SUCCESS; -} - - -/* - * Free all the strings in the array and destruct the array - */ -static int destroy_message(char **lines) -{ - int i, count; - - count = opal_argv_count(lines); - for (i = 0; i < count; ++i) { - if (NULL == lines[i]) { - break; - } - free(lines[i]); + ret = read_topic(array); + opal_show_help_finish_parsing(); + fclose(opal_show_help_yyin); + if (OPAL_SUCCESS != ret) { + opal_argv_free(*array); + return ret; } return OPAL_SUCCESS; } + +char *opal_show_help_vstring(const char *filename, const char *topic, + bool want_error_header, va_list arglist) +{ + int rc; + char *single_string, *output, **array = NULL; + + /* Load the message */ + if (OPAL_SUCCESS != (rc = load_array(&array, filename, topic))) { + return NULL; + } + + /* Convert it to a single raw string */ + rc = array2string(&single_string, want_error_header, array); + + if (OPAL_SUCCESS == rc) { + /* Apply the formatting to make the final output string */ + vasprintf(&output, single_string, arglist); + free(single_string); + } + + opal_argv_free(array); + return (OPAL_SUCCESS == rc) ? output : NULL; +} + +char *opal_show_help_string(const char *filename, const char *topic, + bool want_error_handler, ...) +{ + char *output; + va_list arglist; + + va_start(arglist, want_error_handler); + output = opal_show_help_vstring(filename, topic, want_error_handler, + arglist); + va_end(arglist); + + return output; +} + +int opal_show_vhelp(const char *filename, const char *topic, + bool want_error_header, va_list arglist) +{ + char *output; + + /* Convert it to a single string */ + output = opal_show_help_vstring(filename, topic, want_error_header, + arglist); + + /* If we got a single string, output it with formatting */ + if (NULL != output) { + opal_output(output_stream, output); + free(output); + } + + return (NULL == output) ? OPAL_ERROR : OPAL_SUCCESS; +} + +int opal_show_help(const char *filename, const char *topic, + bool want_error_header, ...) +{ + va_list arglist; + int rc; + + /* Convert it to a single string */ + va_start(arglist, want_error_header); + rc = opal_show_vhelp(filename, topic, want_error_header, arglist); + va_end(arglist); + + return rc; +} diff --git a/opal/util/show_help.h b/opal/util/show_help.h index 085f3c1afe..a77b0fe513 100644 --- a/opal/util/show_help.h +++ b/opal/util/show_help.h @@ -9,6 +9,7 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. + * Copyright (c) 2008 Cisco Systems, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -92,43 +93,78 @@ #include -#if defined(c_plusplus) || defined(__cplusplus) -extern "C" { -#endif +BEGIN_C_DECLS - /** - * Look up a text message in a text file and display it to the - * stderr using printf()-like substitutions (%d, %s, etc.). - * - * @param filename File where the text messages are contained. - * @param topic String index of which message to display from the - * text file. - * @param want_error_header Display error-bar line header and - * footer with the message. - * @param varargs Any additional parameters are substituted, - * printf()-style into the help message that is displayed. - * - * This function looks for the filename in the $pkgdatadir - * (typically $prefix/share/openmpi), and looks up the message - * based on the topic, and displays it. If want_error_header is - * true, a header and footer of asterisks are also displayed. - */ - OPAL_DECLSPEC int opal_show_help(const char *filename, const char *topic, - bool want_error_header, ...); +/** + * \internal + * + * Initialization of show_help subsystem + */ +OPAL_DECLSPEC int opal_show_help_init(void); - /** - * \internal - * - * Internal function to help clean up the flex parser. - * - * This function is called internally by the SHS to shut down the - * flex parser since we may not hit the <> rule and call this - * function automatically. - */ - OPAL_DECLSPEC int opal_show_help_finish_parsing(void); -#if defined(c_plusplus) || defined(__cplusplus) -} -#endif +/** + * \internal + * + * Finalization of show_help subsystem + */ +OPAL_DECLSPEC int opal_show_help_finalize(void); + + +/** + * Look up a text message in a text file and display it to the + * stderr using printf()-like substitutions (%d, %s, etc.). + * + * @param filename File where the text messages are contained. + * @param topic String index of which message to display from the + * text file. + * @param want_error_header Display error-bar line header and + * footer with the message. + * @param varargs Any additional parameters are substituted, + * printf()-style into the help message that is displayed. + * + * This function looks for the filename in the $pkgdatadir + * (typically $prefix/share/openmpi), and looks up the message + * based on the topic, and displays it. If want_error_header is + * true, a header and footer of asterisks are also displayed. + */ +OPAL_DECLSPEC int opal_show_help(const char *filename, const char *topic, + bool want_error_header, ...); + +/** + * This function does the same thing as opal_show_help(), but accepts + * a va_list form of varargs. + */ +OPAL_DECLSPEC int opal_show_vhelp(const char *filename, const char *topic, + bool want_error_header, va_list ap); + +/** + * This function does the same thing as opal_show_help(), but returns + * its output in a string (that must be freed by the caller). + */ +OPAL_DECLSPEC char* opal_show_help_string(const char *filename, + const char *topic, + bool want_error_header, ...); + +/** + * This function does the same thing as opal_show_help_string(), but + * accepts a va_list form of varargs. + */ +OPAL_DECLSPEC char* opal_show_help_vstring(const char *filename, + const char *topic, + bool want_error_header, va_list ap); + +/** + * \internal + * + * Internal function to help clean up the flex parser. + * + * This function is called internally by the SHS to shut down the + * flex parser since we may not hit the <> rule and call this + * function automatically. + */ +OPAL_DECLSPEC int opal_show_help_finish_parsing(void); + +END_C_DECLS #endif diff --git a/opal/util/show_help_lex.l b/opal/util/show_help_lex.l index 49a7d69f48..9c75556091 100644 --- a/opal/util/show_help_lex.l +++ b/opal/util/show_help_lex.l @@ -49,7 +49,6 @@ static int opal_show_help_yywrap(void); */ int opal_show_help_yynewlines = 1; bool opal_show_help_parse_done = false; -char *opal_show_help_string = NULL; #define yyterminate() \ return opal_show_help_finish_parsing() diff --git a/orte/mca/errmgr/base/errmgr_base_fns.c b/orte/mca/errmgr/base/errmgr_base_fns.c index b71000aa58..ff69817ea1 100644 --- a/orte/mca/errmgr/base/errmgr_base_fns.c +++ b/orte/mca/errmgr/base/errmgr_base_fns.c @@ -25,7 +25,7 @@ #endif #include -#include "opal/util/output.h" +#include "orte/util/output.h" #include "opal/util/trace.h" #include "opal/util/error.h" @@ -47,7 +47,7 @@ void orte_errmgr_base_log(int error_code, char *filename, int line) return; } - opal_output(0, "%s ORTE_ERROR_LOG: %s in file %s at line %d", + orte_output(0, "%s ORTE_ERROR_LOG: %s in file %s at line %d", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_ERROR_NAME(error_code), filename, line); } @@ -71,7 +71,7 @@ void orte_errmgr_base_error_abort(int error_code, char *fmt, ...) if( NULL != fmt ) { char* buffer = NULL; vasprintf( &buffer, fmt, arglist ); - opal_output( 0, buffer ); + orte_output( 0, buffer ); free( buffer ); } va_end(arglist); diff --git a/orte/mca/errmgr/base/errmgr_base_open.c b/orte/mca/errmgr/base/errmgr_base_open.c index 06609cb5a6..190e03b603 100644 --- a/orte/mca/errmgr/base/errmgr_base_open.c +++ b/orte/mca/errmgr/base/errmgr_base_open.c @@ -23,9 +23,11 @@ #include "opal/mca/mca.h" #include "opal/mca/base/base.h" #include "opal/mca/base/mca_base_param.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "opal/util/trace.h" +#include "orte/util/output.h" + #include "orte/mca/errmgr/base/base.h" #include "orte/mca/errmgr/base/errmgr_private.h" @@ -70,22 +72,11 @@ bool orte_errmgr_initialized = false; */ int orte_errmgr_base_open(void) { - int param, value; - OPAL_TRACE(5); if (!orte_errmgr_initialized) { /* ensure we only do this once */ - /* Debugging / verbose output */ - - param = mca_base_param_reg_int_name("errmgr", "base_verbose", - "Verbosity level for the errmgr framework", - false, false, 0, &value); - if (value != 0) { - orte_errmgr_base_output = opal_output_open(NULL); - } else { - orte_errmgr_base_output = -1; - } + orte_errmgr_base_output = orte_output_open(NULL, "ERRMGR", "DEBUG", NULL); /* Open up all available components */ diff --git a/orte/mca/errmgr/default/errmgr_default.c b/orte/mca/errmgr/default/errmgr_default.c index c487e0ae88..4e8152df3f 100644 --- a/orte/mca/errmgr/default/errmgr_default.c +++ b/orte/mca/errmgr/default/errmgr_default.c @@ -25,7 +25,7 @@ #include "opal/class/opal_list.h" #include "opal/util/trace.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "orte/runtime/runtime.h" #include "orte/runtime/orte_globals.h" @@ -54,7 +54,7 @@ void orte_errmgr_default_proc_aborted(orte_process_name_t *name, int exit_code) /* if we are already in progress, then ignore this call */ if (!opal_atomic_trylock(&orte_abort_inprogress_lock)) { /* returns 1 if already locked */ - OPAL_OUTPUT_VERBOSE((1, orte_errmgr_base_output, + ORTE_OUTPUT_VERBOSE((1, orte_errmgr_base_output, "%s errmgr:default: abort in progress, ignoring proc %s aborted with status %d", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(name), exit_code)); @@ -62,7 +62,7 @@ void orte_errmgr_default_proc_aborted(orte_process_name_t *name, int exit_code) return; } - OPAL_OUTPUT_VERBOSE((1, orte_errmgr_base_output, + ORTE_OUTPUT_VERBOSE((1, orte_errmgr_base_output, "%s errmgr:default: proc %s aborting with status %d", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(name), exit_code)); @@ -120,14 +120,14 @@ void orte_errmgr_default_incomplete_start(orte_jobid_t job, int exit_code) /* if we are already in progress, then ignore this call */ if (!opal_atomic_trylock(&orte_abort_inprogress_lock)) { /* returns 1 if already locked */ - OPAL_OUTPUT_VERBOSE((1, orte_errmgr_base_output, + ORTE_OUTPUT_VERBOSE((1, orte_errmgr_base_output, "%s errmgr:default: abort in progress, ignoring incomplete start on job %s with status %d", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_JOBID_PRINT(job), exit_code)); return; } - OPAL_OUTPUT_VERBOSE((1, orte_errmgr_base_output, + ORTE_OUTPUT_VERBOSE((1, orte_errmgr_base_output, "%s errmgr:default: job %s reported incomplete start with status %d", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_JOBID_PRINT(job), exit_code)); diff --git a/orte/mca/errmgr/default/errmgr_default_component.c b/orte/mca/errmgr/default/errmgr_default_component.c index 079d03812e..35e1dd15dd 100644 --- a/orte/mca/errmgr/default/errmgr_default_component.c +++ b/orte/mca/errmgr/default/errmgr_default_component.c @@ -29,7 +29,7 @@ #include "orte/constants.h" #include "orte/types.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "opal/mca/mca.h" #include "opal/mca/base/base.h" #include "opal/mca/base/mca_base_param.h" diff --git a/orte/mca/ess/alps/ess_alps_module.c b/orte/mca/ess/alps/ess_alps_module.c index 176129ebab..05012bd2bc 100644 --- a/orte/mca/ess/alps/ess_alps_module.c +++ b/orte/mca/ess/alps/ess_alps_module.c @@ -22,7 +22,7 @@ #include -#include "opal/util/show_help.h" +#include "orte/util/show_help.h" #include "opal/util/argv.h" #include "opal/class/opal_pointer_array.h" @@ -112,7 +112,7 @@ static int rte_init(char flags) return ORTE_SUCCESS; error: - opal_show_help("help-orte-runtime.txt", + orte_show_help("help-orte-runtime.txt", "orte_init:startup:internal-failure", true, error, ORTE_ERROR_NAME(ret), ret); @@ -163,14 +163,14 @@ static int rte_finalize(void) static bool proc_is_local(orte_process_name_t *proc) { if (pmap[proc->vpid].node == (int32_t)ORTE_PROC_MY_DAEMON->vpid) { - OPAL_OUTPUT_VERBOSE((2, orte_ess_base_output, + ORTE_OUTPUT_VERBOSE((2, orte_ess_base_output, "%s ess:alps: proc %s is LOCAL", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(proc))); return true; } - OPAL_OUTPUT_VERBOSE((2, orte_ess_base_output, + ORTE_OUTPUT_VERBOSE((2, orte_ess_base_output, "%s ess:alps: proc %s is REMOTE", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(proc))); @@ -187,7 +187,7 @@ static char* proc_get_hostname(orte_process_name_t *proc) node = pmap[proc->vpid].node; nids = (orte_nid_t**)nidmap.addr; - OPAL_OUTPUT_VERBOSE((2, orte_ess_base_output, + ORTE_OUTPUT_VERBOSE((2, orte_ess_base_output, "%s ess:alps: proc %s is on host %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(proc), @@ -204,7 +204,7 @@ static uint32_t proc_get_arch(orte_process_name_t *proc) node = pmap[proc->vpid].node; nids = (orte_nid_t**)nidmap.addr; - OPAL_OUTPUT_VERBOSE((2, orte_ess_base_output, + ORTE_OUTPUT_VERBOSE((2, orte_ess_base_output, "%s ess:alps: proc %s has arch %0x", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(proc), @@ -216,7 +216,7 @@ static uint32_t proc_get_arch(orte_process_name_t *proc) static uint8_t proc_get_local_rank(orte_process_name_t *proc) { - OPAL_OUTPUT_VERBOSE((2, orte_ess_base_output, + ORTE_OUTPUT_VERBOSE((2, orte_ess_base_output, "%s ess:alps: proc %s has local rank %d", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(proc), @@ -228,7 +228,7 @@ static uint8_t proc_get_local_rank(orte_process_name_t *proc) static uint8_t proc_get_node_rank(orte_process_name_t *proc) { - OPAL_OUTPUT_VERBOSE((2, orte_ess_base_output, + ORTE_OUTPUT_VERBOSE((2, orte_ess_base_output, "%s ess:alps: proc %s has node rank %d", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(proc), @@ -247,7 +247,7 @@ static int alps_set_name(void) char* jobid_string; char* vpid_string; - OPAL_OUTPUT_VERBOSE((1, orte_ess_base_output, + ORTE_OUTPUT_VERBOSE((1, orte_ess_base_output, "ess:alps setting name")); id = mca_base_param_register_string("orte", "ess", "jobid", NULL, NULL); @@ -275,7 +275,7 @@ static int alps_set_name(void) ORTE_PROC_MY_NAME->jobid = jobid; ORTE_PROC_MY_NAME->vpid = (orte_vpid_t) cnos_get_rank() + starting_vpid; - OPAL_OUTPUT_VERBOSE((1, orte_ess_base_output, + ORTE_OUTPUT_VERBOSE((1, orte_ess_base_output, "ess:alps set name to %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME))); orte_process_info.num_procs = (orte_std_cntr_t) cnos_get_size(); diff --git a/orte/mca/ess/base/ess_base_build_nidmap.c b/orte/mca/ess/base/ess_base_build_nidmap.c index 7376685c47..212eb35a25 100644 --- a/orte/mca/ess/base/ess_base_build_nidmap.c +++ b/orte/mca/ess/base/ess_base_build_nidmap.c @@ -27,6 +27,7 @@ #include "orte/mca/errmgr/errmgr.h" #include "orte/util/name_fns.h" #include "orte/util/nidmap.h" +#include "orte/util/output.h" #include "orte/runtime/orte_globals.h" #include "orte/mca/ess/base/base.h" @@ -39,7 +40,7 @@ int orte_ess_base_build_nidmap(opal_buffer_t *buffer, opal_byte_object_t *bo; int32_t cnt; - OPAL_OUTPUT_VERBOSE((5, orte_ess_base_output, + ORTE_OUTPUT_VERBOSE((5, orte_ess_base_output, "%s ess:build:nidmap: received buffer with %ld bytes", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), (long)buffer->bytes_used)); diff --git a/orte/mca/ess/base/ess_base_close.c b/orte/mca/ess/base/ess_base_close.c index 13811e2ad6..21aa6f0a78 100644 --- a/orte/mca/ess/base/ess_base_close.c +++ b/orte/mca/ess/base/ess_base_close.c @@ -24,7 +24,7 @@ #include "opal/mca/mca.h" #include "opal/mca/base/base.h" #include "opal/mca/base/mca_base_component_repository.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "orte/mca/ess/base/base.h" @@ -41,7 +41,7 @@ orte_ess_base_close(void) orte_ess_base_component_t* component; cli = (mca_base_component_list_item_t *) item; component = (orte_ess_base_component_t *) cli->cli_component; - opal_output_verbose(10, 0, + orte_output_verbose(10, 0, "orte_ess_base_close: module %s unloaded", component->base_version.mca_component_name); mca_base_component_repository_release((mca_base_component_t *) component); diff --git a/orte/mca/ess/base/ess_base_get.c b/orte/mca/ess/base/ess_base_get.c index 32601d3f9f..d9a723d444 100644 --- a/orte/mca/ess/base/ess_base_get.c +++ b/orte/mca/ess/base/ess_base_get.c @@ -26,7 +26,7 @@ #include #include "opal/util/opal_environ.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "opal/mca/base/mca_base_param.h" #include "orte/mca/errmgr/errmgr.h" diff --git a/orte/mca/ess/base/ess_base_open.c b/orte/mca/ess/base/ess_base_open.c index a1e91e4a71..bd9b02e458 100644 --- a/orte/mca/ess/base/ess_base_open.c +++ b/orte/mca/ess/base/ess_base_open.c @@ -20,10 +20,12 @@ #include "orte_config.h" #include "orte/constants.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "opal/mca/mca.h" #include "opal/mca/base/base.h" +#include "orte/util/output.h" + #include "orte/mca/ess/base/base.h" @@ -47,7 +49,7 @@ int orte_ess_base_output; int orte_ess_base_open(void) { - orte_ess_base_output = opal_output_open(NULL); + orte_ess_base_output = orte_output_open(NULL, "ESS", "DEBUG", NULL); OBJ_CONSTRUCT(&orte_ess_base_components_available, opal_list_t); diff --git a/orte/mca/ess/base/ess_base_put.c b/orte/mca/ess/base/ess_base_put.c index 415b00aa2d..db9fbd46cf 100644 --- a/orte/mca/ess/base/ess_base_put.c +++ b/orte/mca/ess/base/ess_base_put.c @@ -26,7 +26,7 @@ #include #include "opal/util/opal_environ.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "opal/mca/base/mca_base_param.h" #include "orte/mca/errmgr/errmgr.h" diff --git a/orte/mca/ess/base/ess_base_select.c b/orte/mca/ess/base/ess_base_select.c index 368519a82b..8b5a456594 100644 --- a/orte/mca/ess/base/ess_base_select.c +++ b/orte/mca/ess/base/ess_base_select.c @@ -20,7 +20,7 @@ #include "orte/constants.h" #include "opal/class/opal_list.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "opal/mca/mca.h" #include "opal/mca/base/base.h" #include "opal/mca/base/mca_base_component_repository.h" diff --git a/orte/mca/ess/base/ess_base_std_app.c b/orte/mca/ess/base/ess_base_std_app.c index fef1491df8..8953ed74b6 100644 --- a/orte/mca/ess/base/ess_base_std_app.c +++ b/orte/mca/ess/base/ess_base_std_app.c @@ -29,8 +29,7 @@ #endif #include "opal/event/event.h" -#include "opal/util/output.h" -#include "opal/util/show_help.h" +#include "orte/util/output.h" #include "opal/util/os_path.h" #include "opal/runtime/opal.h" #include "opal/runtime/opal_cr.h" @@ -48,6 +47,8 @@ #include "orte/util/proc_info.h" #include "orte/util/session_dir.h" #include "orte/util/name_fns.h" +#include "orte/util/output.h" + #include "orte/runtime/orte_cr.h" #include "orte/runtime/orte_globals.h" #include "orte/runtime/orte_wait.h" @@ -130,7 +131,7 @@ int orte_ess_base_app_setup(void) goto error; } - OPAL_OUTPUT_VERBOSE((2, orte_debug_output, + ORTE_OUTPUT_VERBOSE((2, orte_debug_output, "%s setting up session dir with\n\ttmpdir: %s\n\thost %s\n\tjobid %s\n\tprocid %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), (NULL == orte_process_info.tmpdir_base) ? "UNDEF" : orte_process_info.tmpdir_base, @@ -154,7 +155,7 @@ int orte_ess_base_app_setup(void) } /* Once the session directory location has been established, set - the opal_output env file location to be in the + the orte_output env file location to be in the proc-specific session directory. */ opal_output_set_output_file_info(orte_process_info.proc_session_dir, "output-", NULL, NULL); @@ -222,7 +223,7 @@ int orte_ess_base_app_setup(void) return ORTE_SUCCESS; error: - opal_show_help("help-orte-runtime.txt", + orte_show_help("help-orte-runtime.txt", "orte_init:startup:internal-failure", true, error, ORTE_ERROR_NAME(ret), ret); @@ -304,7 +305,7 @@ void orte_ess_base_app_abort(int status, bool report) ORTE_ERROR_LOG(ORTE_ERR_OUT_OF_RESOURCE); goto CLEANUP; } - OPAL_OUTPUT_VERBOSE((5, orte_debug_output, + ORTE_OUTPUT_VERBOSE((5, orte_debug_output, "%s orte_ess_app_abort: dropping abort file %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), abort_file)); fd = open(abort_file, O_CREAT, 0600); diff --git a/orte/mca/ess/base/ess_base_std_orted.c b/orte/mca/ess/base/ess_base_std_orted.c index 17149a431a..66592f1a71 100644 --- a/orte/mca/ess/base/ess_base_std_orted.c +++ b/orte/mca/ess/base/ess_base_std_orted.c @@ -29,8 +29,7 @@ #endif #include "opal/event/event.h" -#include "opal/util/output.h" -#include "opal/util/show_help.h" +#include "orte/util/output.h" #include "opal/runtime/opal.h" #include "opal/runtime/opal_cr.h" @@ -50,6 +49,8 @@ #include "orte/util/proc_info.h" #include "orte/util/session_dir.h" #include "orte/util/name_fns.h" +#include "orte/util/output.h" + #include "orte/runtime/orte_cr.h" #include "orte/runtime/orte_wait.h" #include "orte/runtime/orte_globals.h" @@ -146,7 +147,7 @@ int orte_ess_base_orted_setup(void) goto error; } - OPAL_OUTPUT_VERBOSE((2, orte_debug_output, + ORTE_OUTPUT_VERBOSE((2, orte_debug_output, "%s setting up session dir with\n\ttmpdir: %s\n\thost %s\n\tjobid %s\n\tprocid %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), (NULL == orte_process_info.tmpdir_base) ? "UNDEF" : orte_process_info.tmpdir_base, @@ -240,7 +241,7 @@ int orte_ess_base_orted_setup(void) return ORTE_SUCCESS; error: - opal_show_help("help-orte-runtime.txt", + orte_show_help("help-orte-runtime.txt", "orte_init:startup:internal-failure", true, error, ORTE_ERROR_NAME(ret), ret); diff --git a/orte/mca/ess/base/ess_base_std_tool.c b/orte/mca/ess/base/ess_base_std_tool.c index c0f4d3335b..a6214791bd 100644 --- a/orte/mca/ess/base/ess_base_std_tool.c +++ b/orte/mca/ess/base/ess_base_std_tool.c @@ -29,8 +29,7 @@ #endif #include "opal/event/event.h" -#include "opal/util/output.h" -#include "opal/util/show_help.h" +#include "orte/util/output.h" #include "opal/runtime/opal.h" #include "opal/runtime/opal_cr.h" @@ -42,6 +41,8 @@ #endif #include "orte/util/proc_info.h" #include "orte/util/session_dir.h" +#include "orte/util/output.h" + #include "orte/runtime/orte_cr.h" #include "orte/runtime/orte_globals.h" @@ -89,6 +90,7 @@ int orte_ess_base_tool_setup(void) error = "orte_rml.enable_comm"; goto error; } + /* we -may- need to know the name of the head * of our session directory tree, particularly the * tmp base where any other session directories on @@ -126,7 +128,7 @@ int orte_ess_base_tool_setup(void) return ORTE_SUCCESS; error: - opal_show_help("help-orte-runtime.txt", + orte_show_help("help-orte-runtime.txt", "orte_init:startup:internal-failure", true, error, ORTE_ERROR_NAME(ret), ret); diff --git a/orte/mca/ess/cnos/ess_cnos_module.c b/orte/mca/ess/cnos/ess_cnos_module.c index bb96ccd39f..1068e3dc2e 100644 --- a/orte/mca/ess/cnos/ess_cnos_module.c +++ b/orte/mca/ess/cnos/ess_cnos_module.c @@ -22,7 +22,7 @@ #include -#include "opal/util/output.h" +#include "orte/util/output.h" #include "orte/mca/errmgr/base/base.h" #include "orte/util/name_fns.h" @@ -80,7 +80,7 @@ static int rte_init(char flags) /* Get the nid map */ nprocs = cnos_get_nidpid_map(&map); if (nprocs <= 0) { - opal_output(0, "%5d: cnos_get_nidpid_map() returned %d", + orte_output(0, "%5d: cnos_get_nidpid_map() returned %d", cnos_get_rank(), nprocs); return ORTE_ERR_FATAL; } diff --git a/orte/mca/ess/env/ess_env_module.c b/orte/mca/ess/env/ess_env_module.c index dde7a785d1..8ae0830a2d 100644 --- a/orte/mca/ess/env/ess_env_module.c +++ b/orte/mca/ess/env/ess_env_module.c @@ -30,13 +30,12 @@ #endif #include "opal/event/event.h" -#include "opal/util/output.h" -#include "opal/util/show_help.h" #include "opal/threads/mutex.h" #include "opal/runtime/opal.h" #include "opal/runtime/opal_cr.h" #include "opal/class/opal_pointer_array.h" +#include "orte/util/output.h" #include "opal/mca/mca.h" #include "opal/mca/base/base.h" #include "opal/mca/base/mca_base_param.h" @@ -164,7 +163,7 @@ static int rte_init(char flags) return ORTE_SUCCESS; error: - opal_show_help("help-orte-runtime.txt", + orte_show_help("help-orte-runtime.txt", "orte_init:startup:internal-failure", true, error, ORTE_ERROR_NAME(ret), ret); @@ -217,14 +216,14 @@ static int rte_finalize(void) static bool proc_is_local(orte_process_name_t *proc) { if (pmap[proc->vpid].node == (int32_t)ORTE_PROC_MY_DAEMON->vpid) { - OPAL_OUTPUT_VERBOSE((2, orte_ess_base_output, + ORTE_OUTPUT_VERBOSE((2, orte_ess_base_output, "%s ess:env: proc %s is LOCAL", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(proc))); return true; } - OPAL_OUTPUT_VERBOSE((2, orte_ess_base_output, + ORTE_OUTPUT_VERBOSE((2, orte_ess_base_output, "%s ess:env: proc %s is REMOTE", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(proc))); @@ -241,7 +240,7 @@ static char* proc_get_hostname(orte_process_name_t *proc) node = pmap[proc->vpid].node; nids = (orte_nid_t**)nidmap.addr; - OPAL_OUTPUT_VERBOSE((2, orte_ess_base_output, + ORTE_OUTPUT_VERBOSE((2, orte_ess_base_output, "%s ess:env: proc %s is on host %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(proc), @@ -258,7 +257,7 @@ static uint32_t proc_get_arch(orte_process_name_t *proc) node = pmap[proc->vpid].node; nids = (orte_nid_t**)nidmap.addr; - OPAL_OUTPUT_VERBOSE((2, orte_ess_base_output, + ORTE_OUTPUT_VERBOSE((2, orte_ess_base_output, "%s ess:env: proc %s has arch %0x", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(proc), @@ -270,7 +269,7 @@ static uint32_t proc_get_arch(orte_process_name_t *proc) static uint8_t proc_get_local_rank(orte_process_name_t *proc) { - OPAL_OUTPUT_VERBOSE((2, orte_ess_base_output, + ORTE_OUTPUT_VERBOSE((2, orte_ess_base_output, "%s ess:env: proc %s has local rank %d", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(proc), @@ -282,7 +281,7 @@ static uint8_t proc_get_local_rank(orte_process_name_t *proc) static uint8_t proc_get_node_rank(orte_process_name_t *proc) { - OPAL_OUTPUT_VERBOSE((2, orte_ess_base_output, + ORTE_OUTPUT_VERBOSE((2, orte_ess_base_output, "%s ess:env: proc %s has node rank %d", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(proc), @@ -325,7 +324,7 @@ static int env_set_name(void) ORTE_PROC_MY_NAME->jobid = jobid; ORTE_PROC_MY_NAME->vpid = vpid; - OPAL_OUTPUT_VERBOSE((1, orte_ess_base_output, + ORTE_OUTPUT_VERBOSE((1, orte_ess_base_output, "ess:env set name to %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME))); /* get the non-name common environmental variables */ @@ -523,7 +522,7 @@ static int rte_ft_event(int state) exit_status = ret; } - opal_output_set_output_file_info(orte_process_info.proc_session_dir, + orte_output_set_output_file_info(orte_process_info.proc_session_dir, "output-", NULL, NULL); /* diff --git a/orte/mca/ess/hnp/ess_hnp_module.c b/orte/mca/ess/hnp/ess_hnp_module.c index 1f0c0bf4f5..8e95f56412 100644 --- a/orte/mca/ess/hnp/ess_hnp_module.c +++ b/orte/mca/ess/hnp/ess_hnp_module.c @@ -30,14 +30,13 @@ #endif #include "opal/event/event.h" -#include "opal/util/output.h" -#include "opal/util/show_help.h" #include "opal/runtime/opal.h" #include "opal/runtime/opal_cr.h" #include "opal/util/os_path.h" #include "opal/util/malloc.h" +#include "orte/util/output.h" #include "orte/mca/rml/base/base.h" #include "orte/mca/rml/base/rml_contact.h" #include "orte/mca/routed/base/base.h" @@ -58,6 +57,7 @@ #include "orte/util/session_dir.h" #include "orte/util/hnp_contact.h" #include "orte/util/name_fns.h" +#include "orte/util/output.h" #include "orte/runtime/runtime.h" #include "orte/runtime/orte_wait.h" @@ -229,6 +229,18 @@ static int rte_init(char flags) goto error; } +#if ORTE_DISABLE_FULL_SUPPORT +#else + /* setup the orte_output system to recv remote output */ + ret = orte_rml.recv_buffer_nb(ORTE_NAME_WILDCARD, ORTE_RML_TAG_OUTPUT, + ORTE_RML_NON_PERSISTENT, orte_output_recv_output, NULL); + if (ret != ORTE_SUCCESS && ret != ORTE_ERR_NOT_IMPLEMENTED) { + ORTE_ERROR_LOG(ret); + error = "setup receive for orte_output"; + goto error; + } +#endif + /* setup my session directory */ if (ORTE_SUCCESS != (ret = orte_util_convert_jobid_to_string(&jobid_str, ORTE_PROC_MY_NAME->jobid))) { ORTE_ERROR_LOG(ret); @@ -241,7 +253,7 @@ static int rte_init(char flags) goto error; } - OPAL_OUTPUT_VERBOSE((2, orte_debug_output, + ORTE_OUTPUT_VERBOSE((2, orte_debug_output, "%s setting up session dir with\n\ttmpdir: %s\n\thost %s\n\tjobid %s\n\tprocid %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), (NULL == orte_process_info.tmpdir_base) ? "UNDEF" : orte_process_info.tmpdir_base, @@ -265,7 +277,7 @@ static int rte_init(char flags) } /* Once the session directory location has been established, set - the opal_output hnp file location to be in the + the orte_output hnp file location to be in the proc-specific session directory. */ opal_output_set_output_file_info(orte_process_info.proc_session_dir, "output-", NULL, NULL); @@ -274,18 +286,18 @@ static int rte_init(char flags) contact_path = opal_os_path(false, orte_process_info.job_session_dir, "contact.txt", NULL); - OPAL_OUTPUT_VERBOSE((2, orte_debug_output, + ORTE_OUTPUT_VERBOSE((2, orte_debug_output, "%s writing contact file %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), contact_path)); if (ORTE_SUCCESS != (ret = orte_write_hnp_contact_file(contact_path))) { - OPAL_OUTPUT_VERBOSE((2, orte_debug_output, + ORTE_OUTPUT_VERBOSE((2, orte_debug_output, "%s writing contact file failed with error %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_ERROR_NAME(ret))); } else { - OPAL_OUTPUT_VERBOSE((2, orte_debug_output, + ORTE_OUTPUT_VERBOSE((2, orte_debug_output, "%s wrote contact file", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME))); } @@ -401,7 +413,7 @@ static int rte_init(char flags) return ORTE_SUCCESS; error: - opal_show_help("help-orte-runtime.txt", + orte_show_help("help-orte-runtime.txt", "orte_init:startup:internal-failure", true, error, ORTE_ERROR_NAME(ret), ret); diff --git a/orte/mca/ess/lsf/ess_lsf_module.c b/orte/mca/ess/lsf/ess_lsf_module.c index dc8ced0a87..96c233a932 100644 --- a/orte/mca/ess/lsf/ess_lsf_module.c +++ b/orte/mca/ess/lsf/ess_lsf_module.c @@ -122,7 +122,7 @@ static int rte_init(char flags) return ORTE_SUCCESS; error: - opal_show_help("help-orte-runtime.txt", + orte_show_help("help-orte-runtime.txt", "orte_init:startup:internal-failure", true, error, ORTE_ERROR_NAME(ret), ret); @@ -173,14 +173,14 @@ static int rte_finalize(void) static bool proc_is_local(orte_process_name_t *proc) { if (pmap[proc->vpid].node == (int32_t)ORTE_PROC_MY_DAEMON->vpid) { - OPAL_OUTPUT_VERBOSE((2, orte_ess_base_output, + ORTE_OUTPUT_VERBOSE((2, orte_ess_base_output, "%s ess:lsf: proc %s is LOCAL", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(proc))); return true; } - OPAL_OUTPUT_VERBOSE((2, orte_ess_base_output, + ORTE_OUTPUT_VERBOSE((2, orte_ess_base_output, "%s ess:lsf: proc %s is REMOTE", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(proc))); @@ -197,7 +197,7 @@ static char* proc_get_hostname(orte_process_name_t *proc) node = pmap[proc->vpid].node; nids = (orte_nid_t**)nidmap.addr; - OPAL_OUTPUT_VERBOSE((2, orte_ess_base_output, + ORTE_OUTPUT_VERBOSE((2, orte_ess_base_output, "%s ess:lsf: proc %s is on host %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(proc), @@ -214,7 +214,7 @@ static uint32_t proc_get_arch(orte_process_name_t *proc) node = pmap[proc->vpid].node; nids = (orte_nid_t**)nidmap.addr; - OPAL_OUTPUT_VERBOSE((2, orte_ess_base_output, + ORTE_OUTPUT_VERBOSE((2, orte_ess_base_output, "%s ess:lsf: proc %s has arch %0x", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(proc), @@ -226,7 +226,7 @@ static uint32_t proc_get_arch(orte_process_name_t *proc) static uint8_t proc_get_local_rank(orte_process_name_t *proc) { - OPAL_OUTPUT_VERBOSE((2, orte_ess_base_output, + ORTE_OUTPUT_VERBOSE((2, orte_ess_base_output, "%s ess:lsf: proc %s has local rank %d", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(proc), @@ -238,7 +238,7 @@ static uint8_t proc_get_local_rank(orte_process_name_t *proc) static uint8_t proc_get_node_rank(orte_process_name_t *proc) { - OPAL_OUTPUT_VERBOSE((2, orte_ess_base_output, + ORTE_OUTPUT_VERBOSE((2, orte_ess_base_output, "%s ess:lsf: proc %s has node rank %d", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(proc), diff --git a/orte/mca/ess/portals_utcp/ess_portals_utcp_module.c b/orte/mca/ess/portals_utcp/ess_portals_utcp_module.c index 0d35cef52d..c926239fa6 100644 --- a/orte/mca/ess/portals_utcp/ess_portals_utcp_module.c +++ b/orte/mca/ess/portals_utcp/ess_portals_utcp_module.c @@ -22,7 +22,7 @@ #include -#include "opal/util/output.h" +#include "orte/util/output.h" #include "opal/util/argv.h" #include "orte/mca/errmgr/base/base.h" @@ -117,7 +117,7 @@ static int rte_init(char flags) return rc; } - OPAL_OUTPUT_VERBOSE((2, orte_debug_output, + ORTE_OUTPUT_VERBOSE((2, orte_debug_output, "%s setting up session dir with\n\ttmpdir: %s\n\tuser %s\n\thost %s\n\tjobid %s\n\tprocid %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), (NULL == orte_process_info.tmpdir_base) ? "UNDEF" : orte_process_info.tmpdir_base, @@ -140,9 +140,9 @@ static int rte_init(char flags) } /* Once the session directory location has been established, set - the opal_output env file location to be in the + the orte_output env file location to be in the proc-specific session directory. */ - opal_output_set_output_file_info(orte_process_info.proc_session_dir, + orte_output_set_output_file_info(orte_process_info.proc_session_dir, "output-", NULL, NULL); /* that's all we need here */ diff --git a/orte/mca/ess/singleton/ess_singleton_module.c b/orte/mca/ess/singleton/ess_singleton_module.c index 1666b46df5..e59bac9662 100644 --- a/orte/mca/ess/singleton/ess_singleton_module.c +++ b/orte/mca/ess/singleton/ess_singleton_module.c @@ -30,13 +30,12 @@ #include #include "opal/util/argv.h" -#include "opal/util/output.h" #include "opal/util/path.h" -#include "opal/util/show_help.h" #include "opal/mca/base/mca_base_param.h" #include "opal/mca/installdirs/installdirs.h" #include "opal/class/opal_pointer_array.h" +#include "orte/util/output.h" #include "orte/util/proc_info.h" #include "orte/mca/errmgr/errmgr.h" #include "orte/mca/iof/iof.h" @@ -325,7 +324,7 @@ static int fork_hnp(void) execv(cmd, argv); /* if I get here, the execv failed! */ - opal_show_help("help-ess-base.txt", "ess-base:execv-error", + orte_show_help("help-ess-base.txt", "ess-base:execv-error", true, cmd, strerror(errno)); exit(1); @@ -398,14 +397,14 @@ static int fork_hnp(void) static bool proc_is_local(orte_process_name_t *proc) { if (pmap[proc->vpid].node == (int32_t)ORTE_PROC_MY_DAEMON->vpid) { - OPAL_OUTPUT_VERBOSE((2, orte_ess_base_output, + ORTE_OUTPUT_VERBOSE((2, orte_ess_base_output, "%s ess:env: proc %s is LOCAL", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(proc))); return true; } - OPAL_OUTPUT_VERBOSE((2, orte_ess_base_output, + ORTE_OUTPUT_VERBOSE((2, orte_ess_base_output, "%s ess:env: proc %s is REMOTE", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(proc))); diff --git a/orte/mca/ess/slurm/ess_slurm_module.c b/orte/mca/ess/slurm/ess_slurm_module.c index 691a0ebf22..d40a1deb16 100644 --- a/orte/mca/ess/slurm/ess_slurm_module.c +++ b/orte/mca/ess/slurm/ess_slurm_module.c @@ -9,6 +9,7 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. + * Copyright (c) 2008 Cisco Systems, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -31,10 +32,10 @@ #include "opal/util/opal_environ.h" #include "opal/mca/base/mca_base_param.h" #include "opal/util/argv.h" -#include "opal/util/show_help.h" #include "opal/class/opal_pointer_array.h" #include "orte/util/proc_info.h" +#include "orte/util/output.h" #include "orte/mca/errmgr/errmgr.h" #include "orte/util/name_fns.h" #include "orte/runtime/orte_globals.h" @@ -122,7 +123,7 @@ static int rte_init(char flags) return ORTE_SUCCESS; error: - opal_show_help("help-orte-runtime.txt", + orte_show_help("help-orte-runtime.txt", "orte_init:startup:internal-failure", true, error, ORTE_ERROR_NAME(ret), ret); @@ -173,14 +174,14 @@ static int rte_finalize(void) static bool proc_is_local(orte_process_name_t *proc) { if (pmap[proc->vpid].node == (int32_t)ORTE_PROC_MY_DAEMON->vpid) { - OPAL_OUTPUT_VERBOSE((2, orte_ess_base_output, + ORTE_OUTPUT_VERBOSE((2, orte_ess_base_output, "%s ess:slurm: proc %s is LOCAL", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(proc))); return true; } - OPAL_OUTPUT_VERBOSE((2, orte_ess_base_output, + ORTE_OUTPUT_VERBOSE((2, orte_ess_base_output, "%s ess:slurm: proc %s is REMOTE", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(proc))); @@ -197,7 +198,7 @@ static char* proc_get_hostname(orte_process_name_t *proc) node = pmap[proc->vpid].node; nids = (orte_nid_t**)nidmap.addr; - OPAL_OUTPUT_VERBOSE((2, orte_ess_base_output, + ORTE_OUTPUT_VERBOSE((2, orte_ess_base_output, "%s ess:slurm: proc %s is on host %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(proc), @@ -214,7 +215,7 @@ static uint32_t proc_get_arch(orte_process_name_t *proc) node = pmap[proc->vpid].node; nids = (orte_nid_t**)nidmap.addr; - OPAL_OUTPUT_VERBOSE((2, orte_ess_base_output, + ORTE_OUTPUT_VERBOSE((2, orte_ess_base_output, "%s ess:slurm: proc %s has arch %d", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(proc), @@ -226,7 +227,7 @@ static uint32_t proc_get_arch(orte_process_name_t *proc) static uint8_t proc_get_local_rank(orte_process_name_t *proc) { - OPAL_OUTPUT_VERBOSE((2, orte_ess_base_output, + ORTE_OUTPUT_VERBOSE((2, orte_ess_base_output, "%s ess:slurm: proc %s has local rank %d", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(proc), @@ -238,7 +239,7 @@ static uint8_t proc_get_local_rank(orte_process_name_t *proc) static uint8_t proc_get_node_rank(orte_process_name_t *proc) { - OPAL_OUTPUT_VERBOSE((2, orte_ess_base_output, + ORTE_OUTPUT_VERBOSE((2, orte_ess_base_output, "%s ess:slurm: proc %s has node rank %d", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(proc), @@ -258,7 +259,7 @@ static int slurm_set_name(void) char* vpid_string; - OPAL_OUTPUT_VERBOSE((1, orte_ess_base_output, + ORTE_OUTPUT_VERBOSE((1, orte_ess_base_output, "ess:slurm setting name")); id = mca_base_param_register_string("orte", "ess", "jobid", NULL, NULL); @@ -290,7 +291,7 @@ static int slurm_set_name(void) ORTE_PROC_MY_NAME->vpid = vpid + slurm_nodeid; - OPAL_OUTPUT_VERBOSE((1, orte_ess_base_output, + ORTE_OUTPUT_VERBOSE((1, orte_ess_base_output, "ess:slurm set name to %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME))); /* fix up the system info nodename to match exactly what slurm returned */ @@ -300,7 +301,7 @@ static int slurm_set_name(void) orte_process_info.nodename = get_slurm_nodename(slurm_nodeid); - OPAL_OUTPUT_VERBOSE((1, orte_ess_base_output, + ORTE_OUTPUT_VERBOSE((1, orte_ess_base_output, "ess:slurm set nodename to %s", orte_process_info.nodename)); diff --git a/orte/mca/ess/tool/ess_tool_module.c b/orte/mca/ess/tool/ess_tool_module.c index 33a4812bf5..75fdde1758 100644 --- a/orte/mca/ess/tool/ess_tool_module.c +++ b/orte/mca/ess/tool/ess_tool_module.c @@ -29,10 +29,9 @@ #include #endif -#include "opal/util/output.h" -#include "opal/util/show_help.h" #include "opal/runtime/opal_cr.h" +#include "orte/util/output.h" #include "orte/mca/plm/base/base.h" #include "orte/mca/plm/plm.h" #include "orte/mca/errmgr/errmgr.h" @@ -109,7 +108,7 @@ static int rte_init(char flags) return ORTE_SUCCESS; error: - opal_show_help("help-ess-tool.txt", + orte_show_help("help-ess-tool.txt", "tool:rte_init:startup:internal-failure", true, error, ORTE_ERROR_NAME(ret), ret); diff --git a/orte/mca/filem/base/filem_base_close.c b/orte/mca/filem/base/filem_base_close.c index 5ee09b1f1f..88bafae8bb 100644 --- a/orte/mca/filem/base/filem_base_close.c +++ b/orte/mca/filem/base/filem_base_close.c @@ -20,7 +20,7 @@ #include "opal/mca/mca.h" #include "opal/mca/base/base.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "opal/mca/base/mca_base_param.h" #include "orte/mca/filem/filem.h" diff --git a/orte/mca/filem/base/filem_base_fns.c b/orte/mca/filem/base/filem_base_fns.c index 7f5274b3c3..7d283fe898 100644 --- a/orte/mca/filem/base/filem_base_fns.c +++ b/orte/mca/filem/base/filem_base_fns.c @@ -29,7 +29,7 @@ #include "opal/mca/mca.h" #include "opal/mca/base/base.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "opal/util/argv.h" #include "opal/mca/base/mca_base_param.h" #include "opal/util/os_dirpath.h" diff --git a/orte/mca/filem/base/filem_base_open.c b/orte/mca/filem/base/filem_base_open.c index 99ffd9bd80..481f19d89f 100644 --- a/orte/mca/filem/base/filem_base_open.c +++ b/orte/mca/filem/base/filem_base_open.c @@ -20,11 +20,12 @@ #include "opal/mca/mca.h" #include "opal/mca/base/base.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "opal/mca/base/mca_base_param.h" #include "orte/mca/filem/filem.h" #include "orte/mca/filem/base/base.h" +#include "orte/util/output.h" #include "orte/mca/filem/base/static-components.h" @@ -49,20 +50,9 @@ orte_filem_base_component_t orte_filem_base_selected_component; */ int orte_filem_base_open(void) { - int value; char *str_value = NULL; - /* Debugging/Verbose output */ - mca_base_param_reg_int_name("filem", - "base_verbose", - "Verbosity level of the FILEM framework", - false, false, - 0, &value); - if(0 != value) { - orte_filem_base_output = opal_output_open(NULL); - } else { - orte_filem_base_output = 0; - } + orte_filem_base_output = orte_output_open(NULL, "FILEM", "DEBUG", NULL); /* * Which FileM component to open diff --git a/orte/mca/filem/base/filem_base_receive.c b/orte/mca/filem/base/filem_base_receive.c index 2587a2efa9..c785d147b8 100644 --- a/orte/mca/filem/base/filem_base_receive.c +++ b/orte/mca/filem/base/filem_base_receive.c @@ -37,7 +37,7 @@ #include #endif -#include "opal/util/output.h" +#include "orte/util/output.h" #include "opal/mca/mca.h" #include "opal/mca/base/mca_base_param.h" @@ -74,7 +74,7 @@ int orte_filem_base_comm_start(void) return ORTE_SUCCESS; } - OPAL_OUTPUT_VERBOSE((5, orte_filem_base_output, + ORTE_OUTPUT_VERBOSE((5, orte_filem_base_output, "%s filem:base: Receive: Start command recv", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME))); @@ -104,7 +104,7 @@ int orte_filem_base_comm_stop(void) return ORTE_SUCCESS; } - OPAL_OUTPUT_VERBOSE((5, orte_filem_base_output, + ORTE_OUTPUT_VERBOSE((5, orte_filem_base_output, "%s filem:base:receive stop comm", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME))); @@ -130,7 +130,7 @@ void orte_filem_base_recv(int status, orte_process_name_t* sender, orte_std_cntr_t count; int rc; - OPAL_OUTPUT_VERBOSE((5, orte_filem_base_output, + ORTE_OUTPUT_VERBOSE((5, orte_filem_base_output, "%s filem:base: Receive a command message.", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME))); @@ -142,7 +142,7 @@ void orte_filem_base_recv(int status, orte_process_name_t* sender, switch (command) { case ORTE_FILEM_GET_PROC_NODE_NAME_CMD: - OPAL_OUTPUT_VERBOSE((10, orte_filem_base_output, + ORTE_OUTPUT_VERBOSE((10, orte_filem_base_output, "%s filem:base: Command: Get Proc node name command", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME))); @@ -150,7 +150,7 @@ void orte_filem_base_recv(int status, orte_process_name_t* sender, break; case ORTE_FILEM_GET_REMOTE_PATH_CMD: - OPAL_OUTPUT_VERBOSE((10, orte_filem_base_output, + ORTE_OUTPUT_VERBOSE((10, orte_filem_base_output, "%s filem:base: Command: Get remote path command", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME))); @@ -261,7 +261,7 @@ static void filem_base_process_get_remote_path_cmd(orte_process_name_t* sender, tmp_name = strdup(filename); } - opal_output_verbose(10, orte_filem_base_output, + orte_output_verbose(10, orte_filem_base_output, "filem:base: process_get_remote_path_cmd: %s -> %s: Filename Requested (%s) translated to (%s)", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(sender), diff --git a/orte/mca/filem/base/filem_base_select.c b/orte/mca/filem/base/filem_base_select.c index a396e43aa5..482b430fa0 100644 --- a/orte/mca/filem/base/filem_base_select.c +++ b/orte/mca/filem/base/filem_base_select.c @@ -20,7 +20,7 @@ #include "opal/mca/mca.h" #include "opal/mca/base/base.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "opal/mca/base/mca_base_param.h" #include "orte/mca/filem/filem.h" @@ -53,7 +53,7 @@ static orte_filem_base_component_t none_component = { /* Verbosity level */ 0, - /* opal_output handler */ + /* orte_output handler */ -1, /* Default priority */ 1 @@ -91,7 +91,7 @@ int orte_filem_base_select(void) */ if( 0 >= opal_list_get_size(&orte_filem_base_components_available) || (NULL != include_list && 0 == strncmp(include_list, "none", strlen("none")) ) ) { - opal_output_verbose(1, orte_filem_base_output, + orte_output_verbose(1, orte_filem_base_output, "filem:select: Warning: Using none component. Some functionality (e.g., --preload-binary) will not work in this mode."); best_component = &none_component; best_module = &none_module; diff --git a/orte/mca/filem/filem.h b/orte/mca/filem/filem.h index bfd46320b8..419574477a 100644 --- a/orte/mca/filem/filem.h +++ b/orte/mca/filem/filem.h @@ -311,7 +311,7 @@ struct orte_filem_base_component_1_0_0_t { /** Verbosity Level */ int verbose; - /** Output Handle for opal_output */ + /** Output Handle for orte_output */ int output_handle; /** Default Priority */ int priority; diff --git a/orte/mca/filem/rsh/filem_rsh_component.c b/orte/mca/filem/rsh/filem_rsh_component.c index 5ee7da8e90..6e894bec5a 100644 --- a/orte/mca/filem/rsh/filem_rsh_component.c +++ b/orte/mca/filem/rsh/filem_rsh_component.c @@ -17,7 +17,9 @@ #include "orte_config.h" #include "orte/constants.h" -#include "opal/util/output.h" +#include "orte/util/output.h" + +#include "orte/util/output.h" #include "orte/mca/filem/filem.h" #include "orte/mca/filem/base/base.h" @@ -70,7 +72,7 @@ orte_filem_rsh_component_t mca_filem_rsh_component = { /* Verbosity level */ 0, - /* opal_output handler */ + /* orte_output handler */ -1, /* Default priority */ 20 @@ -102,8 +104,8 @@ static int filem_rsh_open(void) * otherwise take our parents level and output channel */ if ( 0 != mca_filem_rsh_component.super.verbose) { - mca_filem_rsh_component.super.output_handle = opal_output_open(NULL); - opal_output_set_verbosity(mca_filem_rsh_component.super.output_handle, + mca_filem_rsh_component.super.output_handle = orte_output_open(NULL, "FILEM", "RSH", "DEBUG", NULL); + orte_output_set_verbosity(mca_filem_rsh_component.super.output_handle, mca_filem_rsh_component.super.verbose); } else { mca_filem_rsh_component.super.output_handle = orte_filem_base_output; @@ -147,18 +149,18 @@ static int filem_rsh_open(void) /* * Debug Output */ - opal_output_verbose(10, mca_filem_rsh_component.super.output_handle, + orte_output_verbose(10, mca_filem_rsh_component.super.output_handle, "filem:rsh: open()"); - opal_output_verbose(20, mca_filem_rsh_component.super.output_handle, + orte_output_verbose(20, mca_filem_rsh_component.super.output_handle, "filem:rsh: open: priority = %d", mca_filem_rsh_component.super.priority); - opal_output_verbose(20, mca_filem_rsh_component.super.output_handle, + orte_output_verbose(20, mca_filem_rsh_component.super.output_handle, "filem:rsh: open: verbosity = %d", mca_filem_rsh_component.super.verbose); - opal_output_verbose(20, mca_filem_rsh_component.super.output_handle, + orte_output_verbose(20, mca_filem_rsh_component.super.output_handle, "filem:rsh: open: cp command = %s", mca_filem_rsh_component.cp_command); - opal_output_verbose(20, mca_filem_rsh_component.super.output_handle, + orte_output_verbose(20, mca_filem_rsh_component.super.output_handle, "filem:rsh: open: rsh command = %s", mca_filem_rsh_component.remote_sh_command); @@ -167,7 +169,7 @@ static int filem_rsh_open(void) static int filem_rsh_close(void) { - opal_output_verbose(10, mca_filem_rsh_component.super.output_handle, + orte_output_verbose(10, mca_filem_rsh_component.super.output_handle, "filem:rsh: close()"); return ORTE_SUCCESS; diff --git a/orte/mca/filem/rsh/filem_rsh_module.c b/orte/mca/filem/rsh/filem_rsh_module.c index 91b782732b..aa3add69df 100644 --- a/orte/mca/filem/rsh/filem_rsh_module.c +++ b/orte/mca/filem/rsh/filem_rsh_module.c @@ -33,11 +33,10 @@ #include "opal/mca/base/base.h" #include "opal/event/event.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "opal/mca/base/mca_base_param.h" -#include "opal/util/output.h" -#include "opal/util/show_help.h" +#include "orte/util/output.h" #include "opal/util/argv.h" #include "opal/util/opal_environ.h" @@ -205,7 +204,7 @@ static orte_filem_base_module_t loc_module = { */ int orte_filem_rsh_component_query(mca_base_module_t **module, int *priority) { - OPAL_OUTPUT_VERBOSE((10, mca_filem_rsh_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((10, mca_filem_rsh_component.super.output_handle, "filem:rsh: component_query()")); *priority = mca_filem_rsh_component.super.priority; @@ -218,7 +217,7 @@ int orte_filem_rsh_module_init(void) { int ret; - OPAL_OUTPUT_VERBOSE((10, mca_filem_rsh_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((10, mca_filem_rsh_component.super.output_handle, "filem:rsh: module_init()")); /* @@ -237,14 +236,14 @@ int orte_filem_rsh_module_init(void) * Start the listener for permission */ if( ORTE_SUCCESS != (ret = orte_filem_rsh_permission_listener_init(orte_filem_rsh_permission_callback) ) ) { - opal_output(mca_filem_rsh_component.super.output_handle, + orte_output(mca_filem_rsh_component.super.output_handle, "filem:rsh:init Failed to start listener\n"); return ret; } /* start the base receive */ if (ORTE_SUCCESS != (ret = orte_filem_base_comm_start())) { - opal_output(mca_filem_rsh_component.super.output_handle, + orte_output(mca_filem_rsh_component.super.output_handle, "filem:rsh:init Failed to start base receive\n"); return ret; } @@ -255,7 +254,7 @@ int orte_filem_rsh_module_finalize(void) { opal_list_item_t *item = NULL; - OPAL_OUTPUT_VERBOSE((10, mca_filem_rsh_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((10, mca_filem_rsh_component.super.output_handle, "filem:rsh: module_finalize()")); /* @@ -307,19 +306,19 @@ int orte_filem_rsh_put(orte_filem_base_request_t *request) int ret; if( ORTE_SUCCESS != (ret = orte_filem_base_prepare_request(request, ORTE_FILEM_MOVE_TYPE_PUT) ) ) { - opal_output(mca_filem_rsh_component.super.output_handle, + orte_output(mca_filem_rsh_component.super.output_handle, "filem:rsh: put(): Failed to preare the request structure (%d)", ret); return ret; } if( ORTE_SUCCESS != (ret = orte_filem_rsh_start_copy(request) ) ) { - opal_output(mca_filem_rsh_component.super.output_handle, + orte_output(mca_filem_rsh_component.super.output_handle, "filem:rsh: put(): Failed to post the request (%d)", ret); return ret; } if( ORTE_SUCCESS != (ret = orte_filem_rsh_wait(request)) ) { - opal_output(mca_filem_rsh_component.super.output_handle, + orte_output(mca_filem_rsh_component.super.output_handle, "filem:rsh: put(): Failed to wait on the request (%d)", ret); return ret; } @@ -332,13 +331,13 @@ int orte_filem_rsh_put_nb(orte_filem_base_request_t *request) int ret; if( ORTE_SUCCESS != (ret = orte_filem_base_prepare_request(request, ORTE_FILEM_MOVE_TYPE_PUT) ) ) { - opal_output(mca_filem_rsh_component.super.output_handle, + orte_output(mca_filem_rsh_component.super.output_handle, "filem:rsh: put(): Failed to preare the request structure (%d)", ret); return ret; } if( ORTE_SUCCESS != (ret = orte_filem_rsh_start_copy(request) ) ) { - opal_output(mca_filem_rsh_component.super.output_handle, + orte_output(mca_filem_rsh_component.super.output_handle, "filem:rsh: put(): Failed to post the request (%d)", ret); return ret; } @@ -351,19 +350,19 @@ int orte_filem_rsh_get(orte_filem_base_request_t *request) int ret; if( ORTE_SUCCESS != (ret = orte_filem_base_prepare_request(request, ORTE_FILEM_MOVE_TYPE_GET) ) ) { - opal_output(mca_filem_rsh_component.super.output_handle, + orte_output(mca_filem_rsh_component.super.output_handle, "filem:rsh: get(): Failed to preare the request structure (%d)", ret); return ret; } if( ORTE_SUCCESS != (ret = orte_filem_rsh_start_copy(request) ) ) { - opal_output(mca_filem_rsh_component.super.output_handle, + orte_output(mca_filem_rsh_component.super.output_handle, "filem:rsh: get(): Failed to post the request (%d)", ret); return ret; } if( ORTE_SUCCESS != (ret = orte_filem_rsh_wait(request)) ) { - opal_output(mca_filem_rsh_component.super.output_handle, + orte_output(mca_filem_rsh_component.super.output_handle, "filem:rsh: get(): Failed to wait on the request (%d)", ret); return ret; } @@ -376,13 +375,13 @@ int orte_filem_rsh_get_nb(orte_filem_base_request_t *request) int ret; if( ORTE_SUCCESS != (ret = orte_filem_base_prepare_request(request, ORTE_FILEM_MOVE_TYPE_GET) ) ) { - opal_output(mca_filem_rsh_component.super.output_handle, + orte_output(mca_filem_rsh_component.super.output_handle, "filem:rsh: get(): Failed to preare the request structure (%d)", ret); return ret; } if( ORTE_SUCCESS != (ret = orte_filem_rsh_start_copy(request) ) ) { - opal_output(mca_filem_rsh_component.super.output_handle, + orte_output(mca_filem_rsh_component.super.output_handle, "filem:rsh: get(): Failed to post the request (%d)", ret); return ret; } @@ -395,19 +394,19 @@ int orte_filem_rsh_rm(orte_filem_base_request_t *request) int ret = ORTE_SUCCESS, exit_status = ORTE_SUCCESS; if( ORTE_SUCCESS != (ret = orte_filem_base_prepare_request(request, ORTE_FILEM_MOVE_TYPE_RM) ) ) { - opal_output(mca_filem_rsh_component.super.output_handle, + orte_output(mca_filem_rsh_component.super.output_handle, "filem:rsh: rm(): Failed to prepare on the request (%d)", ret); return ret; } if( ORTE_SUCCESS != (ret = orte_filem_rsh_start_rm(request) ) ) { - opal_output(mca_filem_rsh_component.super.output_handle, + orte_output(mca_filem_rsh_component.super.output_handle, "filem:rsh: rm(): Failed to start the request (%d)", ret); return ret; } if( ORTE_SUCCESS != (ret = orte_filem_rsh_wait(request)) ) { - opal_output(mca_filem_rsh_component.super.output_handle, + orte_output(mca_filem_rsh_component.super.output_handle, "filem:rsh: rm(): Failed to wait on the request (%d)", ret); return ret; } @@ -420,13 +419,13 @@ int orte_filem_rsh_rm_nb(orte_filem_base_request_t *request) int ret = ORTE_SUCCESS, exit_status = ORTE_SUCCESS; if( ORTE_SUCCESS != (ret = orte_filem_base_prepare_request(request, ORTE_FILEM_MOVE_TYPE_RM) ) ) { - opal_output(mca_filem_rsh_component.super.output_handle, + orte_output(mca_filem_rsh_component.super.output_handle, "filem:rsh: rm_nb(): Failed to prepare on the request (%d)", ret); return ret; } if( ORTE_SUCCESS != (ret = orte_filem_rsh_start_rm(request) ) ) { - opal_output(mca_filem_rsh_component.super.output_handle, + orte_output(mca_filem_rsh_component.super.output_handle, "filem:rsh: rm_nb(): Failed to start on the request (%d)", ret); return ret; } @@ -490,7 +489,7 @@ int orte_filem_rsh_wait(orte_filem_base_request_t *request) continue; } - OPAL_OUTPUT_VERBOSE((10, mca_filem_rsh_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((10, mca_filem_rsh_component.super.output_handle, "filem:rsh: wait(): Transfer complete. Cleanup\n")); opal_list_remove_item(&work_pool_active, item); @@ -548,7 +547,7 @@ int orte_filem_rsh_wait_all(opal_list_t * request_list) orte_filem_base_request_t *request = (orte_filem_base_request_t *) item; if( ORTE_SUCCESS != (ret = orte_filem_rsh_wait(request)) ) { - opal_output(mca_filem_rsh_component.super.output_handle, + orte_output(mca_filem_rsh_component.super.output_handle, "filem:rsh: wait_all(): Wait failed (%d)", ret); exit_status = ret; goto cleanup; @@ -585,14 +584,14 @@ static int orte_filem_rsh_start_copy(orte_filem_base_request_t *request) { orte_filem_base_process_set_t * p_set = (orte_filem_base_process_set_t*)p_item; if( request->movement_type == ORTE_FILEM_MOVE_TYPE_PUT ) { - OPAL_OUTPUT_VERBOSE((10, mca_filem_rsh_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((10, mca_filem_rsh_component.super.output_handle, "filem:rsh: copy(): %s -> %s: Moving file %s to %s\n", ORTE_NAME_PRINT(&p_set->source), ORTE_NAME_PRINT(&p_set->sink), f_set->local_target, f_set->remote_target)); } else { - OPAL_OUTPUT_VERBOSE((10, mca_filem_rsh_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((10, mca_filem_rsh_component.super.output_handle, "filem:rsh: copy(): %s -> %s: Moving file %s to %s\n", ORTE_NAME_PRINT(&p_set->source), ORTE_NAME_PRINT(&p_set->sink), @@ -603,17 +602,17 @@ static int orte_filem_rsh_start_copy(orte_filem_base_request_t *request) { /* * Get the remote machine identifier from the process_name struct */ - OPAL_OUTPUT_VERBOSE((10, mca_filem_rsh_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((10, mca_filem_rsh_component.super.output_handle, "filem:rsh: copy(): %s -> %s: Get node name.\n", ORTE_NAME_PRINT(&p_set->source), ORTE_NAME_PRINT(&p_set->sink))); if( ORTE_SUCCESS != (ret = orte_filem_base_get_proc_node_name(&p_set->source, &remote_machine))) { - opal_output(mca_filem_rsh_component.super.output_handle, + orte_output(mca_filem_rsh_component.super.output_handle, "filem:rsh: copy(): Get Node Name failed (%d)", ret); exit_status = ret; goto cleanup; } - OPAL_OUTPUT_VERBOSE((10, mca_filem_rsh_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((10, mca_filem_rsh_component.super.output_handle, "filem:rsh: copy(): %s -> %s: Got node name: %s\n", ORTE_NAME_PRINT(&p_set->source), ORTE_NAME_PRINT(&p_set->sink), @@ -624,19 +623,19 @@ static int orte_filem_rsh_start_copy(orte_filem_base_request_t *request) { * If it is an absolute path, then assume it is valid for the remote server * ow then we must construct the correct path. */ - OPAL_OUTPUT_VERBOSE((10, mca_filem_rsh_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((10, mca_filem_rsh_component.super.output_handle, "filem:rsh: copy(): %s -> %s: Query remote path (%s).\n", ORTE_NAME_PRINT(&p_set->source), ORTE_NAME_PRINT(&p_set->sink), f_set->remote_target)); remote_file = strdup(f_set->remote_target); if( ORTE_SUCCESS != (ret = orte_filem_rsh_query_remote_path(&remote_file, &p_set->source, &f_set->target_flag) ) ) { - opal_output(mca_filem_rsh_component.super.output_handle, + orte_output(mca_filem_rsh_component.super.output_handle, "filem:rsh: copy(): Query Remote Path failed (%d)", ret); exit_status = ret; goto cleanup; } - OPAL_OUTPUT_VERBOSE((10, mca_filem_rsh_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((10, mca_filem_rsh_component.super.output_handle, "filem:rsh: copy(): %s -> %s: Remote path (%s) is (%s).\n", ORTE_NAME_PRINT(&p_set->source), ORTE_NAME_PRINT(&p_set->sink), @@ -650,7 +649,7 @@ static int orte_filem_rsh_start_copy(orte_filem_base_request_t *request) { dir_arg = strdup(" -r "); } else if(ORTE_FILEM_TYPE_UNKNOWN == f_set->target_flag) { - opal_output(mca_filem_rsh_component.super.output_handle, + orte_output(mca_filem_rsh_component.super.output_handle, "filem:rsh: copy(): Error: File type unknown"); goto continue_set; } @@ -668,7 +667,7 @@ static int orte_filem_rsh_start_copy(orte_filem_base_request_t *request) { f_set->local_target, remote_machine, remote_file); - OPAL_OUTPUT_VERBOSE((17, mca_filem_rsh_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((17, mca_filem_rsh_component.super.output_handle, "filem:rsh:put about to execute [%s]", command)); if( ORTE_SUCCESS != (ret = orte_filem_rsh_start_command(p_set, @@ -691,7 +690,7 @@ static int orte_filem_rsh_start_copy(orte_filem_base_request_t *request) { remote_file, f_set->local_target); - OPAL_OUTPUT_VERBOSE((17, mca_filem_rsh_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((17, mca_filem_rsh_component.super.output_handle, "filem:rsh:get about to execute [%s]", command)); if( ORTE_SUCCESS != (ret = orte_filem_rsh_start_command(p_set, @@ -812,7 +811,7 @@ static int orte_filem_rsh_start_rm(orte_filem_base_request_t *request) dir_arg, remote_targets); - OPAL_OUTPUT_VERBOSE((15, mca_filem_rsh_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((15, mca_filem_rsh_component.super.output_handle, "filem:rsh:rm about to execute [%s]", command)); if( ORTE_SUCCESS != (ret = orte_filem_rsh_start_command(p_set, @@ -908,7 +907,7 @@ static int orte_filem_rsh_start_command(orte_filem_base_process_set_t *proc_set /* * Ask for permission to send this file so we do not overwhelm the peer */ - OPAL_OUTPUT_VERBOSE((10, mca_filem_rsh_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((10, mca_filem_rsh_component.super.output_handle, "filem:rsh: start_command(): Ask permission to send from proc %s", ORTE_NAME_PRINT(&(proc_set->source)))); if( ORTE_SUCCESS != (ret = orte_filem_rsh_permission_ask(&(proc_set->source), 1)) ) { @@ -928,7 +927,7 @@ static int start_child(char * command, char **argv = NULL; int status, ret; - OPAL_OUTPUT_VERBOSE((10, mca_filem_rsh_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((10, mca_filem_rsh_component.super.output_handle, "filem:rsh: start_child(): Starting the command [%s]", command)); /* fork() -> done = false, active = true */ @@ -944,11 +943,11 @@ static int start_child(char * command, status = execvp(argv[0], argv); - opal_output(0, "filem:rsh:start_child Failed to exec child [%s] status = %d\n", command, status); + orte_output(0, "filem:rsh:start_child Failed to exec child [%s] status = %d\n", command, status); exit(ORTE_ERROR); } else if( request->exit_status[index] > 0 ) { - OPAL_OUTPUT_VERBOSE((10, mca_filem_rsh_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((10, mca_filem_rsh_component.super.output_handle, "filem:rsh: start_child(): Started Child %d Running command [%s]", request->exit_status[index], command)); @@ -956,7 +955,7 @@ static int start_child(char * command, * Register a callback for when this process exits */ if( ORTE_SUCCESS != (ret = orte_wait_cb(request->exit_status[index], filem_rsh_waitpid_cb, NULL) ) ) { - opal_output(0, "filem:rsh: start_child(): Failed to register a waitpid callback for child [%d] executing the command [%s]\n", + orte_output(0, "filem:rsh: start_child(): Failed to register a waitpid callback for child [%d] executing the command [%s]\n", request->exit_status[index], command); return ret; } @@ -976,7 +975,7 @@ static void filem_rsh_waitpid_cb(pid_t pid, int status, void* cbdata) opal_list_item_t *item = NULL; int index; - OPAL_OUTPUT_VERBOSE((10, mca_filem_rsh_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((10, mca_filem_rsh_component.super.output_handle, "filem:rsh: waitpid_cb(): Pid %d finished with status [%d].\n", pid, status)); @@ -996,7 +995,7 @@ static void filem_rsh_waitpid_cb(pid_t pid, int status, void* cbdata) /* waitpid() -> done = true, active = false */ request->is_done[index] = true; request->is_active[index] = false; - OPAL_OUTPUT_VERBOSE((10, mca_filem_rsh_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((10, mca_filem_rsh_component.super.output_handle, "filem:rsh: waitpid_cb(): Marked pid %d as complete [status = %d].\n", pid, status)); break; @@ -1050,7 +1049,7 @@ static int orte_filem_rsh_permission_listener_init(orte_rml_buffer_callback_fn_t ORTE_RML_PERSISTENT, rml_cbfunc, NULL)) ) { - opal_output(mca_filem_rsh_component.super.output_handle, + orte_output(mca_filem_rsh_component.super.output_handle, "filem:rsh: listener_init: Failed to register the receive callback (%d)", ret); return ret; @@ -1065,7 +1064,7 @@ static int orte_filem_rsh_permission_listener_cancel(void) if( ORTE_SUCCESS != (ret = orte_rml.recv_cancel(ORTE_NAME_WILDCARD, ORTE_RML_TAG_FILEM_RSH) ) ) { #if 0 - opal_output(mca_filem_rsh_component.super.output_handle, + orte_output(mca_filem_rsh_component.super.output_handle, "filem:rsh: listener_cancel: Failed to deregister the receive callback (%d)", ret); #endif @@ -1088,7 +1087,7 @@ static void orte_filem_rsh_permission_callback(int status, int num_req, num_allowed = 0; int perm_flag, i; - OPAL_OUTPUT_VERBOSE((10, mca_filem_rsh_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((10, mca_filem_rsh_component.super.output_handle, "filem:rsh: permission_callback(? ?): Peer %s ...", ORTE_NAME_PRINT(sender))); @@ -1104,7 +1103,7 @@ static void orte_filem_rsh_permission_callback(int status, /* Asking for permission to send */ if( ORTE_FILEM_RSH_ASK == perm_flag ) { - OPAL_OUTPUT_VERBOSE((10, mca_filem_rsh_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((10, mca_filem_rsh_component.super.output_handle, "filem:rsh: permission_callback(ASK): Peer %s Asking permission to send [Used %d of %d]", ORTE_NAME_PRINT(sender), cur_num_incomming, @@ -1126,7 +1125,7 @@ static void orte_filem_rsh_permission_callback(int status, */ if( orte_filem_rsh_max_incomming < cur_num_incomming + 1) { /* Add to the waiting list */ - OPAL_OUTPUT_VERBOSE((10, mca_filem_rsh_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((10, mca_filem_rsh_component.super.output_handle, "filem:rsh: permission_callback(ASK): Add Peer %s request to waiting list", ORTE_NAME_PRINT(sender))); @@ -1141,7 +1140,7 @@ static void orte_filem_rsh_permission_callback(int status, num_allowed = 1; cur_num_incomming += 1; - OPAL_OUTPUT_VERBOSE((10, mca_filem_rsh_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((10, mca_filem_rsh_component.super.output_handle, "filem:rsh: permission_callback(ASK): Respond to Peer %s with %d", ORTE_NAME_PRINT(sender), num_allowed)); @@ -1150,7 +1149,7 @@ static void orte_filem_rsh_permission_callback(int status, } /* Allowing us to start some number of sends */ else if( ORTE_FILEM_RSH_ALLOW == perm_flag ) { - OPAL_OUTPUT_VERBOSE((10, mca_filem_rsh_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((10, mca_filem_rsh_component.super.output_handle, "filem:rsh: permission_callback(ALLOW): Peer %s Allowing me to send", ORTE_NAME_PRINT(sender))); @@ -1169,7 +1168,7 @@ static void orte_filem_rsh_permission_callback(int status, */ for(i = 0; i < num_req; ++i ) { if( 0 >= opal_list_get_size(&work_pool_pending) ) { - OPAL_OUTPUT_VERBOSE((10, mca_filem_rsh_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((10, mca_filem_rsh_component.super.output_handle, "filem:rsh: permission_callback(ALLOW): No more pending sends to peer %s...", ORTE_NAME_PRINT(sender))); break; @@ -1187,11 +1186,11 @@ static void orte_filem_rsh_permission_callback(int status, } if( item == opal_list_get_end(&work_pool_pending) ) { - OPAL_OUTPUT_VERBOSE((10, mca_filem_rsh_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((10, mca_filem_rsh_component.super.output_handle, "filem:rsh: permission_callback(ALLOW): Unable to find message on the pending list\n")); } - OPAL_OUTPUT_VERBOSE((10, mca_filem_rsh_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((10, mca_filem_rsh_component.super.output_handle, "filem:rsh: permission_callback(ALLOW): Starting to send to peer %s... (# pending = %d)", ORTE_NAME_PRINT(sender), (int)opal_list_get_size(&work_pool_pending))); wp_item->active = true; @@ -1205,7 +1204,7 @@ static void orte_filem_rsh_permission_callback(int status, } /* Peer said they are done sending one or more files */ else if( ORTE_FILEM_RSH_DONE == perm_flag ) { - OPAL_OUTPUT_VERBOSE((10, mca_filem_rsh_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((10, mca_filem_rsh_component.super.output_handle, "filem:rsh: permission_callback(DONE): Peer %s is done sending to me", ORTE_NAME_PRINT(sender))); diff --git a/orte/mca/grpcomm/base/grpcomm_base_allgather.c b/orte/mca/grpcomm/base/grpcomm_base_allgather.c index 5e9885cd97..475f62cb10 100644 --- a/orte/mca/grpcomm/base/grpcomm_base_allgather.c +++ b/orte/mca/grpcomm/base/grpcomm_base_allgather.c @@ -28,7 +28,7 @@ #include #include "opal/threads/condition.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "orte/util/proc_info.h" #include "opal/dss/dss.h" @@ -52,7 +52,7 @@ static void allgather_server_recv(int status, orte_process_name_t* sender, { int rc; - OPAL_OUTPUT_VERBOSE((2, orte_grpcomm_base_output, + ORTE_OUTPUT_VERBOSE((2, orte_grpcomm_base_output, "%s allgather buffer received from %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(sender))); @@ -82,7 +82,7 @@ static void allgather_client_recv(int status, orte_process_name_t* sender, { int rc; - OPAL_OUTPUT_VERBOSE((2, orte_grpcomm_base_output, + ORTE_OUTPUT_VERBOSE((2, orte_grpcomm_base_output, "%s grpcomm:base: allgather buffer received", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME))); @@ -113,7 +113,7 @@ int orte_grpcomm_base_allgather_list(opal_list_t *names, opal_buffer_t *sbuf, op orte_std_cntr_t num_peers; int rc; - OPAL_OUTPUT_VERBOSE((1, orte_grpcomm_base_output, + ORTE_OUTPUT_VERBOSE((1, orte_grpcomm_base_output, "%s grpcomm: entering allgather_list", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME))); @@ -126,7 +126,7 @@ int orte_grpcomm_base_allgather_list(opal_list_t *names, opal_buffer_t *sbuf, op /*** NON-ROOT ***/ if (OPAL_EQUAL != opal_dss.compare(&root->name, ORTE_PROC_MY_NAME, ORTE_NAME)) { /* everyone but root sends data */ - OPAL_OUTPUT_VERBOSE((2, orte_grpcomm_base_output, + ORTE_OUTPUT_VERBOSE((2, orte_grpcomm_base_output, "%s allgather_list: sending my data to %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(&root->name))); @@ -136,7 +136,7 @@ int orte_grpcomm_base_allgather_list(opal_list_t *names, opal_buffer_t *sbuf, op return ORTE_ERR_COMM_FAILURE; } - OPAL_OUTPUT_VERBOSE((2, orte_grpcomm_base_output, + ORTE_OUTPUT_VERBOSE((2, orte_grpcomm_base_output, "%s allgather_list: buffer sent", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME))); @@ -172,7 +172,7 @@ int orte_grpcomm_base_allgather_list(opal_list_t *names, opal_buffer_t *sbuf, op } OBJ_RELEASE(allgather_buf); - OPAL_OUTPUT_VERBOSE((2, orte_grpcomm_base_output, + ORTE_OUTPUT_VERBOSE((2, orte_grpcomm_base_output, "%s allgather_list: buffer received", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME))); @@ -203,7 +203,7 @@ int orte_grpcomm_base_allgather_list(opal_list_t *names, opal_buffer_t *sbuf, op /* setup the buffer that will recv the results */ allgather_buf = OBJ_NEW(opal_buffer_t); - OPAL_OUTPUT_VERBOSE((2, orte_grpcomm_base_output, + ORTE_OUTPUT_VERBOSE((2, orte_grpcomm_base_output, "%s allgather_list: waiting to recv %ld inputs", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), (long)num_peers-1)); @@ -225,7 +225,7 @@ int orte_grpcomm_base_allgather_list(opal_list_t *names, opal_buffer_t *sbuf, op return rc; } - OPAL_OUTPUT_VERBOSE((2, orte_grpcomm_base_output, + ORTE_OUTPUT_VERBOSE((2, orte_grpcomm_base_output, "%s allgather_list: received all data", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME))); @@ -259,7 +259,7 @@ int orte_grpcomm_base_allgather_list(opal_list_t *names, opal_buffer_t *sbuf, op ORTE_PROGRESSED_WAIT(false, allgather_num_sent, num_peers-1); - OPAL_OUTPUT_VERBOSE((1, orte_grpcomm_base_output, + ORTE_OUTPUT_VERBOSE((1, orte_grpcomm_base_output, "%s grpcomm: allgather_list completed", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME))); diff --git a/orte/mca/grpcomm/base/grpcomm_base_modex.c b/orte/mca/grpcomm/base/grpcomm_base_modex.c index d33bacdf37..c6c0396e33 100644 --- a/orte/mca/grpcomm/base/grpcomm_base_modex.c +++ b/orte/mca/grpcomm/base/grpcomm_base_modex.c @@ -27,7 +27,7 @@ #endif /* HAVE_SYS_TIME_H */ #include "opal/threads/condition.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "opal/util/bit_ops.h" #include "opal/class/opal_hash_table.h" @@ -245,7 +245,7 @@ modex_lookup_orte_proc(const orte_process_name_t *orte_proc) for it */ proc_data = OBJ_NEW(modex_proc_data_t); if (NULL == proc_data) { - opal_output(0, "grpcomm_basic_modex_lookup_orte_proc: unable to allocate modex_proc_data_t\n"); + orte_output(0, "grpcomm_basic_modex_lookup_orte_proc: unable to allocate modex_proc_data_t\n"); OPAL_THREAD_UNLOCK(&mutex); return NULL; } @@ -336,7 +336,7 @@ int orte_grpcomm_base_get_proc_attr(const orte_process_name_t proc, /* copy the data out to the user */ if ((NULL == attr_data) || (attr_data->attr_data_size == 0)) { - OPAL_OUTPUT_VERBOSE((5, orte_grpcomm_base_output, + ORTE_OUTPUT_VERBOSE((5, orte_grpcomm_base_output, "%s grpcomm:get_proc_attr: no attr avail or zero byte size", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME))); *val = NULL; @@ -369,7 +369,7 @@ int orte_grpcomm_base_modex(opal_list_t *procs) modex_attr_data_t *attr_data; int rc; - OPAL_OUTPUT_VERBOSE((1, orte_grpcomm_base_output, + ORTE_OUTPUT_VERBOSE((1, orte_grpcomm_base_output, "%s grpcomm: modex entered", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME))); @@ -383,7 +383,7 @@ int orte_grpcomm_base_modex(opal_list_t *procs) goto cleanup; } - OPAL_OUTPUT_VERBOSE((5, orte_grpcomm_base_output, + ORTE_OUTPUT_VERBOSE((5, orte_grpcomm_base_output, "%s modex: reporting %ld entries", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), (long)num_entries)); @@ -406,7 +406,7 @@ int orte_grpcomm_base_modex(opal_list_t *procs) } OPAL_THREAD_UNLOCK(&mutex); - OPAL_OUTPUT_VERBOSE((2, orte_grpcomm_base_output, + ORTE_OUTPUT_VERBOSE((2, orte_grpcomm_base_output, "%s modex: executing allgather", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME))); @@ -423,7 +423,7 @@ int orte_grpcomm_base_modex(opal_list_t *procs) } } - OPAL_OUTPUT_VERBOSE((2, orte_grpcomm_base_output, + ORTE_OUTPUT_VERBOSE((2, orte_grpcomm_base_output, "%s modex: processing modex info", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME))); @@ -435,7 +435,7 @@ int orte_grpcomm_base_modex(opal_list_t *procs) goto cleanup; } - OPAL_OUTPUT_VERBOSE((5, orte_grpcomm_base_output, + ORTE_OUTPUT_VERBOSE((5, orte_grpcomm_base_output, "%s modex: received %ld data bytes from %ld procs", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), (long)(rbuf.pack_ptr - rbuf.unpack_ptr), (long)num_procs)); @@ -458,7 +458,7 @@ int orte_grpcomm_base_modex(opal_list_t *procs) proc_data = modex_lookup_orte_proc(&proc_name); if (proc_data == NULL) { /* report the error */ - opal_output(0, "grpcomm_basic_modex: received modex info for unknown proc %s\n", + orte_output(0, "grpcomm_basic_modex: received modex info for unknown proc %s\n", ORTE_NAME_PRINT(&proc_name)); rc = ORTE_ERR_NOT_FOUND; goto cleanup; @@ -516,7 +516,7 @@ int orte_grpcomm_base_modex(opal_list_t *procs) */ if (NULL == (attr_data = modex_lookup_attr_data(proc_data, attr_name, true))) { - opal_output(0, "grpcomm_basic_modex: modex_lookup_attr_data failed\n"); + orte_output(0, "grpcomm_basic_modex: modex_lookup_attr_data failed\n"); OPAL_THREAD_UNLOCK(&proc_data->modex_lock); rc = ORTE_ERR_NOT_FOUND; goto cleanup; @@ -536,7 +536,7 @@ cleanup: OBJ_DESTRUCT(&buf); OBJ_DESTRUCT(&rbuf); - OPAL_OUTPUT_VERBOSE((1, orte_grpcomm_base_output, + ORTE_OUTPUT_VERBOSE((1, orte_grpcomm_base_output, "%s grpcomm: modex completed", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME))); diff --git a/orte/mca/grpcomm/base/grpcomm_base_open.c b/orte/mca/grpcomm/base/grpcomm_base_open.c index 877c99aa6e..d95baba83e 100644 --- a/orte/mca/grpcomm/base/grpcomm_base_open.c +++ b/orte/mca/grpcomm/base/grpcomm_base_open.c @@ -23,7 +23,9 @@ #include "opal/mca/mca.h" #include "opal/mca/base/base.h" #include "opal/mca/base/mca_base_param.h" -#include "opal/util/output.h" +#include "orte/util/output.h" + +#include "orte/util/output.h" #include "orte/mca/grpcomm/base/base.h" @@ -54,7 +56,7 @@ int orte_grpcomm_base_open(void) { /* Debugging / verbose output. Always have stream open, with verbose set by the mca open system... */ - orte_grpcomm_base_output = opal_output_open(NULL); + orte_grpcomm_base_output = orte_output_open(NULL, "GRPCOMM", "DEBUG", NULL); /* Open up all available components */ diff --git a/orte/mca/grpcomm/basic/grpcomm_basic_component.c b/orte/mca/grpcomm/basic/grpcomm_basic_component.c index 1a7ebed43f..05194add8c 100644 --- a/orte/mca/grpcomm/basic/grpcomm_basic_component.c +++ b/orte/mca/grpcomm/basic/grpcomm_basic_component.c @@ -34,7 +34,7 @@ #include "opal/threads/mutex.h" #include "opal/class/opal_list.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "opal/mca/mca.h" #include "opal/mca/base/mca_base_param.h" @@ -106,7 +106,7 @@ int orte_grpcomm_basic_open(void) orte_grpcomm_basic.xcast_binomial_xover = INT_MAX; orte_grpcomm_basic.xcast_linear_xover = INT_MAX; } else if (0 != strcmp(mode, "none")) { - opal_output(0, "grpcomm_basic_xcast_mode: unknown option %s - using defaults", mode); + orte_output(0, "grpcomm_basic_xcast_mode: unknown option %s - using defaults", mode); } return ORTE_SUCCESS; diff --git a/orte/mca/grpcomm/basic/grpcomm_basic_module.c b/orte/mca/grpcomm/basic/grpcomm_basic_module.c index 710a5958ad..8580c8a259 100644 --- a/orte/mca/grpcomm/basic/grpcomm_basic_module.c +++ b/orte/mca/grpcomm/basic/grpcomm_basic_module.c @@ -27,7 +27,7 @@ #endif /* HAVE_SYS_TIME_H */ #include "opal/threads/condition.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "opal/util/bit_ops.h" #include "opal/class/opal_hash_table.h" @@ -104,7 +104,7 @@ static int xcast(orte_jobid_t job, opal_buffer_t buf; orte_daemon_cmd_flag_t command; - OPAL_OUTPUT_VERBOSE((1, orte_grpcomm_base_output, + ORTE_OUTPUT_VERBOSE((1, orte_grpcomm_base_output, "%s grpcomm:xcast sent to job %s tag %ld", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_JOBID_PRINT(job), (long)tag)); @@ -220,7 +220,7 @@ static int barrier(void) int rc; struct timeval ompistart, ompistop; - OPAL_OUTPUT_VERBOSE((1, orte_grpcomm_base_output, + ORTE_OUTPUT_VERBOSE((1, orte_grpcomm_base_output, "%s grpcomm:basic entering barrier", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME))); @@ -250,7 +250,7 @@ static int barrier(void) } OBJ_DESTRUCT(&buf); - OPAL_OUTPUT_VERBOSE((2, orte_grpcomm_base_output, + ORTE_OUTPUT_VERBOSE((2, orte_grpcomm_base_output, "%s grpcomm:basic barrier sent", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME))); @@ -267,7 +267,7 @@ static int barrier(void) ORTE_PROGRESSED_WAIT(barrier_recvd, 0, 1); - OPAL_OUTPUT_VERBOSE((2, orte_grpcomm_base_output, + ORTE_OUTPUT_VERBOSE((2, orte_grpcomm_base_output, "%s grpcomm:basic received barrier release", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME))); @@ -285,7 +285,7 @@ static int barrier(void) } ORTE_PROGRESSED_WAIT(barrier_timer, 0, 1); gettimeofday(&ompistop, NULL); - opal_output(0, "%s time to complete barrier %ld usec", + orte_output(0, "%s time to complete barrier %ld usec", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), (long int)((ompistop.tv_sec - ompistart.tv_sec)*1000000 + (ompistop.tv_usec - ompistart.tv_usec))); @@ -335,7 +335,7 @@ static int allgather(opal_buffer_t *sbuf, opal_buffer_t *rbuf) opal_buffer_t coll; orte_grpcomm_coll_t coll_type=ORTE_GRPCOMM_ALLGATHER; - OPAL_OUTPUT_VERBOSE((1, orte_grpcomm_base_output, + ORTE_OUTPUT_VERBOSE((1, orte_grpcomm_base_output, "%s grpcomm:basic entering allgather", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME))); @@ -371,7 +371,7 @@ static int allgather(opal_buffer_t *sbuf, opal_buffer_t *rbuf) } OBJ_DESTRUCT(&coll); - OPAL_OUTPUT_VERBOSE((2, orte_grpcomm_base_output, + ORTE_OUTPUT_VERBOSE((2, orte_grpcomm_base_output, "%s grpcomm:basic allgather buffer sent", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME))); @@ -399,7 +399,7 @@ static int allgather(opal_buffer_t *sbuf, opal_buffer_t *rbuf) } OBJ_RELEASE(allgather_buf); - OPAL_OUTPUT_VERBOSE((2, orte_grpcomm_base_output, + ORTE_OUTPUT_VERBOSE((2, orte_grpcomm_base_output, "%s allgather buffer received", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME))); @@ -417,7 +417,7 @@ static int allgather(opal_buffer_t *sbuf, opal_buffer_t *rbuf) } ORTE_PROGRESSED_WAIT(barrier_timer, 0, 1); gettimeofday(&ompistop, NULL); - opal_output(0, "%s allgather: time to complete %ld usec", + orte_output(0, "%s allgather: time to complete %ld usec", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), (long int)((ompistop.tv_sec - ompistart.tv_sec)*1000000 + (ompistop.tv_usec - ompistart.tv_usec))); @@ -441,7 +441,7 @@ static int allgather(opal_buffer_t *sbuf, opal_buffer_t *rbuf) } - OPAL_OUTPUT_VERBOSE((1, orte_grpcomm_base_output, + ORTE_OUTPUT_VERBOSE((1, orte_grpcomm_base_output, "%s grpcomm:basic allgather completed", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME))); diff --git a/orte/mca/iof/base/iof_base_endpoint.c b/orte/mca/iof/base/iof_base_endpoint.c index f7c6ff1f94..786a764fd9 100644 --- a/orte/mca/iof/base/iof_base_endpoint.c +++ b/orte/mca/iof/base/iof_base_endpoint.c @@ -43,7 +43,7 @@ #ifdef HAVE_SIGNAL_H #include #endif /* HAVE_SIGNAL_H */ -#include "opal/util/output.h" +#include "orte/util/output.h" #include "orte/mca/rml/rml.h" #include "orte/util/name_fns.h" @@ -130,7 +130,7 @@ static void orte_iof_base_endpoint_send_cb( orte_iof_base_frag_t* frag = (orte_iof_base_frag_t*)cbdata; orte_iof_base_endpoint_t* endpoint = frag->frag_owner; opal_list_remove_item(&endpoint->ep_source_frags, &frag->super.super); - opal_output(orte_iof_base.iof_output, "iof_base_endpoint: send cb, source_frags list len: %d", + orte_output_verbose(1, orte_iof_base.iof_output, "iof_base_endpoint: send cb, source_frags list len: %d", (int) opal_list_get_size(&endpoint->ep_source_frags)); ORTE_IOF_BASE_FRAG_RETURN(frag); @@ -181,7 +181,7 @@ static void orte_iof_base_endpoint_read_handler(int fd, short flags, void *cbdat } /* Error on the connection */ - opal_output(orte_iof_base.iof_output, "iof_base_endpoint: read handler, error on read"); + orte_output_verbose(1, orte_iof_base.iof_output, "iof_base_endpoint: read handler, error on read"); orte_iof_base_endpoint_closed(endpoint); /* Fall through to send 0 byte message to other side indicating that the endpoint is now closed. */ @@ -190,7 +190,7 @@ static void orte_iof_base_endpoint_read_handler(int fd, short flags, void *cbdat /* peer has closed connection (will fall through to send a 0 byte message, therefore telling the RML side that the fd side has closed its connection) */ - opal_output(orte_iof_base.iof_output, "iof_base_endpoint: read handler, peer closed fd"); + orte_output_verbose(1, orte_iof_base.iof_output, "iof_base_endpoint: read handler, peer closed fd"); orte_iof_base_endpoint_closed(endpoint); } @@ -199,7 +199,7 @@ static void orte_iof_base_endpoint_read_handler(int fd, short flags, void *cbdat file descriptor has closed) */ frag->frag_owner = endpoint; opal_list_append(&endpoint->ep_source_frags, &frag->super.super); - opal_output(orte_iof_base.iof_output, "iof_base_endpoint: read handler, source_frags list len: %d", + orte_output_verbose(1, orte_iof_base.iof_output, "iof_base_endpoint: read handler, source_frags list len: %d", (int) opal_list_get_size(&endpoint->ep_source_frags)); frag->frag_iov[1].iov_len = frag->frag_len = rc; @@ -216,7 +216,7 @@ static void orte_iof_base_endpoint_read_handler(int fd, short flags, void *cbdat /* if window size has been exceeded - disable forwarding */ endpoint->ep_seq += frag->frag_len; if (ORTE_IOF_BASE_SEQDIFF(endpoint->ep_seq,endpoint->ep_ack) > orte_iof_base.iof_window_size) { - opal_output(orte_iof_base.iof_output, "iof_base_endpoint read handler: window exceeded -- reading disabled"); + orte_output_verbose(1, orte_iof_base.iof_output, "iof_base_endpoint read handler: window exceeded -- reading disabled"); opal_event_del(&endpoint->ep_event); } OPAL_THREAD_UNLOCK(&orte_iof_base.iof_lock); @@ -226,7 +226,7 @@ static void orte_iof_base_endpoint_read_handler(int fd, short flags, void *cbdat OBJ_RETAIN(endpoint); /* start non-blocking RML call to forward received data */ - opal_output(orte_iof_base.iof_output, "iof_base_endpoint read handler: sending data to svc"); + orte_output_verbose(1, orte_iof_base.iof_output, "iof_base_endpoint read handler: sending data to svc"); rc = orte_rml.send_nb( &orte_iof_base.iof_service, frag->frag_iov, @@ -258,7 +258,7 @@ static void orte_iof_base_endpoint_write_handler(int sd, short flags, void *user /* close connection on zero byte message */ if(frag->frag_len == 0) { - opal_output(orte_iof_base.iof_output, "iof_base_endpoint: write handler, peer closed fd"); + orte_output_verbose(1, orte_iof_base.iof_output, "iof_base_endpoint: write handler, peer closed fd"); orte_iof_base_endpoint_closed(endpoint); OPAL_THREAD_UNLOCK(&orte_iof_base.iof_lock); return; @@ -277,7 +277,7 @@ static void orte_iof_base_endpoint_write_handler(int sd, short flags, void *user /* All other errors -- to include sigpipe -- mean that Something Bad happened and we should abort in despair. */ - opal_output(orte_iof_base.iof_output, "iof_base_endpoint: write handler, error on fd"); + orte_output_verbose(1, orte_iof_base.iof_output, "iof_base_endpoint: write handler, error on fd"); orte_iof_base_endpoint_closed(endpoint); /* Send a ACK-AND-CLOSE back to the service so that it @@ -419,7 +419,7 @@ int orte_iof_base_endpoint_create( (ORTE_IOF_SINK == mode && ORTE_IOF_STDOUT == tag && 1 == fd) || (ORTE_IOF_SINK == mode && ORTE_IOF_STDERR == tag && 2 == fd))) { if((flags = fcntl(fd, F_GETFL, 0)) < 0) { - opal_output(orte_iof_base.iof_output, "[%s:%d]: fcntl(F_GETFL) failed with errno=%d\n", + orte_output_verbose(1, orte_iof_base.iof_output, "[%s:%d]: fcntl(F_GETFL) failed with errno=%d\n", __FILE__, __LINE__, errno); } else { flags |= O_NONBLOCK; @@ -470,7 +470,7 @@ int orte_iof_base_endpoint_create( endpoint); break; default: - opal_output(orte_iof_base.iof_output, "orte_iof_base_endpoint_create: invalid mode %d\n", mode); + orte_output_verbose(1, orte_iof_base.iof_output, "orte_iof_base_endpoint_create: invalid mode %d\n", mode); return ORTE_ERR_BAD_PARAM; } @@ -521,7 +521,7 @@ void orte_iof_base_endpoint_closed(orte_iof_base_endpoint_t* endpoint) written down the fd (because the process on the other side of the fd is no longer there -- we're just about to close the fd). */ - opal_output(orte_iof_base.iof_output, + orte_output_verbose(1, orte_iof_base.iof_output, "orte_iof_base_endpoint_closed: mode %s, origin [%s], tag %d", (ORTE_IOF_SOURCE == endpoint->ep_mode) ? "SOURCE" : "SINK", ORTE_NAME_PRINT(&endpoint->ep_origin), endpoint->ep_tag); @@ -639,7 +639,7 @@ int orte_iof_base_endpoint_forward( (ACKs are based on fragment length; an ACK of 0 bytes would do nothing) */ ORTE_IOF_BASE_FRAG_RETURN(frag); - opal_output(orte_iof_base.iof_output, "iof_base_endpoint: forward: peer closed fd"); + orte_output_verbose(1, orte_iof_base.iof_output, "iof_base_endpoint: forward: peer closed fd"); orte_iof_base_endpoint_closed(endpoint); OPAL_THREAD_UNLOCK(&orte_iof_base.iof_lock); return ORTE_SUCCESS; @@ -647,7 +647,7 @@ int orte_iof_base_endpoint_forward( rc = write(endpoint->ep_fd,data,len); if(rc < 0) { if (errno != EAGAIN && errno != EINTR) { - opal_output(orte_iof_base.iof_output, "iof_base_endpoint: forward: write error"); + orte_output_verbose(1, orte_iof_base.iof_output, "iof_base_endpoint: forward: write error"); orte_iof_base_endpoint_closed(endpoint); /* Send a ACK-AND-CLOSE back to the service so @@ -678,7 +678,7 @@ int orte_iof_base_endpoint_forward( list, then enable the event that will tell us when the fd becomes writeable */ if(opal_list_get_size(&endpoint->ep_sink_frags) == 1) { - opal_output(orte_iof_base.iof_output, "iof_base_endpoint forwarding frag; re-enabled reading for endpoint"); + orte_output_verbose(1, orte_iof_base.iof_output, "iof_base_endpoint forwarding frag; re-enabled reading for endpoint"); opal_event_add(&endpoint->ep_event,0); } OPAL_THREAD_UNLOCK(&orte_iof_base.iof_lock); @@ -788,7 +788,7 @@ int orte_iof_base_endpoint_ack( /* check to see if we need to reenable forwarding */ if(window_closed && window_open) { - opal_output(orte_iof_base.iof_output, "iof_base_endpoint ack; re-enabled reading for endpoint"); + orte_output_verbose(1, orte_iof_base.iof_output, "iof_base_endpoint ack; re-enabled reading for endpoint"); opal_event_add(&endpoint->ep_event, 0); } OPAL_THREAD_UNLOCK(&orte_iof_base.iof_lock); diff --git a/orte/mca/iof/base/iof_base_flush.c b/orte/mca/iof/base/iof_base_flush.c index b899e5326d..42b525a965 100644 --- a/orte/mca/iof/base/iof_base_flush.c +++ b/orte/mca/iof/base/iof_base_flush.c @@ -33,7 +33,7 @@ #ifdef HAVE_NETINET_IN_H #include #endif -#include "opal/util/output.h" +#include "orte/util/output.h" #include "orte/mca/oob/base/base.h" #include "orte/mca/iof/base/base.h" #include "orte/mca/iof/base/iof_base_endpoint.h" @@ -67,7 +67,7 @@ int orte_iof_base_flush(void) size_t pending; static int32_t lock = 0; - opal_output(orte_iof_base.iof_output, "CALLING IOF BASE FLUSH!"); + orte_output_verbose(1, orte_iof_base.iof_output, "CALLING IOF BASE FLUSH!"); if(OPAL_THREAD_ADD32(&lock,1) > 1) { OPAL_THREAD_ADD32(&lock,-1); return ORTE_SUCCESS; @@ -80,7 +80,7 @@ int orte_iof_base_flush(void) * wait on a timer callback to be called out of the event loop */ - opal_output(orte_iof_base.iof_output, + orte_output_verbose(1, orte_iof_base.iof_output, "IOF BASE FLUSH: tweaking all endpoints once"); if(opal_event_progress_thread() == false) { OPAL_THREAD_LOCK(&orte_iof_base.iof_lock); @@ -93,7 +93,7 @@ int orte_iof_base_flush(void) opal_event_loop(OPAL_EVLOOP_NONBLOCK); OPAL_THREAD_LOCK(&orte_iof_base.iof_lock); } - opal_output(orte_iof_base.iof_output, + orte_output_verbose(1, orte_iof_base.iof_output, "IOF BASE FLUSH: done tweaking all endpoints once"); orte_iof_base.iof_waiting++; @@ -124,7 +124,7 @@ int orte_iof_base_flush(void) } } } while (pending > 0); - opal_output(orte_iof_base.iof_output, "IOF BASE FLUSH: done waiting"); + orte_output_verbose(1, orte_iof_base.iof_output, "IOF BASE FLUSH: done waiting"); orte_iof_base.iof_waiting--; OPAL_THREAD_UNLOCK(&orte_iof_base.iof_lock); OPAL_THREAD_ADD32(&lock,-1); diff --git a/orte/mca/iof/base/iof_base_fragment.c b/orte/mca/iof/base/iof_base_fragment.c index 8dc5abe2c0..27fef2ca68 100644 --- a/orte/mca/iof/base/iof_base_fragment.c +++ b/orte/mca/iof/base/iof_base_fragment.c @@ -32,7 +32,7 @@ #ifdef HAVE_NETINET_IN_H #include #endif -#include "opal/util/output.h" +#include "orte/util/output.h" #include "orte/mca/rml/rml.h" #include "orte/mca/rml/rml_types.h" #include "orte/mca/iof/base/base.h" @@ -83,7 +83,7 @@ static void orte_iof_base_frag_send_cb( void* cbdata) { orte_iof_base_frag_t* frag = (orte_iof_base_frag_t*)cbdata; - opal_output(orte_iof_base.iof_output, "iof_base_fragment: ACK send done"); + orte_output_verbose(1, orte_iof_base.iof_output, "iof_base_fragment: ACK send done"); ORTE_IOF_BASE_FRAG_RETURN(frag); } @@ -102,7 +102,7 @@ int _orte_iof_base_frag_ack(orte_iof_base_frag_t* frag, bool do_close, ORTE_IOF_BASE_HDR_MSG_HTON(frag->frag_hdr.hdr_msg); /* start non-blocking OOB call to forward header */ - opal_output(orte_iof_base.iof_output, "iof_base_fragment: sending ACK"); + orte_output_verbose(1, orte_iof_base.iof_output, "iof_base_fragment: sending ACK"); rc = orte_rml.send_nb( &frag->frag_src, frag->frag_iov, @@ -112,7 +112,7 @@ int _orte_iof_base_frag_ack(orte_iof_base_frag_t* frag, bool do_close, orte_iof_base_frag_send_cb, frag); if(rc != ORTE_SUCCESS) { - opal_output(0, "orte_iof_base_frag_ack: orte_oob_send failed with status=%d\n", rc); + orte_output_verbose(1, 0, "orte_iof_base_frag_ack: orte_oob_send failed with status=%d\n", rc); } } return rc; diff --git a/orte/mca/iof/base/iof_base_fragment.h b/orte/mca/iof/base/iof_base_fragment.h index 631a90b36f..61328dde64 100644 --- a/orte/mca/iof/base/iof_base_fragment.h +++ b/orte/mca/iof/base/iof_base_fragment.h @@ -58,7 +58,7 @@ ORTE_DECLSPEC OBJ_CLASS_DECLARATION(orte_iof_base_frag_t); opal_free_list_item_t* _item; \ OPAL_FREE_LIST_GET(&orte_iof_base.iof_fragments, _item, rc); \ if(NULL == (frag = (orte_iof_base_frag_t*)_item)) { \ - opal_output(0, "ORTE_IOF_BASE_FRAG_ALLOC failed with status=%d\n", rc); \ + orte_output(0, "ORTE_IOF_BASE_FRAG_ALLOC failed with status=%d\n", rc); \ } \ frag->frag_owner = NULL; \ frag->frag_ptr = frag->frag_data; \ diff --git a/orte/mca/iof/base/iof_base_open.c b/orte/mca/iof/base/iof_base_open.c index 8bacf3328e..bcc5abef3a 100644 --- a/orte/mca/iof/base/iof_base_open.c +++ b/orte/mca/iof/base/iof_base_open.c @@ -25,10 +25,11 @@ #include "opal/mca/mca.h" #include "opal/mca/base/base.h" #include "opal/mca/base/mca_base_param.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "orte/util/name_fns.h" #include "orte/runtime/orte_globals.h" +#include "orte/util/output.h" #include "orte/mca/iof/iof.h" #include "orte/mca/iof/base/base.h" @@ -85,16 +86,7 @@ int orte_iof_base_open(void) orte_util_convert_string_to_process_name(&orte_iof_base.iof_service, str_value); free(str_value); - /* Debugging / verbose output */ - - id = mca_base_param_reg_int_name("iof", "base_verbose", - "Verbosity level for the iof framework", - false, false, 0, &int_value); - if (int_value != 0) { - orte_iof_base.iof_output = opal_output_open(NULL); - } else { - orte_iof_base.iof_output = -1; - } + orte_iof_base.iof_output = orte_output_open(NULL, "IOF", "DEBUG", NULL); /* initialize free list */ opal_free_list_init( &orte_iof_base.iof_fragments, diff --git a/orte/mca/iof/base/iof_base_select.c b/orte/mca/iof/base/iof_base_select.c index f9ff2e0e17..0b2f61a661 100644 --- a/orte/mca/iof/base/iof_base_select.c +++ b/orte/mca/iof/base/iof_base_select.c @@ -19,7 +19,7 @@ #include "orte_config.h" #include "orte/constants.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "opal/mca/mca.h" #include "opal/mca/base/base.h" #include "orte/mca/iof/iof.h" @@ -52,13 +52,13 @@ int orte_iof_base_select(void) cli = (mca_base_component_list_item_t *) item; component = (orte_iof_base_component_t *) cli->cli_component; - opal_output_verbose(10, orte_iof_base.iof_output, + orte_output_verbose(10, orte_iof_base.iof_output, "orte_iof_base_select: initializing %s component %s", component->iof_version.mca_type_name, component->iof_version.mca_component_name); if (NULL == component->iof_init) { - opal_output_verbose(10, orte_iof_base.iof_output, + orte_output_verbose(10, orte_iof_base.iof_output, "orte_iof_base_select: no init function; ignoring component"); continue; } else { @@ -70,7 +70,7 @@ int orte_iof_base_select(void) /* If the component didn't initialize, remove it from the opened list and remove it from the component repository */ if (NULL == module) { - opal_output_verbose(10, orte_iof_base.iof_output, + orte_output_verbose(10, orte_iof_base.iof_output, "orte_iof_base_select: init returned failure"); continue; } @@ -104,7 +104,7 @@ int orte_iof_base_select(void) cli = (mca_base_component_list_item_t *) item; component = (orte_iof_base_component_t *) cli->cli_component; if(component != selected_component) { - opal_output_verbose(10, orte_iof_base.iof_output, + orte_output_verbose(10, orte_iof_base.iof_output, "orte_iof_base_select: module %s unloaded", component->iof_version.mca_component_name); mca_base_component_repository_release((mca_base_component_t *) component); @@ -123,7 +123,7 @@ int orte_iof_base_select(void) /* Oops -- this shouldn't happen */ - opal_output(orte_iof_base.iof_output, "iof:select: no components found!"); + orte_output(orte_iof_base.iof_output, "iof:select: no components found!"); return ORTE_ERR_OUT_OF_RESOURCE; } diff --git a/orte/mca/iof/base/iof_base_setup.c b/orte/mca/iof/base/iof_base_setup.c index 7602b10695..a8d2dbf3f3 100644 --- a/orte/mca/iof/base/iof_base_setup.c +++ b/orte/mca/iof/base/iof_base_setup.c @@ -54,7 +54,7 @@ #include #endif -#include "opal/util/output.h" +#include "orte/util/output.h" #include "opal/util/opal_pty.h" #include "orte/mca/errmgr/errmgr.h" diff --git a/orte/mca/iof/null/iof_null_component.c b/orte/mca/iof/null/iof_null_component.c index 4474f51798..3e7bf5575e 100644 --- a/orte/mca/iof/null/iof_null_component.c +++ b/orte/mca/iof/null/iof_null_component.c @@ -19,7 +19,7 @@ #include "orte_config.h" #include "orte/util/proc_info.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "opal/runtime/opal_progress.h" #include "orte/mca/rml/rml.h" #include "opal/mca/base/base.h" diff --git a/orte/mca/iof/null/iof_null_module.c b/orte/mca/iof/null/iof_null_module.c index 0cfecd350e..640cdd83d8 100644 --- a/orte/mca/iof/null/iof_null_module.c +++ b/orte/mca/iof/null/iof_null_module.c @@ -26,7 +26,7 @@ #endif /* HAVE_UNISTD_H */ #include -#include "opal/util/output.h" +#include "orte/util/output.h" #include "orte/mca/iof/iof.h" #include "orte/mca/rml/rml.h" #include "orte/mca/rml/rml_types.h" diff --git a/orte/mca/iof/proxy/iof_proxy.c b/orte/mca/iof/proxy/iof_proxy.c index 279f7baf37..724b0da798 100644 --- a/orte/mca/iof/proxy/iof_proxy.c +++ b/orte/mca/iof/proxy/iof_proxy.c @@ -28,7 +28,7 @@ #include #endif /* HAVE_STRING_H */ -#include "opal/util/output.h" +#include "orte/util/output.h" #include "orte/mca/iof/iof.h" #include "orte/mca/rml/rml.h" @@ -90,7 +90,7 @@ int orte_iof_proxy_publish( if (orte_iof_base.iof_output >= 0) { char* name_str; orte_util_convert_process_name_to_string(&name_str, origin); - opal_output(orte_iof_base.iof_output, + orte_output_verbose(1, orte_iof_base.iof_output, "orte_iof_proxy_publish(%s,%d,%d,%d)\n", name_str, mode, tag, fd); free(name_str); @@ -132,7 +132,7 @@ int orte_iof_proxy_unpublish( #if 0 { int i = 0; - opal_output(orte_iof_base.iof_output, "%s orted: ******** ABOUT TO IOF PROXY UNPUBLISH, %d", ORTE_NAME_PRINT(orte_process_info.my_name), getpid()); + orte_output_verbose(1, orte_iof_base.iof_output, "%s orted: ******** ABOUT TO IOF PROXY UNPUBLISH, %d", ORTE_NAME_PRINT(orte_process_info.my_name), getpid()); fflush(stderr); while (0 == i) sleep(5); } diff --git a/orte/mca/iof/proxy/iof_proxy_component.c b/orte/mca/iof/proxy/iof_proxy_component.c index f2cf982fd0..710e5aa2a6 100644 --- a/orte/mca/iof/proxy/iof_proxy_component.c +++ b/orte/mca/iof/proxy/iof_proxy_component.c @@ -19,7 +19,7 @@ #include "orte_config.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "opal/runtime/opal_progress.h" #include "opal/mca/base/base.h" #include "opal/mca/base/mca_base_param.h" @@ -114,7 +114,7 @@ orte_iof_proxy_init(int* priority, bool *allow_multi_user_threads, bool *have_hi NULL ); if(rc < 0) { - opal_output(orte_iof_base.iof_output, + orte_output(orte_iof_base.iof_output, "orte_iof_proxy_init: unable to post non-blocking recv"); return NULL; } diff --git a/orte/mca/iof/proxy/iof_proxy_svc.c b/orte/mca/iof/proxy/iof_proxy_svc.c index 5a5a217680..fb3f3c7247 100644 --- a/orte/mca/iof/proxy/iof_proxy_svc.c +++ b/orte/mca/iof/proxy/iof_proxy_svc.c @@ -19,7 +19,7 @@ #include "orte_config.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "orte/mca/rml/rml.h" #include "orte/runtime/orte_globals.h" @@ -224,7 +224,7 @@ void orte_iof_proxy_svc_recv( { orte_iof_base_header_t* hdr = (orte_iof_base_header_t*)msg->iov_base; if(NULL == msg->iov_base) { - opal_output(orte_iof_base.iof_output, + orte_output(orte_iof_base.iof_output, "orte_iof_proxy_svc_recv: invalid message\n"); return; } diff --git a/orte/mca/iof/svc/iof_svc.c b/orte/mca/iof/svc/iof_svc.c index 3c1a434194..abac6b710c 100644 --- a/orte/mca/iof/svc/iof_svc.c +++ b/orte/mca/iof/svc/iof_svc.c @@ -28,7 +28,7 @@ #include #endif /* HAVE_STRING_H */ -#include "opal/util/output.h" +#include "orte/util/output.h" #include "orte/mca/oob/base/base.h" #include "orte/runtime/orte_globals.h" diff --git a/orte/mca/iof/svc/iof_svc_component.c b/orte/mca/iof/svc/iof_svc_component.c index ea0593ed2a..706f1c09f9 100644 --- a/orte/mca/iof/svc/iof_svc_component.c +++ b/orte/mca/iof/svc/iof_svc_component.c @@ -19,7 +19,7 @@ #include "orte_config.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "opal/mca/base/base.h" #include "opal/mca/base/mca_base_param.h" @@ -116,7 +116,7 @@ static void orte_iof_svc_exception_handler(const orte_process_name_t* peer, orte_rml_exception_t reason) { orte_iof_base_endpoint_t *endpoint; - opal_output(orte_iof_base.iof_output, + orte_output_verbose(1, orte_iof_base.iof_output, "iof svc exception handler! %s\n", ORTE_NAME_PRINT((orte_process_name_t*)peer)); @@ -126,7 +126,7 @@ orte_iof_svc_exception_handler(const orte_process_name_t* peer, orte_rml_excepti are recoverable events (no need to abort). */ orte_iof_svc_sub_delete_all(peer); orte_iof_svc_pub_delete_all(peer); - opal_output(orte_iof_base.iof_output, "deleted all pubs and subs\n"); + orte_output_verbose(1, orte_iof_base.iof_output, "deleted all pubs and subs\n"); /* Find any streams on any endpoints for this peer and close them */ while (NULL != @@ -137,7 +137,7 @@ orte_iof_svc_exception_handler(const orte_process_name_t* peer, orte_rml_excepti /* Delete the endpoint that we just matched */ orte_iof_base_endpoint_delete(peer, ORTE_NS_CMP_ALL, ORTE_IOF_ANY); } - opal_output(orte_iof_base.iof_output, "done with exception handler\n"); + orte_output_verbose(1, orte_iof_base.iof_output, "done with exception handler\n"); } @@ -176,7 +176,7 @@ orte_iof_svc_init(int* priority, bool *allow_multi_user_threads, bool *have_hidd NULL ); if(rc != ORTE_SUCCESS) { - opal_output(orte_iof_base.iof_output, + orte_output(orte_iof_base.iof_output, "orte_iof_svc_init: unable to post non-blocking recv"); return NULL; } diff --git a/orte/mca/iof/svc/iof_svc_proxy.c b/orte/mca/iof/svc/iof_svc_proxy.c index 9e0aa5050b..1b1b545a3f 100644 --- a/orte/mca/iof/svc/iof_svc_proxy.c +++ b/orte/mca/iof/svc/iof_svc_proxy.c @@ -20,7 +20,7 @@ #include "orte/types.h" #include "orte/constants.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "orte/mca/rml/rml.h" #include "orte/mca/errmgr/errmgr.h" @@ -72,49 +72,49 @@ void orte_iof_svc_proxy_recv( switch(hdr->hdr_common.hdr_type) { case ORTE_IOF_BASE_HDR_MSG: ORTE_IOF_BASE_HDR_MSG_NTOH(hdr->hdr_msg); - opal_output(orte_iof_base.iof_output, + orte_output_verbose(1, orte_iof_base.iof_output, "orte_iof_svc_proxy_recv: HDR_MSG\n"); orte_iof_svc_proxy_msg(peer, &hdr->hdr_msg, ((unsigned char*)iov[0].iov_base)+sizeof(orte_iof_base_header_t)); break; case ORTE_IOF_BASE_HDR_ACK: ORTE_IOF_BASE_HDR_MSG_NTOH(hdr->hdr_msg); - opal_output(orte_iof_base.iof_output, + orte_output_verbose(1, orte_iof_base.iof_output, "orte_iof_svc_proxy_recv: HDR_ACK\n"); orte_iof_svc_proxy_ack(peer, &hdr->hdr_msg, false); break; case ORTE_IOF_BASE_HDR_CLOSE: ORTE_IOF_BASE_HDR_MSG_NTOH(hdr->hdr_msg); - opal_output(orte_iof_base.iof_output, + orte_output_verbose(1, orte_iof_base.iof_output, "orte_iof_svc_proxy_recv: HDR_CLOSE\n"); orte_iof_svc_proxy_ack(peer, &hdr->hdr_msg, true); break; case ORTE_IOF_BASE_HDR_PUB: ORTE_IOF_BASE_HDR_PUB_NTOH(hdr->hdr_pub); - opal_output(orte_iof_base.iof_output, + orte_output_verbose(1, orte_iof_base.iof_output, "orte_iof_svc_proxy_recv: HDR_PUB\n"); orte_iof_svc_proxy_pub(peer, &hdr->hdr_pub); break; case ORTE_IOF_BASE_HDR_UNPUB: ORTE_IOF_BASE_HDR_PUB_NTOH(hdr->hdr_pub); - opal_output(orte_iof_base.iof_output, + orte_output_verbose(1, orte_iof_base.iof_output, "orte_iof_svc_proxy_recv: HDR_UNPUB\n"); orte_iof_svc_proxy_unpub(peer, &hdr->hdr_pub); break; case ORTE_IOF_BASE_HDR_SUB: ORTE_IOF_BASE_HDR_SUB_NTOH(hdr->hdr_sub); - opal_output(orte_iof_base.iof_output, + orte_output_verbose(1, orte_iof_base.iof_output, "orte_iof_svc_proxy_recv: HDR_SUB\n"); orte_iof_svc_proxy_sub(peer, &hdr->hdr_sub); break; case ORTE_IOF_BASE_HDR_UNSUB: ORTE_IOF_BASE_HDR_SUB_NTOH(hdr->hdr_sub); - opal_output(orte_iof_base.iof_output, + orte_output_verbose(1, orte_iof_base.iof_output, "orte_iof_svc_proxy_recv: HDR_UNSUB\n"); orte_iof_svc_proxy_unsub(peer, &hdr->hdr_sub); break; default: - opal_output(orte_iof_base.iof_output, + orte_output_verbose(1, orte_iof_base.iof_output, "orte_iof_svc_recv: invalid message type: %d (ignored)\n", hdr->hdr_common.hdr_type); break; @@ -159,7 +159,7 @@ static void orte_iof_svc_proxy_msg( { opal_list_item_t* item; bool forwarded_at_all = false, forward = false; - opal_output(orte_iof_base.iof_output, + orte_output_verbose(1, orte_iof_base.iof_output, "orte_iof_svc_proxy_msg: tag %d seq %d", hdr->msg_tag,hdr->msg_seq); @@ -178,7 +178,7 @@ static void orte_iof_svc_proxy_msg( /* if the subscription origin doesn't match the message's origin, skip this subscription */ if (OPAL_EQUAL == orte_util_compare_name_fields(sub->origin_mask,&sub->origin_name,&hdr->msg_origin)) { - opal_output(orte_iof_base.iof_output, "sub MATCH: origin %s, msg origin %s, msg proxy %s orte_iof_svc_proxy_msg: tag %d sequence %d, len %d", + orte_output_verbose(1, orte_iof_base.iof_output, "sub MATCH: origin %s, msg origin %s, msg proxy %s orte_iof_svc_proxy_msg: tag %d sequence %d, len %d", ORTE_NAME_PRINT(&sub->origin_name), ORTE_NAME_PRINT(&hdr->msg_origin), ORTE_NAME_PRINT(&hdr->msg_proxy), @@ -201,7 +201,7 @@ static void orte_iof_svc_proxy_msg( orte_iof_base_frag_t* frag; int rc; - opal_output(orte_iof_base.iof_output, "no sub match found -- dropped"); + orte_output_verbose(1, orte_iof_base.iof_output, "no sub match found -- dropped"); ORTE_IOF_BASE_FRAG_ALLOC(frag,rc); if(NULL == frag) { ORTE_ERROR_LOG(rc); @@ -248,7 +248,7 @@ static void orte_iof_svc_proxy_pub( orte_iof_base_pub_header_t* hdr) { int rc; - opal_output(orte_iof_base.iof_output, "orte_iof_svc_proxy_pub: mask %d, tag %d, proc %s, proxy %s", + orte_output_verbose(1, orte_iof_base.iof_output, "orte_iof_svc_proxy_pub: mask %d, tag %d, proc %s, proxy %s", hdr->pub_mask, hdr->pub_tag, ORTE_NAME_PRINT(&hdr->pub_name), ORTE_NAME_PRINT(&hdr->pub_proxy)); @@ -273,7 +273,7 @@ static void orte_iof_svc_proxy_unpub( orte_iof_base_pub_header_t* hdr) { int rc; - opal_output(orte_iof_base.iof_output, "orte_iof_svc_proxy_unpub: mask %d, tag %d, proc %s, proxy %s", + orte_output_verbose(1, orte_iof_base.iof_output, "orte_iof_svc_proxy_unpub: mask %d, tag %d, proc %s, proxy %s", hdr->pub_mask, hdr->pub_tag, ORTE_NAME_PRINT(&hdr->pub_name), ORTE_NAME_PRINT(&hdr->pub_proxy)); @@ -299,7 +299,7 @@ static void orte_iof_svc_proxy_sub( orte_iof_base_sub_header_t* hdr) { int rc; - opal_output(orte_iof_base.iof_output, "orte_iof_svc_proxy_sub"); + orte_output_verbose(1, orte_iof_base.iof_output, "orte_iof_svc_proxy_sub"); rc = orte_iof_svc_sub_create( &hdr->origin_name, @@ -322,7 +322,7 @@ static void orte_iof_svc_proxy_unsub( orte_iof_base_sub_header_t* hdr) { int rc; - opal_output(orte_iof_base.iof_output, "orte_iof_svc_proxy_unsub"); + orte_output_verbose(1, orte_iof_base.iof_output, "orte_iof_svc_proxy_unsub"); rc = orte_iof_svc_sub_delete( &hdr->origin_name, diff --git a/orte/mca/iof/svc/iof_svc_pub.c b/orte/mca/iof/svc/iof_svc_pub.c index 9ba5d07905..bbf5ef2d5e 100644 --- a/orte/mca/iof/svc/iof_svc_pub.c +++ b/orte/mca/iof/svc/iof_svc_pub.c @@ -20,7 +20,7 @@ #include "orte/types.h" #include "orte/constants.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "orte/util/name_fns.h" @@ -77,7 +77,7 @@ int orte_iof_svc_pub_create( pub->pub_tag = pub_tag; pub->pub_endpoint = orte_iof_base_endpoint_match(pub_name,pub_mask,pub_tag); - opal_output(orte_iof_base.iof_output, "created svc pub, name %s, proxy %s, tag %d / mask %x, endpoint %p\n", + orte_output_verbose(1, orte_iof_base.iof_output, "created svc pub, name %s, proxy %s, tag %d / mask %x, endpoint %p\n", ORTE_NAME_PRINT((orte_process_name_t*)pub_name), ORTE_NAME_PRINT((orte_process_name_t*)pub_proxy), pub_tag, pub_mask, (char*) pub->pub_endpoint); diff --git a/orte/mca/iof/svc/iof_svc_sub.c b/orte/mca/iof/svc/iof_svc_sub.c index 1ccb91856a..f2602a5726 100644 --- a/orte/mca/iof/svc/iof_svc_sub.c +++ b/orte/mca/iof/svc/iof_svc_sub.c @@ -20,7 +20,7 @@ #include -#include "opal/util/output.h" +#include "orte/util/output.h" #include "opal/class/opal_hash_table.h" #include "orte/mca/rml/rml.h" @@ -107,7 +107,7 @@ int orte_iof_svc_sub_create( sub->target_mask = target_mask; sub->target_tag = target_tag; sub->sub_endpoint = orte_iof_base_endpoint_match(&sub->target_name, sub->target_mask, sub->target_tag); - opal_output(orte_iof_base.iof_output, "created svc sub, origin %s tag %d / mask %x, target %s, tag %d / mask %x\n", + orte_output_verbose(1, orte_iof_base.iof_output, "created svc sub, origin %s tag %d / mask %x, target %s, tag %d / mask %x\n", ORTE_NAME_PRINT((orte_process_name_t*)origin_name), origin_tag, origin_mask, ORTE_NAME_PRINT((orte_process_name_t*)target_name), target_tag, target_mask); @@ -175,9 +175,9 @@ void orte_iof_svc_sub_ack( void *vval; } value; - opal_output(orte_iof_base.iof_output, "orte_iof_svc_proxy_ack"); + orte_output_verbose(1, orte_iof_base.iof_output, "orte_iof_svc_proxy_ack"); if (do_close) { - opal_output(orte_iof_base.iof_output, "CLOSE ACK!\n"); + orte_output_verbose(1, orte_iof_base.iof_output, "CLOSE ACK!\n"); } /* for each of the subscriptions that match the origin of the ACK: @@ -194,7 +194,7 @@ void orte_iof_svc_sub_ack( orte_iof_svc_sub_t* sub = (orte_iof_svc_sub_t*)s_item; opal_list_item_t *f_item; - opal_output(orte_iof_base.iof_output, "ack: checking sub origin %s tag %d / mask %x, target %s, tag %d / mask %x\n", + orte_output_verbose(1, orte_iof_base.iof_output, "ack: checking sub origin %s tag %d / mask %x, target %s, tag %d / mask %x\n", ORTE_NAME_PRINT(&sub->origin_name), sub->origin_tag, sub->origin_mask, ORTE_NAME_PRINT(&sub->target_name), sub->target_tag, sub->target_mask); @@ -216,7 +216,7 @@ void orte_iof_svc_sub_ack( last_ack_forwarded = sub->last_ack_forwarded; } } - opal_output(orte_iof_base.iof_output, + orte_output_verbose(1, orte_iof_base.iof_output, "ack: has_beed_acked: %d, last forwarded %d", has_been_acked, last_ack_forwarded); @@ -232,11 +232,11 @@ void orte_iof_svc_sub_ack( to NULL. Have similar leak for do_close for streams. See ticket #1048. */ sub->sub_endpoint = NULL; - opal_output(orte_iof_base.iof_output, + orte_output_verbose(1, orte_iof_base.iof_output, "ack: CLOSED local ack to %u", value.uval); } else { value.uval = hdr->msg_seq + hdr->msg_len; - opal_output(orte_iof_base.iof_output, + orte_output_verbose(1, orte_iof_base.iof_output, "ack: local ack to %u", value.uval); if (value.uval < seq_min) { seq_min = value.uval; @@ -254,7 +254,7 @@ void orte_iof_svc_sub_ack( orte_iof_svc_pub_t* pub = fwd->fwd_pub; bool value_set = true; - opal_output(orte_iof_base.iof_output, "ack: checking fwd %s tag %d / mask %x\n", + orte_output_verbose(1, orte_iof_base.iof_output, "ack: checking fwd %s tag %d / mask %x\n", ORTE_NAME_PRINT(&pub->pub_name), pub->pub_tag, pub->pub_mask); /* If the publication origin or publication proxy matches @@ -262,7 +262,7 @@ void orte_iof_svc_sub_ack( *origin* (not the proxy). */ if (OPAL_EQUAL == orte_util_compare_name_fields(pub->pub_mask,&pub->pub_name,peer) || OPAL_EQUAL == orte_util_compare_name_fields(ORTE_NS_CMP_ALL,&pub->pub_proxy,peer)) { - opal_output(orte_iof_base.iof_output, + orte_output_verbose(1, orte_iof_base.iof_output, "ack: found matching pub"); /* If we're closing, then remove this proc from the table -- we won't be using its value to @@ -327,7 +327,7 @@ void orte_iof_svc_sub_ack( ORTE_NS_CMP_ALL, hdr->msg_tag); if (NULL != endpoint) { - opal_output(orte_iof_base.iof_output, + orte_output_verbose(1, orte_iof_base.iof_output, "ack: forwarding ack locally: %u", seq_min); orte_iof_base_endpoint_ack(endpoint, seq_min); OBJ_RELEASE(endpoint); @@ -350,7 +350,7 @@ void orte_iof_svc_sub_ack( frag->frag_iov[0].iov_len = sizeof(frag->frag_hdr); ORTE_IOF_BASE_HDR_MSG_HTON(frag->frag_hdr.hdr_msg); - opal_output(orte_iof_base.iof_output, + orte_output_verbose(1, orte_iof_base.iof_output, "ack: forwarding ack remotely: %u", seq_min); rc = orte_rml.send_nb( &hdr->msg_proxy, @@ -465,12 +465,12 @@ int orte_iof_svc_sub_forward( int rc; if (NULL != pub->pub_endpoint) { - opal_output(orte_iof_base.iof_output, "sub_forward: forwarding to pub local endpoint"); + orte_output_verbose(1, orte_iof_base.iof_output, "sub_forward: forwarding to pub local endpoint"); rc = orte_iof_base_endpoint_forward(pub->pub_endpoint,src,hdr,data); } else { /* forward */ orte_iof_base_frag_t* frag; - opal_output(orte_iof_base.iof_output, "sub_forward: forwarding to pub stream / remote endpoint"); + orte_output_verbose(1, orte_iof_base.iof_output, "sub_forward: forwarding to pub stream / remote endpoint"); ORTE_IOF_BASE_FRAG_ALLOC(frag,rc); frag->frag_hdr.hdr_msg = *hdr; frag->frag_len = frag->frag_hdr.hdr_msg.msg_len; @@ -495,7 +495,7 @@ int orte_iof_svc_sub_forward( *forward = true; } if (NULL != sub->sub_endpoint) { - opal_output(orte_iof_base.iof_output, "sub_forward: forwarding to sub local endpoint"); + orte_output_verbose(1, orte_iof_base.iof_output, "sub_forward: forwarding to sub local endpoint"); *forward = true; return orte_iof_base_endpoint_forward(sub->sub_endpoint,src,hdr,data); } @@ -562,7 +562,7 @@ int orte_iof_svc_fwd_create( } OBJ_RETAIN(pub); fwd->fwd_pub = pub; - opal_output(orte_iof_base.iof_output, "created svc forward, sub origin %s, tag %d / mask %x, sub target %s, tag %d / mask %x :::: pub name %s, tag %d / mask %x\n", + orte_output_verbose(1, orte_iof_base.iof_output, "created svc forward, sub origin %s, tag %d / mask %x, sub target %s, tag %d / mask %x :::: pub name %s, tag %d / mask %x\n", ORTE_NAME_PRINT(&sub->origin_name), sub->origin_tag, sub->origin_mask, ORTE_NAME_PRINT(&sub->target_name), sub->target_tag, diff --git a/orte/mca/odls/base/odls_base_default_fns.c b/orte/mca/odls/base/odls_base_default_fns.c index f9ea0ce422..b3b5da54b5 100644 --- a/orte/mca/odls/base/odls_base_default_fns.c +++ b/orte/mca/odls/base/odls_base_default_fns.c @@ -36,7 +36,6 @@ #include "opal/util/os_path.h" #include "opal/util/num_procs.h" #include "opal/util/sys_limits.h" -#include "opal/util/show_help.h" #include "opal/class/opal_pointer_array.h" #include "opal/dss/dss.h" @@ -208,7 +207,7 @@ int orte_odls_base_default_construct_child_list(opal_buffer_t *data, orte_namelist_t *nm; opal_list_t daemon_tree; - OPAL_OUTPUT_VERBOSE((5, orte_odls_globals.output, + ORTE_OUTPUT_VERBOSE((5, orte_odls_globals.output, "%s odls:constructing child list", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME))); @@ -274,7 +273,7 @@ int orte_odls_base_default_construct_child_list(opal_buffer_t *data, goto REPORT_ERROR; } - OPAL_OUTPUT_VERBOSE((5, orte_odls_globals.output, + ORTE_OUTPUT_VERBOSE((5, orte_odls_globals.output, "%s odls:construct_child_list unpacking data to launch job %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_JOBID_PRINT(*job))); @@ -292,7 +291,7 @@ int orte_odls_base_default_construct_child_list(opal_buffer_t *data, /* is this the specified job? */ if (jdat->jobid == *job) { - OPAL_OUTPUT_VERBOSE((5, orte_odls_globals.output, + ORTE_OUTPUT_VERBOSE((5, orte_odls_globals.output, "%s odls:construct_child_list found existing jobdat for job %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_JOBID_PRINT(*job))); break; @@ -300,7 +299,7 @@ int orte_odls_base_default_construct_child_list(opal_buffer_t *data, } if (NULL == jobdat) { /* setup jobdat object for this job */ - OPAL_OUTPUT_VERBOSE((5, orte_odls_globals.output, + ORTE_OUTPUT_VERBOSE((5, orte_odls_globals.output, "%s odls:construct_child_list adding new jobdat for job %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_JOBID_PRINT(*job))); jobdat = OBJ_NEW(orte_odls_job_t); @@ -321,7 +320,7 @@ int orte_odls_base_default_construct_child_list(opal_buffer_t *data, ORTE_ERROR_LOG(rc); goto REPORT_ERROR; } - OPAL_OUTPUT_VERBOSE((5, orte_odls_globals.output, + ORTE_OUTPUT_VERBOSE((5, orte_odls_globals.output, "%s odls:construct_child_list unpacking %ld app_contexts", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), (long)jobdat->num_apps)); @@ -367,7 +366,7 @@ int orte_odls_base_default_construct_child_list(opal_buffer_t *data, /* does this data belong to us? */ if ((int32_t)ORTE_PROC_MY_NAME->vpid == jobdat->procmap[j].node) { - OPAL_OUTPUT_VERBOSE((5, orte_odls_globals.output, + ORTE_OUTPUT_VERBOSE((5, orte_odls_globals.output, "%s odls:constructing child list - found proc %s for me!", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_VPID_PRINT(j))); @@ -791,13 +790,13 @@ int orte_odls_base_default_launch_local(orte_jobid_t job, want_processor = false; /* default to not being a hog */ oversubscribed = true; - OPAL_OUTPUT_VERBOSE((5, orte_odls_globals.output, + ORTE_OUTPUT_VERBOSE((5, orte_odls_globals.output, "%s odls:launch could not get number of processors - using conservative settings", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME))); } else { - OPAL_OUTPUT_VERBOSE((5, orte_odls_globals.output, + ORTE_OUTPUT_VERBOSE((5, orte_odls_globals.output, "%s odls:launch got %ld processors", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), (long)num_processors)); @@ -824,7 +823,7 @@ int orte_odls_base_default_launch_local(orte_jobid_t job, } } - OPAL_OUTPUT_VERBOSE((5, orte_odls_globals.output, + ORTE_OUTPUT_VERBOSE((5, orte_odls_globals.output, "%s odls:launch oversubscribed set to %s want_processor set to %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), oversubscribed ? "true" : "false", want_processor ? "true" : "false")); @@ -841,7 +840,7 @@ int orte_odls_base_default_launch_local(orte_jobid_t job, oversubscribed, &apps[i]->env))) { - OPAL_OUTPUT_VERBOSE((10, orte_odls_globals.output, + ORTE_OUTPUT_VERBOSE((10, orte_odls_globals.output, "%s odls:launch:setup_fork failed with error %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_ERROR_NAME(rc))); @@ -885,7 +884,7 @@ int orte_odls_base_default_launch_local(orte_jobid_t job, */ if (child->alive) { - OPAL_OUTPUT_VERBOSE((5, orte_odls_globals.output, + ORTE_OUTPUT_VERBOSE((5, orte_odls_globals.output, "%s odls:launch child %s is already alive", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(child->name))); @@ -899,7 +898,7 @@ int orte_odls_base_default_launch_local(orte_jobid_t job, */ if (OPAL_EQUAL != opal_dss.compare(&job, &(child->name->jobid), ORTE_JOBID)) { - OPAL_OUTPUT_VERBOSE((5, orte_odls_globals.output, + ORTE_OUTPUT_VERBOSE((5, orte_odls_globals.output, "%s odls:launch child %s is not in job %s being launched", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(child->name), @@ -1029,13 +1028,13 @@ int orte_odls_base_default_launch_local(orte_jobid_t job, } #endif #endif - if (5 < opal_output_get_verbosity(orte_odls_globals.output)) { - opal_output(orte_odls_globals.output, "%s odls:launch: spawning child %s", + if (5 < orte_output_get_verbosity(orte_odls_globals.output)) { + orte_output(orte_odls_globals.output, "%s odls:launch: spawning child %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(child->name)); /* dump what is going to be exec'd */ - if (7 < opal_output_get_verbosity(orte_odls_globals.output)) { + if (7 < orte_output_get_verbosity(orte_odls_globals.output)) { opal_dss.dump(orte_odls_globals.output, app, ORTE_APP_CONTEXT); } } @@ -1060,7 +1059,7 @@ int orte_odls_base_default_launch_local(orte_jobid_t job, launch_failed = false; CLEANUP: - OPAL_OUTPUT_VERBOSE((5, orte_odls_globals.output, + ORTE_OUTPUT_VERBOSE((5, orte_odls_globals.output, "%s odls:launch reporting job %s launch status", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_JOBID_PRINT(job))); @@ -1085,7 +1084,7 @@ CLEANUP: OBJ_DESTRUCT(&alert); if (!launch_failed) { - OPAL_OUTPUT_VERBOSE((5, orte_odls_globals.output, + ORTE_OUTPUT_VERBOSE((5, orte_odls_globals.output, "%s odls:launch setting waitpids", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME))); @@ -1132,7 +1131,7 @@ int orte_odls_base_default_deliver_message(orte_jobid_t job, opal_buffer_t *buff continue; } - OPAL_OUTPUT_VERBOSE((5, orte_odls_globals.output, + ORTE_OUTPUT_VERBOSE((5, orte_odls_globals.output, "%s odls: sending message to tag %lu on child %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), (unsigned long)tag, ORTE_NAME_PRINT(child->name))); @@ -1165,7 +1164,7 @@ int orte_odls_base_default_signal_local_procs(const orte_process_name_t *proc, i opal_list_item_t *item; orte_odls_child_t *child; - OPAL_OUTPUT_VERBOSE((5, orte_odls_globals.output, + ORTE_OUTPUT_VERBOSE((5, orte_odls_globals.output, "%s odls: signaling proc %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), (NULL == proc) ? "NULL" : ORTE_NAME_PRINT(proc))); @@ -1336,7 +1335,7 @@ int orte_odls_base_default_require_sync(orte_process_name_t *proc, /* find this child */ if (OPAL_EQUAL == opal_dss.compare(proc, child->name, ORTE_NAME)) { - OPAL_OUTPUT_VERBOSE((5, orte_odls_globals.output, + ORTE_OUTPUT_VERBOSE((5, orte_odls_globals.output, "%s odls: registering sync on child %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(child->name))); @@ -1397,7 +1396,7 @@ int orte_odls_base_default_require_sync(orte_process_name_t *proc, ORTE_ERROR_LOG(ORTE_ERR_NOT_FOUND); goto CLEANUP; } - OPAL_OUTPUT_VERBOSE((5, orte_odls_globals.output, + ORTE_OUTPUT_VERBOSE((5, orte_odls_globals.output, "%s odls:sync nidmap requested for job %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_JOBID_PRINT(jobdat->jobid))); @@ -1408,7 +1407,7 @@ int orte_odls_base_default_require_sync(orte_process_name_t *proc, opal_dss.pack(&buffer, &jobdat->pmap, 1, OPAL_BYTE_OBJECT); } - OPAL_OUTPUT_VERBOSE((5, orte_odls_globals.output, + ORTE_OUTPUT_VERBOSE((5, orte_odls_globals.output, "%s odls: sending sync ack to child %s with %ld bytes of data", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(proc), (long)buffer.bytes_used)); @@ -1427,7 +1426,7 @@ int orte_odls_base_default_require_sync(orte_process_name_t *proc, * else that needs it */ - OPAL_OUTPUT_VERBOSE((5, orte_odls_globals.output, + ORTE_OUTPUT_VERBOSE((5, orte_odls_globals.output, "%s odls: sending contact info to HNP", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME))); @@ -1507,7 +1506,7 @@ void odls_base_default_wait_local_proc(pid_t pid, int status, void* cbdata) opal_buffer_t alert; orte_plm_cmd_flag_t cmd=ORTE_PLM_UPDATE_PROC_STATE; - OPAL_OUTPUT_VERBOSE((5, orte_odls_globals.output, + ORTE_OUTPUT_VERBOSE((5, orte_odls_globals.output, "%s odls:wait_local_proc child process %ld terminated", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), (long)pid)); @@ -1534,7 +1533,7 @@ void odls_base_default_wait_local_proc(pid_t pid, int status, void* cbdata) * means we are detecting it exiting multiple times */ - OPAL_OUTPUT_VERBOSE((5, orte_odls_globals.output, + ORTE_OUTPUT_VERBOSE((5, orte_odls_globals.output, "%s odls:wait_local_proc did not find pid %ld in table!", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), (long)pid)); @@ -1549,7 +1548,7 @@ GOTCHILD: * ensure that its exit state gets reported to avoid hanging */ if (!child->alive) { - OPAL_OUTPUT_VERBOSE((5, orte_odls_globals.output, + ORTE_OUTPUT_VERBOSE((5, orte_odls_globals.output, "%s odls:wait_local_proc child %s was already dead", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(child->name))); @@ -1570,7 +1569,7 @@ GOTCHILD: exception is detected and handled (in which case this unpublish request will be ignored/discarded. */ - OPAL_OUTPUT_VERBOSE((5, orte_odls_globals.output, + ORTE_OUTPUT_VERBOSE((5, orte_odls_globals.output, "%s odls:wait_local_proc pid %ld corresponds to %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), (long)pid, @@ -1585,7 +1584,7 @@ GOTCHILD: } } - OPAL_OUTPUT_VERBOSE((5, orte_odls_globals.output, + ORTE_OUTPUT_VERBOSE((5, orte_odls_globals.output, "%s odls:wait_local_proc orted sent IOF unpub message!", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME))); @@ -1623,7 +1622,7 @@ GOTCHILD: abort_file = opal_os_path(false, orte_process_info.tmpdir_base, orte_process_info.top_session_dir, job, vpid, "abort", NULL ); - OPAL_OUTPUT_VERBOSE((5, orte_odls_globals.output, + ORTE_OUTPUT_VERBOSE((5, orte_odls_globals.output, "%s odls:wait_local_proc checking abort file %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), abort_file)); @@ -1634,7 +1633,7 @@ GOTCHILD: * meer existence indicates that an abnormal termination occurred */ - OPAL_OUTPUT_VERBOSE((5, orte_odls_globals.output, + ORTE_OUTPUT_VERBOSE((5, orte_odls_globals.output, "%s odls:wait_local_proc child %s died by abort", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(child->name))); @@ -1653,7 +1652,7 @@ GOTCHILD: aborted = true; child->state = ORTE_PROC_STATE_TERM_WO_SYNC; - OPAL_OUTPUT_VERBOSE((5, orte_odls_globals.output, + ORTE_OUTPUT_VERBOSE((5, orte_odls_globals.output, "%s odls:wait_local_proc child process %s terminated normally " "but did not provide a required sync - it " "will be treated as an abnormal termination", @@ -1665,7 +1664,7 @@ GOTCHILD: child->state = ORTE_PROC_STATE_TERMINATED; } - OPAL_OUTPUT_VERBOSE((5, orte_odls_globals.output, + ORTE_OUTPUT_VERBOSE((5, orte_odls_globals.output, "%s odls:wait_local_proc child process %s terminated normally", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(child->name))); @@ -1687,7 +1686,7 @@ GOTCHILD: */ child->exit_code = WTERMSIG(status) + 128; - OPAL_OUTPUT_VERBOSE((5, orte_odls_globals.output, + ORTE_OUTPUT_VERBOSE((5, orte_odls_globals.output, "%s odls:wait_local_proc child process %s terminated with signal", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(child->name))); @@ -1728,7 +1727,7 @@ MOVEON: goto unlock; } - OPAL_OUTPUT_VERBOSE((5, orte_odls_globals.output, + ORTE_OUTPUT_VERBOSE((5, orte_odls_globals.output, "%s odls:wait_local_proc reporting proc %s aborted to HNP", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(child->name))); @@ -1762,7 +1761,7 @@ MOVEON: goto unlock; } - OPAL_OUTPUT_VERBOSE((5, orte_odls_globals.output, + ORTE_OUTPUT_VERBOSE((5, orte_odls_globals.output, "%s odls:wait_local_proc reporting all procs in %s terminated", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_JOBID_PRINT(child->name->jobid))); @@ -1807,7 +1806,7 @@ int orte_odls_base_default_kill_local_procs(orte_jobid_t job, bool set_state, OBJ_CONSTRUCT(&procs_killed, opal_list_t); - OPAL_OUTPUT_VERBOSE((5, orte_odls_globals.output, + ORTE_OUTPUT_VERBOSE((5, orte_odls_globals.output, "%s odls:kill_local_proc working on job %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_JOBID_PRINT(job))); @@ -1840,7 +1839,7 @@ int orte_odls_base_default_kill_local_procs(orte_jobid_t job, bool set_state, next = opal_list_get_next(item); - OPAL_OUTPUT_VERBOSE((5, orte_odls_globals.output, + ORTE_OUTPUT_VERBOSE((5, orte_odls_globals.output, "%s odls:kill_local_proc checking child process %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(child->name))); @@ -1851,7 +1850,7 @@ int orte_odls_base_default_kill_local_procs(orte_jobid_t job, bool set_state, */ if (OPAL_EQUAL != opal_dss.compare(&job, &(child->name->jobid), ORTE_JOBID)) { - OPAL_OUTPUT_VERBOSE((5, orte_odls_globals.output, + ORTE_OUTPUT_VERBOSE((5, orte_odls_globals.output, "%s odls:kill_local_proc child %s is not part of job %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(child->name), @@ -1887,7 +1886,7 @@ int orte_odls_base_default_kill_local_procs(orte_jobid_t job, bool set_state, */ if (!child->alive) { - OPAL_OUTPUT_VERBOSE((5, orte_odls_globals.output, + ORTE_OUTPUT_VERBOSE((5, orte_odls_globals.output, "%s odls:kill_local_proc child %s is not alive", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(child->name))); @@ -1909,7 +1908,7 @@ int orte_odls_base_default_kill_local_procs(orte_jobid_t job, bool set_state, /* Send a sigterm to the process. If we get ESRCH back, that means the process is already dead, so just move on. */ if (0 != (err = kill_local(child->pid, SIGTERM))) { - opal_show_help("help-odls-default.txt", + orte_show_help("help-odls-default.txt", "odls-default:could-not-send-kill", true, orte_process_info.nodename, child->pid, err); /* check the proc state - ensure it is in one of the termination @@ -1935,7 +1934,7 @@ int orte_odls_base_default_kill_local_procs(orte_jobid_t job, bool set_state, kill_local(child->pid, SIGKILL); /* Double check that it actually died this time */ if (!child_died(child->pid, orte_odls_globals.timeout_before_sigkill, &exit_status)) { - opal_show_help("help-odls-default.txt", + orte_show_help("help-odls-default.txt", "odls-default:could-not-kill", true, orte_process_info.nodename, child->pid); } @@ -2023,7 +2022,7 @@ static int daemon_collective(orte_process_name_t *sender, opal_buffer_t *data) orte_process_name_t my_parent; int rc; - OPAL_OUTPUT_VERBOSE((5, orte_odls_globals.output, + ORTE_OUTPUT_VERBOSE((5, orte_odls_globals.output, "%s odls: daemon collective called", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME))); @@ -2081,7 +2080,7 @@ static int daemon_collective(orte_process_name_t *sender, opal_buffer_t *data) /* count the number of participants collected */ jobdat->num_collected++; - OPAL_OUTPUT_VERBOSE((5, orte_odls_globals.output, + ORTE_OUTPUT_VERBOSE((5, orte_odls_globals.output, "%s odls: daemon collective for job %s from %s type %ld num_collected %d num_participating %d num_contributors %d", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_JOBID_PRINT(jobid), ORTE_NAME_PRINT(sender), @@ -2090,7 +2089,7 @@ static int daemon_collective(orte_process_name_t *sender, opal_buffer_t *data) /* if we locally created this, do not send it! */ if (do_not_send) { - OPAL_OUTPUT_VERBOSE((5, orte_odls_globals.output, + ORTE_OUTPUT_VERBOSE((5, orte_odls_globals.output, "%s odls: daemon collective do not send!", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME))); return ORTE_SUCCESS; @@ -2133,7 +2132,7 @@ static int daemon_collective(orte_process_name_t *sender, opal_buffer_t *data) /* send it */ my_parent.jobid = ORTE_PROC_MY_NAME->jobid; my_parent.vpid = orte_routed.get_routing_tree(ORTE_PROC_MY_NAME->jobid, NULL); - OPAL_OUTPUT_VERBOSE((5, orte_odls_globals.output, + ORTE_OUTPUT_VERBOSE((5, orte_odls_globals.output, "%s odls: daemon collective not the HNP - sending to parent %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(&my_parent))); @@ -2146,7 +2145,7 @@ static int daemon_collective(orte_process_name_t *sender, opal_buffer_t *data) return ORTE_SUCCESS; hnp_process: - OPAL_OUTPUT_VERBOSE((5, orte_odls_globals.output, + ORTE_OUTPUT_VERBOSE((5, orte_odls_globals.output, "%s odls: daemon collective HNP - xcasting to job %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_JOBID_PRINT(jobid))); @@ -2244,7 +2243,7 @@ int orte_odls_base_default_collect_data(orte_process_name_t *proc, /* find this child */ if (OPAL_EQUAL == opal_dss.compare(proc, child->name, ORTE_NAME)) { - OPAL_OUTPUT_VERBOSE((5, orte_odls_globals.output, + ORTE_OUTPUT_VERBOSE((5, orte_odls_globals.output, "%s odls: collecting data from child %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(child->name))); @@ -2306,7 +2305,7 @@ int orte_odls_base_default_collect_data(orte_process_name_t *proc, /* now check to see if all local procs in this job have participated */ if (all_children_participated(proc->jobid)) { - OPAL_OUTPUT_VERBOSE((5, orte_odls_globals.output, + ORTE_OUTPUT_VERBOSE((5, orte_odls_globals.output, "%s odls: executing collective", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME))); @@ -2336,7 +2335,7 @@ int orte_odls_base_default_collect_data(orte_process_name_t *proc, /* pass this to the daemon collective operation */ daemon_collective(ORTE_PROC_MY_NAME, &relay); - OPAL_OUTPUT_VERBOSE((1, orte_odls_globals.output, + ORTE_OUTPUT_VERBOSE((1, orte_odls_globals.output, "%s odls: collective completed", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME))); } diff --git a/orte/mca/odls/base/odls_base_open.c b/orte/mca/odls/base/odls_base_open.c index aff83e79fc..ee7c03b1c4 100644 --- a/orte/mca/odls/base/odls_base_open.c +++ b/orte/mca/odls/base/odls_base_open.c @@ -23,7 +23,7 @@ #include "opal/mca/mca.h" #include "opal/mca/base/base.h" #include "opal/mca/base/mca_base_param.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "opal/util/trace.h" #include "opal/util/argv.h" #include "opal/class/opal_value_array.h" @@ -34,6 +34,7 @@ #include "orte/mca/plm/plm_types.h" #include "orte/util/name_fns.h" #include "orte/runtime/orte_globals.h" +#include "orte/util/output.h" #include "orte/mca/odls/base/base.h" #include "orte/mca/odls/base/odls_private.h" @@ -142,7 +143,7 @@ int orte_odls_base_open(void) { /* Debugging / verbose output. Always have stream open, with verbose set by the mca open system... */ - orte_odls_globals.output = opal_output_open(NULL); + orte_odls_globals.output = orte_output_open(NULL, "ODLS", "DEBUG", NULL); mca_base_param_reg_int_name("odls", "base_sigkill_timeout", "Time to wait for a process to die after issuing a kill signal to it", diff --git a/orte/mca/odls/base/odls_base_state.c b/orte/mca/odls/base/odls_base_state.c index cff81e7097..761eb2a7db 100644 --- a/orte/mca/odls/base/odls_base_state.c +++ b/orte/mca/odls/base/odls_base_state.c @@ -29,9 +29,8 @@ #endif #include "opal/util/argv.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "opal/util/trace.h" -#include "opal/util/show_help.h" #include "opal/util/basename.h" #include "orte/util/name_fns.h" @@ -86,12 +85,12 @@ int orte_odls_base_preload_files_app_context(orte_app_context_t* app_context) opal_list_append(&(filem_request->process_sets), &(p_set->super) ); if(app_context->preload_binary) { - OPAL_OUTPUT_VERBOSE((1, orte_odls_globals.output, + ORTE_OUTPUT_VERBOSE((1, orte_odls_globals.output, "%s) Preload Binary...", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME))); if( ORTE_SUCCESS != (ret = orte_odls_base_preload_append_binary(app_context, filem_request) ) ){ - opal_show_help("help-orte-odls-base.txt", + orte_show_help("help-orte-odls-base.txt", "orte-odls-base:could-not-preload-binary", true, app_context->app); ORTE_ERROR_LOG(ret); @@ -100,13 +99,13 @@ int orte_odls_base_preload_files_app_context(orte_app_context_t* app_context) } } if( NULL != app_context->preload_files) { - OPAL_OUTPUT_VERBOSE((1, orte_odls_globals.output, + ORTE_OUTPUT_VERBOSE((1, orte_odls_globals.output, "%s) Preload Files... [%s]", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), app_context->preload_files)); if( ORTE_SUCCESS != (ret = orte_odls_base_preload_append_files(app_context, filem_request) ) ){ - opal_show_help("help-orte-odls-base.txt", + orte_show_help("help-orte-odls-base.txt", "orte-odls-base:could-not-preload-files", true, app_context->preload_files); ORTE_ERROR_LOG(ret); @@ -120,7 +119,7 @@ int orte_odls_base_preload_files_app_context(orte_app_context_t* app_context) * the requests for all app contexts. */ if( ORTE_SUCCESS != (ret = orte_filem.get(filem_request)) ) { - opal_show_help("help-orte-odls-base.txt", + orte_show_help("help-orte-odls-base.txt", "orte-odls-base:could-not-preload", true, (app_context->preload_binary ? app_context->app : ""), @@ -221,7 +220,7 @@ static int orte_odls_base_preload_append_files(orte_app_context_t* context, if(0 == system(temp)) { char hostname[MAXHOSTNAMELEN]; gethostname(hostname, sizeof(hostname)); - opal_show_help("help-orte-odls-base.txt", + orte_show_help("help-orte-odls-base.txt", "orte-odls-base:preload-file-exists", true, local_ref, hostname); free(temp); diff --git a/orte/mca/odls/default/odls_default_module.c b/orte/mca/odls/default/odls_default_module.c index 42a22bb0b1..8a7f5a4814 100644 --- a/orte/mca/odls/default/odls_default_module.c +++ b/orte/mca/odls/default/odls_default_module.c @@ -63,9 +63,7 @@ #endif #endif /* HAVE_SCHED_YIELD */ -#include "opal/util/output.h" -#include "opal/util/show_help.h" - +#include "orte/util/output.h" #include "orte/runtime/orte_wait.h" #include "orte/runtime/orte_globals.h" #include "orte/mca/errmgr/errmgr.h" @@ -278,7 +276,7 @@ static int odls_default_fork_local_proc( /* Exec the new executable */ execve(context->app, context->argv, environ_copy); - opal_show_help("help-odls-default.txt", "orte-odls-default:execv-error", + orte_show_help("help-odls-default.txt", "orte-odls-default:execv-error", true, context->app, strerror(errno)); exit(1); } else { @@ -303,7 +301,7 @@ static int odls_default_fork_local_proc( child->state = ORTE_PROC_STATE_FAILED_TO_START; child->exit_code = ORTE_ERR_PIPE_READ_FAILURE; - OPAL_OUTPUT_VERBOSE((2, orte_odls_globals.output, + ORTE_OUTPUT_VERBOSE((2, orte_odls_globals.output, "%s odls:default:fork got code %d back from child", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), i)); @@ -324,7 +322,7 @@ static int odls_default_fork_local_proc( child->state = ORTE_PROC_STATE_FAILED_TO_START; child->exit_code = i; - OPAL_OUTPUT_VERBOSE((2, orte_odls_globals.output, + ORTE_OUTPUT_VERBOSE((2, orte_odls_globals.output, "%s odls:default:fork got code %d back from child", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), i)); @@ -352,7 +350,7 @@ int orte_odls_default_launch_local_procs(opal_buffer_t *data) /* construct the list of children we are to launch */ if (ORTE_SUCCESS != (rc = orte_odls_base_default_construct_child_list(data, &job))) { - OPAL_OUTPUT_VERBOSE((2, orte_odls_globals.output, + ORTE_OUTPUT_VERBOSE((2, orte_odls_globals.output, "%s odls:default:launch:local failed to construct child list on error %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_ERROR_NAME(rc))); goto CLEANUP; @@ -360,7 +358,7 @@ int orte_odls_default_launch_local_procs(opal_buffer_t *data) /* launch the local procs */ if (ORTE_SUCCESS != (rc = orte_odls_base_default_launch_local(job, odls_default_fork_local_proc))) { - OPAL_OUTPUT_VERBOSE((2, orte_odls_globals.output, + ORTE_OUTPUT_VERBOSE((2, orte_odls_globals.output, "%s odls:default:launch:local failed to launch on error %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_ERROR_NAME(rc))); goto CLEANUP; @@ -387,7 +385,7 @@ static int send_signal(pid_t pid, int signal) { int rc = ORTE_SUCCESS; - OPAL_OUTPUT_VERBOSE((1, orte_odls_globals.output, + ORTE_OUTPUT_VERBOSE((1, orte_odls_globals.output, "%s sending signal %d to pid %ld", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), signal, (long)pid)); diff --git a/orte/mca/odls/process/odls_process_module.c b/orte/mca/odls/process/odls_process_module.c index 4a2abf26c2..9e8690676b 100755 --- a/orte/mca/odls/process/odls_process_module.c +++ b/orte/mca/odls/process/odls_process_module.c @@ -33,8 +33,8 @@ #include #endif /* HAVE_FCNTL_H */ -#include "opal/util/output.h" -#include "opal/util/show_help.h" +#include "orte/util/output.h" +#include "orte/util/show_help.h" #include "opal/util/sys_limits.h" #include "orte/runtime/orte_wait.h" @@ -155,7 +155,7 @@ static int odls_process_fork_local_proc( if( -1 == handle ) { child->state = ORTE_PROC_STATE_FAILED_TO_START; child->exit_code = ORTE_ERR_PIPE_READ_FAILURE; - opal_show_help("help-orted-launcher.txt", "orted-launcher:execv-error", + orte_show_help("help-orted-launcher.txt", "orted-launcher:execv-error", true, context->app, "TODO: some error"); child->state = ORTE_PROC_STATE_ABORTED; return ORTE_ERROR; @@ -183,7 +183,7 @@ static int odls_process_launch_local_procs(opal_buffer_t *data) /* construct the list of children we are to launch */ if (ORTE_SUCCESS != (rc = orte_odls_base_default_construct_child_list(data, &job))) { - OPAL_OUTPUT_VERBOSE((2, orte_odls_globals.output, + ORTE_OUTPUT_VERBOSE((2, orte_odls_globals.output, "%s odls:process:launch:local failed to construct child list on error %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_ERROR_NAME(rc))); goto CLEANUP; @@ -191,7 +191,7 @@ static int odls_process_launch_local_procs(opal_buffer_t *data) /* launch the local procs */ if (ORTE_SUCCESS != (rc = orte_odls_base_default_launch_local(job, odls_process_fork_local_proc))) { - OPAL_OUTPUT_VERBOSE((2, orte_odls_globals.output, + ORTE_OUTPUT_VERBOSE((2, orte_odls_globals.output, "%s odls:process:launch:local failed to launch on error %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_ERROR_NAME(rc))); goto CLEANUP; diff --git a/orte/mca/oob/base/oob_base_init.c b/orte/mca/oob/base/oob_base_init.c index 2edcfc0a98..3492cda0d5 100644 --- a/orte/mca/oob/base/oob_base_init.c +++ b/orte/mca/oob/base/oob_base_init.c @@ -23,7 +23,7 @@ #include #include -#include "opal/util/output.h" +#include "orte/util/output.h" #include "opal/mca/mca.h" #include "opal/mca/base/base.h" @@ -71,7 +71,7 @@ int mca_oob_base_init(void) component = (mca_oob_base_component_t *) cli->cli_component; if (NULL == component->oob_init) { - opal_output_verbose(10, mca_oob_base_output, "mca_oob_base_init: no init function; ignoring component"); + orte_output_verbose(10, mca_oob_base_output, "mca_oob_base_init: no init function; ignoring component"); } else { int priority = -1; module = component->oob_init(&priority); @@ -91,7 +91,7 @@ int mca_oob_base_init(void) } /* set the global variable to point to the first initialize module */ if(s_module == NULL) { - opal_output_verbose(10, mca_oob_base_output, "mca_oob_base_init: no OOB modules available\n"); + orte_output_verbose(10, mca_oob_base_output, "mca_oob_base_init: no OOB modules available\n"); return ORTE_ERROR; } diff --git a/orte/mca/oob/base/oob_base_open.c b/orte/mca/oob/base/oob_base_open.c index 10666b11f5..804924eb0b 100644 --- a/orte/mca/oob/base/oob_base_open.c +++ b/orte/mca/oob/base/oob_base_open.c @@ -23,9 +23,11 @@ #include "opal/mca/mca.h" #include "opal/mca/base/base.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "opal/mca/base/mca_base_param.h" +#include "orte/util/output.h" + #include "orte/mca/oob/base/base.h" /* @@ -54,8 +56,6 @@ bool orte_oob_base_already_opened = false; */ int mca_oob_base_open(void) { - int param, value; - /* Sanity check. This may be able to be removed when the rml/oob interface is re-worked (the current infrastructure may invoke this function twice: once as a standalone, and once via the rml @@ -65,14 +65,7 @@ int mca_oob_base_open(void) } /* register parameters */ - param = mca_base_param_reg_int_name("oob", "base_verbose", - "Verbosity level for the oob framework", - false, false, 0, &value); - if (value != 0) { - mca_oob_base_output = opal_output_open(NULL); - } else { - mca_oob_base_output = -1; - } + mca_oob_base_output = orte_output_open(NULL, "OOB", "DEBUG", NULL); /* Open up all available components */ OBJ_CONSTRUCT(&mca_oob_base_components, opal_list_t); diff --git a/orte/mca/oob/tcp/oob_tcp.c b/orte/mca/oob/tcp/oob_tcp.c index ca9b4f86f8..cf78953461 100644 --- a/orte/mca/oob/tcp/oob_tcp.c +++ b/orte/mca/oob/tcp/oob_tcp.c @@ -45,7 +45,7 @@ #include "opal/util/error.h" #include "opal/opal_socket_errno.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "opal/util/if.h" #include "opal/util/net.h" #include "opal/class/opal_hash_table.h" @@ -53,6 +53,7 @@ #include "orte/mca/errmgr/errmgr.h" #include "orte/mca/rml/rml.h" #include "orte/util/name_fns.h" +#include "orte/util/output.h" #include "orte/runtime/orte_globals.h" #include "orte/mca/oob/tcp/oob_tcp.h" @@ -195,7 +196,7 @@ int mca_oob_tcp_component_open(void) #ifdef __WINDOWS__ WSADATA win_sock_data; if (WSAStartup(MAKEWORD(2,2), &win_sock_data) != 0) { - opal_output (0, "mca_oob_tcp_component_init: failed to initialise windows sockets: error %d\n", WSAGetLastError()); + orte_output (0, "mca_oob_tcp_component_init: failed to initialise windows sockets: error %d\n", WSAGetLastError()); return ORTE_ERROR; } #endif @@ -206,8 +207,8 @@ int mca_oob_tcp_component_open(void) false, false, 0, &value); - mca_oob_tcp_output_handle = opal_output_open(NULL); - opal_output_set_verbosity(mca_oob_tcp_output_handle, value); + mca_oob_tcp_output_handle = orte_output_open(NULL, "OOB", "TCP", "DEBUG", NULL); + orte_output_set_verbosity(mca_oob_tcp_output_handle, value); OBJ_CONSTRUCT(&mca_oob_tcp_component.tcp_peer_list, opal_list_t); OBJ_CONSTRUCT(&mca_oob_tcp_component.tcp_peers, opal_hash_table_t); @@ -317,7 +318,7 @@ int mca_oob_tcp_component_open(void) } else if (0 == strcmp(listen_type, "listen_thread")) { mca_oob_tcp_component.tcp_listen_type = OOB_TCP_LISTEN_THREAD; } else { - opal_output(0, "Invalid value for oob_tcp_listen_mode parameter: %s", + orte_output(0, "Invalid value for oob_tcp_listen_mode parameter: %s", listen_type); return ORTE_ERROR; } @@ -449,7 +450,7 @@ mca_oob_tcp_create_connection(const int accepted_fd, /* log the accept */ if (mca_oob_tcp_component.tcp_debug >= OOB_TCP_DEBUG_CONNECT) { - opal_output(0, "%s mca_oob_tcp_accept: %s:%d\n", + orte_output(0, "%s mca_oob_tcp_accept: %s:%d\n", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), opal_net_get_hostname(addr), opal_net_get_port(addr)); @@ -481,7 +482,7 @@ static void mca_oob_tcp_accept(int incoming_sd) continue; } if(opal_socket_errno != EAGAIN && opal_socket_errno != EWOULDBLOCK) { - opal_output(0, "mca_oob_tcp_accept: accept() failed: %s (%d).", + orte_output(0, "mca_oob_tcp_accept: accept() failed: %s (%d).", strerror(opal_socket_errno), opal_socket_errno); } return; @@ -513,7 +514,7 @@ mca_oob_tcp_create_listen(int *target_sd, unsigned short *target_port, uint16_t *target_sd = socket(af_family, SOCK_STREAM, 0); if(*target_sd < 0) { if (EAFNOSUPPORT != opal_socket_errno) { - opal_output(0,"mca_oob_tcp_component_init: socket() failed: %s (%d)", + orte_output(0,"mca_oob_tcp_component_init: socket() failed: %s (%d)", strerror(opal_socket_errno), opal_socket_errno); } return ORTE_ERR_IN_ERRNO; @@ -535,7 +536,7 @@ mca_oob_tcp_create_listen(int *target_sd, unsigned short *target_port, uint16_t hints.ai_flags = AI_PASSIVE; if ((error = getaddrinfo(NULL, "0", &hints, &res))) { - opal_output (0, + orte_output (0, "mca_oob_tcp_create_listen: unable to resolve. %s\n", gai_strerror (error)); return ORTE_ERROR; @@ -551,7 +552,7 @@ mca_oob_tcp_create_listen(int *target_sd, unsigned short *target_port, uint16_t int flg = 0; if (setsockopt (*target_sd, IPPROTO_IPV6, IPV6_V6ONLY, &flg, sizeof (flg)) < 0) { - opal_output(0, + orte_output(0, "mca_oob_tcp_create_listen: unable to disable v4-mapped addresses\n"); } } @@ -569,7 +570,7 @@ mca_oob_tcp_create_listen(int *target_sd, unsigned short *target_port, uint16_t /* Disable reusing ports */ flags = 0; if (setsockopt (*target_sd, SOL_SOCKET, SO_REUSEADDR, (void*)&flags, sizeof(flags)) < 0) { - opal_output(0, "mca_oob_tcp_create_listen: unable to unset the " + orte_output(0, "mca_oob_tcp_create_listen: unable to unset the " "SO_REUSEADDR option (%s:%d)\n", strerror(opal_socket_errno), opal_socket_errno); CLOSE_THE_SOCKET(*target_sd); @@ -613,7 +614,7 @@ mca_oob_tcp_create_listen(int *target_sd, unsigned short *target_port, uint16_t if( (EADDRINUSE == opal_socket_errno) || (EADDRNOTAVAIL == opal_socket_errno) ) { continue; } - opal_output(0, "bind() failed: %s (%d)", + orte_output(0, "bind() failed: %s (%d)", strerror(opal_socket_errno), opal_socket_errno ); CLOSE_THE_SOCKET(*target_sd); @@ -623,13 +624,13 @@ mca_oob_tcp_create_listen(int *target_sd, unsigned short *target_port, uint16_t } if (AF_INET == af_family ) { - opal_output(0, "bind() failed: no port available in the range [%d..%d]", + orte_output(0, "bind() failed: no port available in the range [%d..%d]", mca_oob_tcp_component.tcp_port_min, mca_oob_tcp_component.tcp_port_min + range); } #if OPAL_WANT_IPV6 if (AF_INET6 == af_family) { - opal_output(0, "bind6() failed: no port available in the range [%d..%d]", + orte_output(0, "bind6() failed: no port available in the range [%d..%d]", mca_oob_tcp_component.tcp6_port_min, mca_oob_tcp_component.tcp6_port_min + range); } @@ -641,7 +642,7 @@ mca_oob_tcp_create_listen(int *target_sd, unsigned short *target_port, uint16_t socket_binded: /* resolve assigned port */ if (getsockname(*target_sd, (struct sockaddr*)&inaddr, &addrlen) < 0) { - opal_output(0, "mca_oob_tcp_create_listen: getsockname(): %s (%d)", + orte_output(0, "mca_oob_tcp_create_listen: getsockname(): %s (%d)", strerror(opal_socket_errno), opal_socket_errno); CLOSE_THE_SOCKET(*target_sd); return ORTE_ERROR; @@ -655,20 +656,20 @@ mca_oob_tcp_create_listen(int *target_sd, unsigned short *target_port, uint16_t /* setup listen backlog to maximum allowed by kernel */ if(listen(*target_sd, SOMAXCONN) < 0) { - opal_output(0, "mca_oob_tcp_component_init: listen(): %s (%d)", + orte_output(0, "mca_oob_tcp_component_init: listen(): %s (%d)", strerror(opal_socket_errno), opal_socket_errno); return ORTE_ERROR; } /* set socket up to be non-blocking, otherwise accept could block */ if((flags = fcntl(*target_sd, F_GETFL, 0)) < 0) { - opal_output(0, "mca_oob_tcp_component_init: fcntl(F_GETFL) failed: %s (%d)", + orte_output(0, "mca_oob_tcp_component_init: fcntl(F_GETFL) failed: %s (%d)", strerror(opal_socket_errno), opal_socket_errno); return ORTE_ERROR; } else { flags |= O_NONBLOCK; if(fcntl(*target_sd, F_SETFL, flags) < 0) { - opal_output(0, "mca_oob_tcp_component_init: fcntl(F_SETFL) failed: %s (%d)", + orte_output(0, "mca_oob_tcp_component_init: fcntl(F_SETFL) failed: %s (%d)", strerror(opal_socket_errno), opal_socket_errno); return ORTE_ERROR; } @@ -765,7 +766,7 @@ mca_oob_tcp_listen_thread(opal_object_t *obj) if (opal_socket_errno != EAGAIN || opal_socket_errno != EWOULDBLOCK) { - opal_output(0, "mca_oob_tcp_accept: accept() failed: %s (%d).", + orte_output(0, "mca_oob_tcp_accept: accept() failed: %s (%d).", strerror(opal_socket_errno), opal_socket_errno); CLOSE_THE_SOCKET(pending_connection->fd); goto done; @@ -775,7 +776,7 @@ mca_oob_tcp_listen_thread(opal_object_t *obj) } if (mca_oob_tcp_component.tcp_debug >= OOB_TCP_DEBUG_CONNECT) { - opal_output(0, + orte_output(0, "%s mca_oob_tcp_listen_thread: new connection: " "(%d, %d) %s:%d\n", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), @@ -852,7 +853,7 @@ mca_oob_tcp_accept_thread_handler(int sd, short flags, void* user) struct timeval tv; if (mca_oob_tcp_component.tcp_debug >= OOB_TCP_DEBUG_INFO) { - opal_output(0, "%s in accept_thread_handler: %d", + orte_output(0, "%s in accept_thread_handler: %d", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), flags); } @@ -925,7 +926,7 @@ mca_oob_tcp_create_listen_thread(void) #ifdef HAVE_PIPE if (pipe(mca_oob_tcp_component.tcp_connections_pipe) < 0) { - opal_output(0, "mca_oob_tcp_create_listen_thread: pipe failed: %d", errno); + orte_output(0, "mca_oob_tcp_create_listen_thread: pipe failed: %d", errno); return ORTE_ERROR; } #endif @@ -970,7 +971,7 @@ static void mca_oob_tcp_recv_probe(int sd, mca_oob_tcp_hdr_t* hdr) int retval = send(sd, (char *)ptr+cnt, sizeof(mca_oob_tcp_hdr_t)-cnt, 0); if(retval < 0) { if(opal_socket_errno != EINTR && opal_socket_errno != EAGAIN && opal_socket_errno != EWOULDBLOCK) { - opal_output(0, "%s-%s mca_oob_tcp_peer_recv_probe: send() failed: %s (%d)\n", + orte_output(0, "%s-%s mca_oob_tcp_peer_recv_probe: send() failed: %s (%d)\n", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(&(hdr->msg_src)), strerror(opal_socket_errno), @@ -999,12 +1000,12 @@ static void mca_oob_tcp_recv_connect(int sd, mca_oob_tcp_hdr_t* hdr) /* now set socket up to be non-blocking */ if((flags = fcntl(sd, F_GETFL, 0)) < 0) { - opal_output(0, "%s mca_oob_tcp_recv_handler: fcntl(F_GETFL) failed: %s (%d)", + orte_output(0, "%s mca_oob_tcp_recv_handler: fcntl(F_GETFL) failed: %s (%d)", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), strerror(opal_socket_errno), opal_socket_errno); } else { flags |= O_NONBLOCK; if(fcntl(sd, F_SETFL, flags) < 0) { - opal_output(0, "%s mca_oob_tcp_recv_handler: fcntl(F_SETFL) failed: %s (%d)", + orte_output(0, "%s mca_oob_tcp_recv_handler: fcntl(F_SETFL) failed: %s (%d)", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), strerror(opal_socket_errno), opal_socket_errno); } } @@ -1020,7 +1021,7 @@ static void mca_oob_tcp_recv_connect(int sd, mca_oob_tcp_hdr_t* hdr) /* lookup the corresponding process */ peer = mca_oob_tcp_peer_lookup(&hdr->msg_src); if(NULL == peer) { - opal_output(0, "%s mca_oob_tcp_recv_handler: unable to locate peer", + orte_output(0, "%s mca_oob_tcp_recv_handler: unable to locate peer", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME)); CLOSE_THE_SOCKET(sd); return; @@ -1028,7 +1029,7 @@ static void mca_oob_tcp_recv_connect(int sd, mca_oob_tcp_hdr_t* hdr) /* is the peer instance willing to accept this connection */ if(mca_oob_tcp_peer_accept(peer, sd) == false) { if(mca_oob_tcp_component.tcp_debug >= OOB_TCP_DEBUG_CONNECT_FAIL) { - opal_output(0, "%s-%s mca_oob_tcp_recv_handler: " + orte_output(0, "%s-%s mca_oob_tcp_recv_handler: " "rejected connection from %s connection state %d", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(&(peer->peer_name)), @@ -1073,14 +1074,14 @@ static void mca_oob_tcp_recv_handler(int sd, short flags, void* user) while((rc = recv(sd, (char *)&hdr, sizeof(hdr), 0)) != sizeof(hdr)) { if(rc >= 0) { if(mca_oob_tcp_component.tcp_debug >= OOB_TCP_DEBUG_CONNECT_FAIL) { - opal_output(0, "%s mca_oob_tcp_recv_handler: peer closed connection", + orte_output(0, "%s mca_oob_tcp_recv_handler: peer closed connection", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME)); } CLOSE_THE_SOCKET(sd); return; } if(opal_socket_errno != EINTR) { - opal_output(0, "%s mca_oob_tcp_recv_handler: recv() failed: %s (%d)\n", + orte_output(0, "%s mca_oob_tcp_recv_handler: recv() failed: %s (%d)\n", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), strerror(opal_socket_errno), opal_socket_errno); CLOSE_THE_SOCKET(sd); return; @@ -1097,7 +1098,7 @@ static void mca_oob_tcp_recv_handler(int sd, short flags, void* user) mca_oob_tcp_recv_connect(sd, &hdr); break; default: - opal_output(0, "%s mca_oob_tcp_recv_handler: invalid message type: %d\n", + orte_output(0, "%s mca_oob_tcp_recv_handler: invalid message type: %d\n", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), hdr.msg_type); CLOSE_THE_SOCKET(sd); break; @@ -1143,14 +1144,14 @@ mca_oob_t* mca_oob_tcp_component_init(int* priority) if (mca_oob_tcp_component.tcp_include != NULL && strstr(mca_oob_tcp_component.tcp_include,name) == NULL) { - OPAL_OUTPUT_VERBOSE((1, mca_oob_tcp_output_handle, + ORTE_OUTPUT_VERBOSE((1, mca_oob_tcp_output_handle, "%s oob:tcp:init rejecting interface %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), name)); continue; } if (mca_oob_tcp_component.tcp_exclude != NULL && strstr(mca_oob_tcp_component.tcp_exclude,name) != NULL) { - OPAL_OUTPUT_VERBOSE((1, mca_oob_tcp_output_handle, + ORTE_OUTPUT_VERBOSE((1, mca_oob_tcp_output_handle, "%s oob:tcp:init rejecting interface %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), name)); continue; @@ -1159,7 +1160,7 @@ mca_oob_t* mca_oob_tcp_component_init(int* priority) dev = OBJ_NEW(mca_oob_tcp_device_t); dev->if_index = i; - OPAL_OUTPUT_VERBOSE((1, mca_oob_tcp_output_handle, + ORTE_OUTPUT_VERBOSE((1, mca_oob_tcp_output_handle, "%s oob:tcp:init setting up interface %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), name)); @@ -1285,7 +1286,7 @@ int mca_oob_tcp_init(void) /* Don't complain if just not supported unless want connect debugging */ if (EAFNOSUPPORT != opal_socket_errno || mca_oob_tcp_component.tcp_debug >= OOB_TCP_DEBUG_CONNECT) { - opal_output(0, + orte_output(0, "mca_oob_tcp_init: unable to create IPv4 listen socket: %s\n", opal_strerror(rc)); } @@ -1317,7 +1318,7 @@ int mca_oob_tcp_init(void) /* Don't complain if just not supported unless want connect debugging */ if (EAFNOSUPPORT != opal_socket_errno || mca_oob_tcp_component.tcp_debug >= OOB_TCP_DEBUG_CONNECT) { - opal_output(0, + orte_output(0, "mca_oob_tcp_init: unable to create IPv6 listen socket: %s\n", opal_strerror(rc)); } @@ -1352,17 +1353,17 @@ int mca_oob_tcp_init(void) if (OOB_TCP_LISTEN_THREAD == mca_oob_tcp_component.tcp_listen_type) { rc = mca_oob_tcp_create_listen_thread(); if (ORTE_SUCCESS != rc) { - opal_output(0, "Unable to create listen thread: %d\n", rc); + orte_output(0, "Unable to create listen thread: %d\n", rc); return rc; } if (mca_oob_tcp_component.tcp_debug >= OOB_TCP_DEBUG_INFO) { - opal_output(0, "%s accepting connections via listen thread", + orte_output(0, "%s accepting connections via listen thread", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME)); } } else { if (mca_oob_tcp_component.tcp_debug >= OOB_TCP_DEBUG_INFO) { - opal_output(0, "%s accepting connections via event library", + orte_output(0, "%s accepting connections via event library", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME)); } } @@ -1555,7 +1556,7 @@ mca_oob_tcp_parse_uri(const char* uri, struct sockaddr* inaddr) ret = getaddrinfo (host, NULL, &hints, &res); if (ret) { - opal_output (0, "oob_tcp_parse_uri: Could not resolve %s. [Error: %s]\n", + orte_output (0, "oob_tcp_parse_uri: Could not resolve %s. [Error: %s]\n", host, gai_strerror (ret)); ret = ORTE_ERR_BAD_PARAM; goto cleanup; @@ -1563,7 +1564,7 @@ mca_oob_tcp_parse_uri(const char* uri, struct sockaddr* inaddr) if (res->ai_family != af_family) { /* should never happen */ - opal_output (0, "oob_tcp_parse_uri: getaddrinfo returned wrong af_family for %s", + orte_output (0, "oob_tcp_parse_uri: getaddrinfo returned wrong af_family for %s", host); ret = ORTE_ERROR; goto cleanup; @@ -1726,7 +1727,7 @@ mca_oob_tcp_get_new_name(orte_process_name_t* name) } if(mca_oob_tcp_component.tcp_debug >= OOB_TCP_DEBUG_ALL) { - opal_output(0, "%s-%s mca_oob_tcp_get_new_name: starting\n", + orte_output(0, "%s-%s mca_oob_tcp_get_new_name: starting\n", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(&(peer->peer_name))); } @@ -1752,7 +1753,7 @@ mca_oob_tcp_get_new_name(orte_process_name_t* name) if (ORTE_SUCCESS == rc) { *name = *ORTE_PROC_MY_NAME; if(mca_oob_tcp_component.tcp_debug >= OOB_TCP_DEBUG_ALL) { - opal_output(0, "%s mca_oob_tcp_get_new_name: done\n", + orte_output(0, "%s mca_oob_tcp_get_new_name: done\n", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME)); } } diff --git a/orte/mca/oob/tcp/oob_tcp_msg.c b/orte/mca/oob/tcp/oob_tcp_msg.c index f40114cc7a..4937dc95c8 100644 --- a/orte/mca/oob/tcp/oob_tcp_msg.c +++ b/orte/mca/oob/tcp/oob_tcp_msg.c @@ -273,7 +273,7 @@ bool mca_oob_tcp_msg_send_handler(mca_oob_tcp_msg_t* msg, struct mca_oob_tcp_pee else if (opal_socket_errno == EAGAIN || opal_socket_errno == EWOULDBLOCK) return false; else { - opal_output(0, "%s-%s mca_oob_tcp_msg_send_handler: writev failed: %s (%d) [sd = %d]", + orte_output(0, "%s-%s mca_oob_tcp_msg_send_handler: writev failed: %s (%d) [sd = %d]", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(&(peer->peer_name)), strerror(opal_socket_errno), @@ -322,7 +322,7 @@ bool mca_oob_tcp_msg_recv_handler(mca_oob_tcp_msg_t* msg, struct mca_oob_tcp_pee if(msg->msg_hdr.msg_size > 0) { msg->msg_rwbuf = malloc(msg->msg_hdr.msg_size); if(NULL == msg->msg_rwbuf) { - opal_output(0, "%s-%s mca_oob_tcp_msg_recv_handler: malloc(%d) failed\n", + orte_output(0, "%s-%s mca_oob_tcp_msg_recv_handler: malloc(%d) failed\n", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(&(peer->peer_name)), msg->msg_hdr.msg_size); @@ -338,7 +338,7 @@ bool mca_oob_tcp_msg_recv_handler(mca_oob_tcp_msg_t* msg, struct mca_oob_tcp_pee msg->msg_rwnum = 0; } if (mca_oob_tcp_component.tcp_debug >= OOB_TCP_DEBUG_INFO) { - opal_output(0, "%s-%s (origin: %s) mca_oob_tcp_msg_recv_handler: size %lu\n", + orte_output(0, "%s-%s (origin: %s) mca_oob_tcp_msg_recv_handler: size %lu\n", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(&(peer->peer_name)), ORTE_NAME_PRINT(&(msg->msg_hdr.msg_origin)), @@ -380,7 +380,7 @@ static bool mca_oob_tcp_msg_recv(mca_oob_tcp_msg_t* msg, mca_oob_tcp_peer_t* pee under UNIX/Linux environments */ else if (opal_socket_errno == EAGAIN || opal_socket_errno == EWOULDBLOCK) return false; - opal_output(0, "%s-%s mca_oob_tcp_msg_recv: readv failed: %s (%d)", + orte_output(0, "%s-%s mca_oob_tcp_msg_recv: readv failed: %s (%d)", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(&(peer->peer_name)), strerror(opal_socket_errno), @@ -392,7 +392,7 @@ static bool mca_oob_tcp_msg_recv(mca_oob_tcp_msg_t* msg, mca_oob_tcp_peer_t* pee return false; } else if (rc == 0) { if(mca_oob_tcp_component.tcp_debug >= OOB_TCP_DEBUG_CONNECT_FAIL) { - opal_output(0, "%s-%s mca_oob_tcp_msg_recv: peer closed connection", + orte_output(0, "%s-%s mca_oob_tcp_msg_recv: peer closed connection", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(&(peer->peer_name))); } @@ -439,7 +439,7 @@ void mca_oob_tcp_msg_recv_complete(mca_oob_tcp_msg_t* msg, mca_oob_tcp_peer_t* p mca_oob_tcp_msg_data(msg,peer); break; default: - opal_output(0, "%s mca_oob_tcp_msg_recv_complete: invalid message type: %d from peer %s\n", + orte_output(0, "%s mca_oob_tcp_msg_recv_complete: invalid message type: %d from peer %s\n", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), msg->msg_hdr.msg_type, ORTE_NAME_PRINT(&peer->peer_name)); MCA_OOB_TCP_MSG_RETURN(msg); @@ -520,7 +520,7 @@ static void mca_oob_tcp_msg_data(mca_oob_tcp_msg_t* msg, mca_oob_tcp_peer_t* pee if(NULL != post) { if(NULL == post->msg_uiov || 0 == post->msg_ucnt) { - opal_output(0, "msg_data returning bad param"); + orte_output(0, "msg_data returning bad param"); post->msg_rc = ORTE_ERR_BAD_PARAM; } else { /* copy msg data into posted recv */ diff --git a/orte/mca/oob/tcp/oob_tcp_msg.h b/orte/mca/oob/tcp/oob_tcp_msg.h index fc2919ba84..377f3bb4ee 100644 --- a/orte/mca/oob/tcp/oob_tcp_msg.h +++ b/orte/mca/oob/tcp/oob_tcp_msg.h @@ -29,7 +29,7 @@ #include #include "opal/class/opal_list.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "orte/mca/oob/oob.h" #include "oob_tcp_peer.h" diff --git a/orte/mca/oob/tcp/oob_tcp_peer.c b/orte/mca/oob/tcp/oob_tcp_peer.c index 3812439d92..9e2641c935 100644 --- a/orte/mca/oob/tcp/oob_tcp_peer.c +++ b/orte/mca/oob/tcp/oob_tcp_peer.c @@ -50,7 +50,7 @@ #endif #include "opal/mca/backtrace/backtrace.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "opal/util/if.h" #include "opal/util/net.h" #include "opal/util/error.h" @@ -296,7 +296,7 @@ mca_oob_tcp_peer_create_socket(mca_oob_tcp_peer_t* peer, peer->peer_state = (mca_oob_tcp_state_t) state; } - OPAL_OUTPUT_VERBOSE((1, mca_oob_tcp_output_handle, + ORTE_OUTPUT_VERBOSE((1, mca_oob_tcp_output_handle, "%s oob:tcp:peer creating socket to %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(&(peer->peer_name)))); @@ -305,7 +305,7 @@ mca_oob_tcp_peer_create_socket(mca_oob_tcp_peer_t* peer, peer->peer_current_af = af_family; if (peer->peer_sd < 0) { - opal_output(0, + orte_output(0, "%s-%s mca_oob_tcp_peer_create_socket: socket() failed: %s (%d)\n", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(&(peer->peer_name)), @@ -324,7 +324,7 @@ mca_oob_tcp_peer_create_socket(mca_oob_tcp_peer_t* peer, /* setup the socket as non-blocking */ if (peer->peer_sd >= 0) { if((flags = fcntl(peer->peer_sd, F_GETFL, 0)) < 0) { - opal_output(0, "%s-%s mca_oob_tcp_peer_connect: fcntl(F_GETFL) failed: %s (%d)\n", + orte_output(0, "%s-%s mca_oob_tcp_peer_connect: fcntl(F_GETFL) failed: %s (%d)\n", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(&(peer->peer_name)), strerror(opal_socket_errno), @@ -332,7 +332,7 @@ mca_oob_tcp_peer_create_socket(mca_oob_tcp_peer_t* peer, } else { flags |= O_NONBLOCK; if(fcntl(peer->peer_sd, F_SETFL, flags) < 0) - opal_output(0, "%s-%s mca_oob_tcp_peer_connect: fcntl(F_SETFL) failed: %s (%d)\n", + orte_output(0, "%s-%s mca_oob_tcp_peer_connect: fcntl(F_SETFL) failed: %s (%d)\n", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(&(peer->peer_name)), strerror(opal_socket_errno), @@ -356,7 +356,7 @@ static int mca_oob_tcp_peer_try_connect(mca_oob_tcp_peer_t* peer) do { /* pick an address in round-robin fashion from the list exported by the peer */ if(ORTE_SUCCESS != (rc = mca_oob_tcp_addr_get_next(peer->peer_addr, (struct sockaddr*) &inaddr))) { - opal_output(0, "%s-%s mca_oob_tcp_peer_try_connect: " + orte_output(0, "%s-%s mca_oob_tcp_peer_try_connect: " "mca_oob_tcp_addr_get_next failed with error=%d", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(&(peer->peer_name)), @@ -378,7 +378,7 @@ static int mca_oob_tcp_peer_try_connect(mca_oob_tcp_peer_t* peer) } if(mca_oob_tcp_component.tcp_debug >= OOB_TCP_DEBUG_CONNECT) { - opal_output(0, "%s-%s mca_oob_tcp_peer_try_connect: " + orte_output(0, "%s-%s mca_oob_tcp_peer_try_connect: " "connecting port %d to: %s:%d\n", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(&(peer->peer_name)), @@ -422,7 +422,7 @@ static int mca_oob_tcp_peer_try_connect(mca_oob_tcp_peer_t* peer) if ((mca_oob_tcp_component.tcp_debug >= OOB_TCP_DEBUG_CONNECT) || (ECONNABORTED != opal_socket_errno && ECONNREFUSED != opal_socket_errno)) { - opal_output(0, "%s-%s mca_oob_tcp_peer_try_connect: " + orte_output(0, "%s-%s mca_oob_tcp_peer_try_connect: " "connect to %s:%d failed: %s (%d)", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(&(peer->peer_name)), @@ -440,7 +440,7 @@ static int mca_oob_tcp_peer_try_connect(mca_oob_tcp_peer_t* peer) opal_event_add(&peer->peer_recv_event, 0); return ORTE_SUCCESS; } else { - opal_output(0, + orte_output(0, "%s-%s mca_oob_tcp_peer_try_connect: " "mca_oob_tcp_peer_send_connect_ack to %s:%d failed: %s (%d)", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), @@ -455,7 +455,7 @@ static int mca_oob_tcp_peer_try_connect(mca_oob_tcp_peer_t* peer) /* None of the interfaces worked... We'll try again for a number of times, so we're not done yet, hence the debug output */ if(mca_oob_tcp_component.tcp_debug >= OOB_TCP_DEBUG_CONNECT) { - opal_output(0, "%s-%s mca_oob_tcp_peer_try_connect: " + orte_output(0, "%s-%s mca_oob_tcp_peer_try_connect: " "Connection across all interfaces failed. Likely will retry", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(&(peer->peer_name))); @@ -502,7 +502,7 @@ static void mca_oob_tcp_peer_complete_connect(mca_oob_tcp_peer_t* peer, int sd) /* check connect completion status */ if(getsockopt(sd, SOL_SOCKET, SO_ERROR, (char *)&so_error, &so_length) < 0) { - opal_output(0, "%s-%s mca_oob_tcp_peer_complete_connect: getsockopt() failed: %s (%d)\n", + orte_output(0, "%s-%s mca_oob_tcp_peer_complete_connect: getsockopt() failed: %s (%d)\n", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(&(peer->peer_name)), strerror(opal_socket_errno), @@ -517,7 +517,7 @@ static void mca_oob_tcp_peer_complete_connect(mca_oob_tcp_peer_t* peer, int sd) } else if (so_error == ECONNREFUSED || so_error == ETIMEDOUT) { struct timeval tv = { 1,0 }; if (mca_oob_tcp_component.tcp_debug >= OOB_TCP_DEBUG_CONNECT) { - opal_output(0, "%s-%s mca_oob_tcp_peer_complete_connect: " + orte_output(0, "%s-%s mca_oob_tcp_peer_complete_connect: " "connection failed: %s (%d) - retrying\n", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(&(peer->peer_name)), @@ -536,7 +536,7 @@ static void mca_oob_tcp_peer_complete_connect(mca_oob_tcp_peer_t* peer, int sd) } if (mca_oob_tcp_component.tcp_debug >= OOB_TCP_DEBUG_CONNECT) { - opal_output(0, "%s-%s mca_oob_tcp_peer_complete_connect: " + orte_output(0, "%s-%s mca_oob_tcp_peer_complete_connect: " "sending ack, %d", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(&(peer->peer_name)), so_error); @@ -546,7 +546,7 @@ static void mca_oob_tcp_peer_complete_connect(mca_oob_tcp_peer_t* peer, int sd) peer->peer_state = MCA_OOB_TCP_CONNECT_ACK; opal_event_add(&peer->peer_recv_event, 0); } else { - opal_output(0, "%s-%s mca_oob_tcp_peer_complete_connect: unable to send connect ack.", + orte_output(0, "%s-%s mca_oob_tcp_peer_complete_connect: unable to send connect ack.", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(&(peer->peer_name))); mca_oob_tcp_peer_close(peer); @@ -584,7 +584,7 @@ static void mca_oob_tcp_peer_connected(mca_oob_tcp_peer_t* peer, int sd) void mca_oob_tcp_peer_close(mca_oob_tcp_peer_t* peer) { if(mca_oob_tcp_component.tcp_debug >= OOB_TCP_DEBUG_CONNECT) { - opal_output(0, "%s-%s mca_oob_tcp_peer_close(%p) sd %d state %d\n", + orte_output(0, "%s-%s mca_oob_tcp_peer_close(%p) sd %d state %d\n", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(&(peer->peer_name)), (void*)peer, @@ -613,7 +613,7 @@ void mca_oob_tcp_peer_shutdown(mca_oob_tcp_peer_t* peer) if(peer->peer_retries++ > mca_oob_tcp_component.tcp_peer_retries) { mca_oob_tcp_msg_t *msg; - opal_output(0, "%s-%s oob-tcp: Communication retries exceeded. Can not communicate with peer", + orte_output(0, "%s-%s oob-tcp: Communication retries exceeded. Can not communicate with peer", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(&(peer->peer_name))); @@ -689,7 +689,7 @@ static int mca_oob_tcp_peer_recv_connect_ack(mca_oob_tcp_peer_t* peer, int sd) if (peer->peer_state == MCA_OOB_TCP_CONNECT_ACK) { struct timeval tv = { 1,0 }; if (mca_oob_tcp_component.tcp_debug >= OOB_TCP_DEBUG_CONNECT) { - opal_output(0, + orte_output(0, "%s-%s mca_oob_tcp_peer_recv_connect_ack " "connect failed during receive. Restarting (%s).", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), @@ -707,7 +707,7 @@ static int mca_oob_tcp_peer_recv_connect_ack(mca_oob_tcp_peer_t* peer, int sd) } MCA_OOB_TCP_HDR_NTOH(&hdr); if(hdr.msg_type != MCA_OOB_TCP_CONNECT) { - opal_output(0, "mca_oob_tcp_peer_recv_connect_ack: invalid header type: %d\n", + orte_output(0, "mca_oob_tcp_peer_recv_connect_ack: invalid header type: %d\n", hdr.msg_type); mca_oob_tcp_peer_close(peer); return ORTE_ERR_UNREACH; @@ -715,7 +715,7 @@ static int mca_oob_tcp_peer_recv_connect_ack(mca_oob_tcp_peer_t* peer, int sd) /* compare the peers name to the expected value */ if (OPAL_EQUAL != orte_util_compare_name_fields(ORTE_NS_CMP_ALL, &peer->peer_name, &hdr.msg_src)) { - opal_output(0, "%s-%s mca_oob_tcp_peer_recv_connect_ack: " + orte_output(0, "%s-%s mca_oob_tcp_peer_recv_connect_ack: " "received unexpected process identifier %s\n", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(&(peer->peer_name)), @@ -747,7 +747,7 @@ static int mca_oob_tcp_peer_recv_blocking(mca_oob_tcp_peer_t* peer, int sd, void /* remote closed connection */ if(retval == 0) { if(mca_oob_tcp_component.tcp_debug >= OOB_TCP_DEBUG_INFO) { - opal_output(0, "%s-%s mca_oob_tcp_peer_recv_blocking: " + orte_output(0, "%s-%s mca_oob_tcp_peer_recv_blocking: " "peer closed connection: peer state %d", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(&(peer->peer_name)), @@ -779,7 +779,7 @@ static int mca_oob_tcp_peer_recv_blocking(mca_oob_tcp_peer_t* peer, int sd, void connection again */ return -1; } else { - opal_output(0, + orte_output(0, "%s-%s mca_oob_tcp_peer_recv_blocking: " "recv() failed: %s (%d)\n", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), @@ -809,7 +809,7 @@ static int mca_oob_tcp_peer_send_blocking(mca_oob_tcp_peer_t* peer, int sd, void int retval = send(sd, (char *)ptr+cnt, size-cnt, 0); if(retval < 0) { if(opal_socket_errno != EINTR && opal_socket_errno != EAGAIN && opal_socket_errno != EWOULDBLOCK) { - opal_output(0, "%s-%s mca_oob_tcp_peer_send_blocking: send() failed: %s (%d)\n", + orte_output(0, "%s-%s mca_oob_tcp_peer_send_blocking: send() failed: %s (%d)\n", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(&(peer->peer_name)), strerror(opal_socket_errno), @@ -877,7 +877,7 @@ static void mca_oob_tcp_peer_recv_handler(int sd, short flags, void* user) mca_oob_tcp_msg_t* msg; MCA_OOB_TCP_MSG_ALLOC(msg, rc); if(NULL == msg) { - opal_output(0, "%s-%s mca_oob_tcp_peer_recv_handler: unable to allocate recv message\n", + orte_output(0, "%s-%s mca_oob_tcp_peer_recv_handler: unable to allocate recv message\n", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(&(peer->peer_name))); return; @@ -907,7 +907,7 @@ static void mca_oob_tcp_peer_recv_handler(int sd, short flags, void* user) } default: { - opal_output(0, "%s-%s mca_oob_tcp_peer_recv_handler: invalid socket state(%d)", + orte_output(0, "%s-%s mca_oob_tcp_peer_recv_handler: invalid socket state(%d)", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(&(peer->peer_name)), peer->peer_state); @@ -955,7 +955,7 @@ static void mca_oob_tcp_peer_send_handler(int sd, short flags, void* user) break; } default: - opal_output(0, "%s-%s mca_oob_tcp_peer_send_handler: invalid connection state (%d)", + orte_output(0, "%s-%s mca_oob_tcp_peer_send_handler: invalid connection state (%d)", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(&(peer->peer_name)), peer->peer_state); @@ -985,7 +985,7 @@ void mca_oob_tcp_peer_dump(mca_oob_tcp_peer_t* peer, const char* msg) snprintf(dst, sizeof(dst), "%s", opal_net_get_hostname((struct sockaddr*) &inaddr)); if((flags = fcntl(peer->peer_sd, F_GETFL, 0)) < 0) { - opal_output(0, "mca_oob_tcp_peer_dump: fcntl(F_GETFL) failed: %s (%d)\n", + orte_output(0, "mca_oob_tcp_peer_dump: fcntl(F_GETFL) failed: %s (%d)\n", strerror(opal_socket_errno), opal_socket_errno); } @@ -993,7 +993,7 @@ void mca_oob_tcp_peer_dump(mca_oob_tcp_peer_t* peer, const char* msg) #if defined(SO_SNDBUF) optlen = sizeof(sndbuf); if(getsockopt(peer->peer_sd, SOL_SOCKET, SO_SNDBUF, (char *)&sndbuf, &optlen) < 0) { - opal_output(0, "mca_oob_tcp_peer_dump: SO_SNDBUF option: %s (%d)\n", + orte_output(0, "mca_oob_tcp_peer_dump: SO_SNDBUF option: %s (%d)\n", strerror(opal_socket_errno), opal_socket_errno); } @@ -1003,7 +1003,7 @@ void mca_oob_tcp_peer_dump(mca_oob_tcp_peer_t* peer, const char* msg) #if defined(SO_RCVBUF) optlen = sizeof(rcvbuf); if(getsockopt(peer->peer_sd, SOL_SOCKET, SO_RCVBUF, (char *)&rcvbuf, &optlen) < 0) { - opal_output(0, "mca_oob_tcp_peer_dump: SO_RCVBUF option: %s (%d)\n", + orte_output(0, "mca_oob_tcp_peer_dump: SO_RCVBUF option: %s (%d)\n", strerror(opal_socket_errno), opal_socket_errno); } @@ -1013,7 +1013,7 @@ void mca_oob_tcp_peer_dump(mca_oob_tcp_peer_t* peer, const char* msg) #if defined(TCP_NODELAY) optlen = sizeof(nodelay); if(getsockopt(peer->peer_sd, IPPROTO_TCP, TCP_NODELAY, (char *)&nodelay, &optlen) < 0) { - opal_output(0, "mca_oob_tcp_peer_dump: TCP_NODELAY option: %s (%d)\n", + orte_output(0, "mca_oob_tcp_peer_dump: TCP_NODELAY option: %s (%d)\n", strerror(opal_socket_errno), opal_socket_errno); } @@ -1025,7 +1025,7 @@ void mca_oob_tcp_peer_dump(mca_oob_tcp_peer_t* peer, const char* msg) ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(&(peer->peer_name)), msg, src, dst, nodelay, sndbuf, rcvbuf, flags); - opal_output(0, buff); + orte_output(0, buff); } @@ -1056,7 +1056,7 @@ bool mca_oob_tcp_peer_accept(mca_oob_tcp_peer_t* peer, int sd) mca_oob_tcp_peer_event_init(peer); if(mca_oob_tcp_peer_send_connect_ack(peer, sd) != ORTE_SUCCESS) { - opal_output(0, "%s-%s mca_oob_tcp_peer_accept: " + orte_output(0, "%s-%s mca_oob_tcp_peer_accept: " "mca_oob_tcp_peer_send_connect_ack failed\n", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(&(peer->peer_name))); @@ -1147,7 +1147,7 @@ void mca_oob_tcp_set_socket_options(int sd) optval = 1; if(setsockopt(sd, IPPROTO_TCP, TCP_NODELAY, (char *)&optval, sizeof(optval)) < 0) { opal_backtrace_print(stderr); - opal_output(0, "[%s:%d] setsockopt(TCP_NODELAY) failed: %s (%d)", + orte_output(0, "[%s:%d] setsockopt(TCP_NODELAY) failed: %s (%d)", __FILE__, __LINE__, strerror(opal_socket_errno), opal_socket_errno); @@ -1156,7 +1156,7 @@ void mca_oob_tcp_set_socket_options(int sd) #if defined(SO_SNDBUF) if(mca_oob_tcp_component.tcp_sndbuf > 0 && setsockopt(sd, SOL_SOCKET, SO_SNDBUF, (char *)&mca_oob_tcp_component.tcp_sndbuf, sizeof(int)) < 0) { - opal_output(0, "[%s:%d] setsockopt(SO_SNDBUF) failed: %s (%d)", + orte_output(0, "[%s:%d] setsockopt(SO_SNDBUF) failed: %s (%d)", __FILE__, __LINE__, strerror(opal_socket_errno), opal_socket_errno); @@ -1165,7 +1165,7 @@ void mca_oob_tcp_set_socket_options(int sd) #if defined(SO_RCVBUF) if(mca_oob_tcp_component.tcp_rcvbuf > 0 && setsockopt(sd, SOL_SOCKET, SO_RCVBUF, (char *)&mca_oob_tcp_component.tcp_rcvbuf, sizeof(int)) < 0) { - opal_output(0, "[%s:%d] setsockopt(SO_RCVBUF) failed: %s (%d)", + orte_output(0, "[%s:%d] setsockopt(SO_RCVBUF) failed: %s (%d)", __FILE__, __LINE__, strerror(opal_socket_errno), opal_socket_errno); diff --git a/orte/mca/oob/tcp/oob_tcp_ping.c b/orte/mca/oob/tcp/oob_tcp_ping.c index ec71f014ee..aaab097803 100644 --- a/orte/mca/oob/tcp/oob_tcp_ping.c +++ b/orte/mca/oob/tcp/oob_tcp_ping.c @@ -90,7 +90,7 @@ mca_oob_tcp_ping(const orte_process_name_t* name, /* parse uri string */ if(ORTE_SUCCESS != (rc = mca_oob_tcp_parse_uri(uri, (struct sockaddr*) &inaddr))) { - opal_output(0, + orte_output(0, "%s-%s mca_oob_tcp_ping: invalid uri: %s\n", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(name), @@ -101,7 +101,7 @@ mca_oob_tcp_ping(const orte_process_name_t* name, /* create socket */ sd = socket(inaddr.ss_family, SOCK_STREAM, 0); if (sd < 0) { - opal_output(0, + orte_output(0, "%s-%s mca_oob_tcp_ping: socket() failed: %s (%d)\n", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(name), @@ -112,7 +112,7 @@ mca_oob_tcp_ping(const orte_process_name_t* name, /* setup the socket as non-blocking */ if((flags = fcntl(sd, F_GETFL, 0)) < 0) { - opal_output(0, "%s-%s mca_oob_tcp_ping: fcntl(F_GETFL) failed: %s (%d)\n", + orte_output(0, "%s-%s mca_oob_tcp_ping: fcntl(F_GETFL) failed: %s (%d)\n", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(name), strerror(opal_socket_errno), @@ -120,7 +120,7 @@ mca_oob_tcp_ping(const orte_process_name_t* name, } else { flags |= O_NONBLOCK; if(fcntl(sd, F_SETFL, flags) < 0) { - opal_output(0, "%s-%s mca_oob_tcp_ping: fcntl(F_SETFL) failed: %s (%d)\n", + orte_output(0, "%s-%s mca_oob_tcp_ping: fcntl(F_SETFL) failed: %s (%d)\n", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(name), strerror(opal_socket_errno), @@ -144,7 +144,7 @@ mca_oob_tcp_ping(const orte_process_name_t* name, if(connect(sd, (struct sockaddr*)&inaddr, addrlen) < 0) { /* connect failed? */ if(opal_socket_errno != EINPROGRESS && opal_socket_errno != EWOULDBLOCK) { - opal_output(0, "%s-%s mca_oob_tcp_ping: connect failed: %s (%d)\n", + orte_output(0, "%s-%s mca_oob_tcp_ping: connect failed: %s (%d)\n", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(name), strerror(opal_socket_errno), @@ -166,7 +166,7 @@ mca_oob_tcp_ping(const orte_process_name_t* name, /* set socket back to blocking */ flags &= ~O_NONBLOCK; if(fcntl(sd, F_SETFL, flags) < 0) { - opal_output(0, "%s-%s mca_oob_tcp_ping: fcntl(F_SETFL) failed: %s (%d)\n", + orte_output(0, "%s-%s mca_oob_tcp_ping: fcntl(F_SETFL) failed: %s (%d)\n", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(name), strerror(opal_socket_errno), diff --git a/orte/mca/oob/tcp/oob_tcp_send.c b/orte/mca/oob/tcp/oob_tcp_send.c index cfb6be158c..d2c7251239 100644 --- a/orte/mca/oob/tcp/oob_tcp_send.c +++ b/orte/mca/oob/tcp/oob_tcp_send.c @@ -120,7 +120,7 @@ int mca_oob_tcp_send_nb( } if(mca_oob_tcp_component.tcp_debug >= OOB_TCP_DEBUG_ALL) { - opal_output(0, "%s-%s mca_oob_tcp_send_nb: tag %d size %lu\n", + orte_output(0, "%s-%s mca_oob_tcp_send_nb: tag %d size %lu\n", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(&(peer->peer_name)), tag, (unsigned long)size ); diff --git a/orte/mca/plm/alps/plm_alps_component.c b/orte/mca/plm/alps/plm_alps_component.c index 243a447bb1..5fe7e1cbd4 100644 --- a/orte/mca/plm/alps/plm_alps_component.c +++ b/orte/mca/plm/alps/plm_alps_component.c @@ -25,7 +25,7 @@ #include "orte_config.h" #include "orte/constants.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "opal/mca/base/mca_base_param.h" #include "orte/runtime/orte_globals.h" diff --git a/orte/mca/plm/alps/plm_alps_module.c b/orte/mca/plm/alps/plm_alps_module.c index d71a314110..8566b180fc 100644 --- a/orte/mca/plm/alps/plm_alps_module.c +++ b/orte/mca/plm/alps/plm_alps_module.c @@ -52,10 +52,10 @@ #include "opal/mca/installdirs/installdirs.h" #include "opal/util/argv.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "opal/util/opal_environ.h" #include "opal/util/path.h" -#include "opal/util/show_help.h" +#include "orte/util/show_help.h" #include "opal/util/basename.h" #include "opal/mca/base/mca_base_param.h" @@ -153,7 +153,7 @@ static int plm_alps_launch_job(orte_job_t *jdata) if (mca_plm_alps_component.timing) { if (0 != gettimeofday(&joblaunchstart, NULL)) { - opal_output(0, "plm_alps: could not obtain job start time"); + orte_output(0, "plm_alps: could not obtain job start time"); } } @@ -166,7 +166,7 @@ static int plm_alps_launch_job(orte_job_t *jdata) goto cleanup; } - OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((1, orte_plm_globals.output, "%s plm:alps: launching job %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_JOBID_PRINT(jdata->jobid))); @@ -191,7 +191,7 @@ static int plm_alps_launch_job(orte_job_t *jdata) if (0 == map->num_new_daemons) { /* have all the daemons we need - launch app */ - OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((1, orte_plm_globals.output, "%s plm:alps: no new daemons to launch", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME))); goto launch_apps; @@ -247,7 +247,7 @@ static int plm_alps_launch_job(orte_job_t *jdata) opal_argv_append(&nodelist_argc, &nodelist_argv, nodes[nnode]->name); } if (0 == opal_argv_count(nodelist_argv)) { - opal_show_help("help-plm-alps.txt", "no-hosts-in-list", true); + orte_show_help("help-plm-alps.txt", "no-hosts-in-list", true); rc = ORTE_ERR_FAILED_TO_START; goto cleanup; } @@ -276,7 +276,7 @@ static int plm_alps_launch_job(orte_job_t *jdata) */ rc = orte_util_convert_vpid_to_string(&vpid_string, map->daemon_vpid_start); if (ORTE_SUCCESS != rc) { - opal_output(0, "plm_alps: unable to create process name"); + orte_output(0, "plm_alps: unable to create process name"); goto cleanup; } @@ -287,8 +287,8 @@ static int plm_alps_launch_job(orte_job_t *jdata) if (mca_plm_alps_component.debug) { param = opal_argv_join(argv, ' '); if (NULL != param) { - opal_output(0, "plm:alps: final top-level argv:"); - opal_output(0, "plm:alps: %s", param); + orte_output(0, "plm:alps: final top-level argv:"); + orte_output(0, "plm:alps: %s", param); free(param); } } @@ -307,7 +307,7 @@ static int plm_alps_launch_job(orte_job_t *jdata) if (NULL != app_prefix_dir) { if (NULL != cur_prefix && 0 != strcmp (cur_prefix, app_prefix_dir)) { - opal_show_help("help-plm-alps.txt", "multiple-prefixes", + orte_show_help("help-plm-alps.txt", "multiple-prefixes", true, cur_prefix, app_prefix_dir); return ORTE_ERR_FATAL; } @@ -317,7 +317,7 @@ static int plm_alps_launch_job(orte_job_t *jdata) if (NULL == cur_prefix) { cur_prefix = strdup(app_prefix_dir); if (mca_plm_alps_component.debug) { - opal_output (0, "plm:alps: Set prefix:%s", + orte_output (0, "plm:alps: Set prefix:%s", cur_prefix); } } @@ -335,7 +335,7 @@ static int plm_alps_launch_job(orte_job_t *jdata) if (mca_plm_alps_component.timing) { if (0 != gettimeofday(&launchstart, NULL)) { - opal_output(0, "plm_alps: could not obtain start time"); + orte_output(0, "plm_alps: could not obtain start time"); } } @@ -367,19 +367,19 @@ launch_apps: if (mca_plm_alps_component.timing) { if (0 != gettimeofday(&launchstop, NULL)) { - opal_output(0, "plm_alps: could not obtain stop time"); + orte_output(0, "plm_alps: could not obtain stop time"); } else { - opal_output(0, "plm_alps: daemon block launch time is %ld usec", + orte_output(0, "plm_alps: daemon block launch time is %ld usec", (launchstop.tv_sec - launchstart.tv_sec)*1000000 + (launchstop.tv_usec - launchstart.tv_usec)); - opal_output(0, "plm_alps: total job launch time is %ld usec", + orte_output(0, "plm_alps: total job launch time is %ld usec", (launchstop.tv_sec - joblaunchstart.tv_sec)*1000000 + (launchstop.tv_usec - joblaunchstart.tv_usec)); } } if (ORTE_SUCCESS != rc) { - opal_output(0, "plm:alps: start_procs returned error %d", rc); + orte_output(0, "plm:alps: start_procs returned error %d", rc); goto cleanup; } @@ -487,10 +487,10 @@ static void alps_wait_cb(pid_t pid, int status, void* cbdata){ if (0 != status) { if (failed_launch) { /* we have a problem during launch */ - opal_output(0, "ERROR: alps failed to start the required daemons."); - opal_output(0, "ERROR: This could be due to an inability to find the orted binary"); - opal_output(0, "ERROR: on one or more remote nodes, lack of authority to execute"); - opal_output(0, "ERROR: on one or more specified nodes, or other factors."); + orte_output(0, "ERROR: alps failed to start the required daemons."); + orte_output(0, "ERROR: This could be due to an inability to find the orted binary"); + orte_output(0, "ERROR: on one or more remote nodes, lack of authority to execute"); + orte_output(0, "ERROR: on one or more specified nodes, or other factors."); /* report that the daemon has failed so we break out of the daemon * callback receive and exit @@ -549,7 +549,7 @@ static int plm_alps_start_proc(int argc, char **argv, char **env, } opal_setenv("PATH", newenv, true, &env); if (mca_plm_alps_component.debug) { - opal_output(0, "plm:alps: reset PATH: %s", newenv); + orte_output(0, "plm:alps: reset PATH: %s", newenv); } free(newenv); @@ -562,7 +562,7 @@ static int plm_alps_start_proc(int argc, char **argv, char **env, } opal_setenv("LD_LIBRARY_PATH", newenv, true, &env); if (mca_plm_alps_component.debug) { - opal_output(0, "plm:alps: reset LD_LIBRARY_PATH: %s", + orte_output(0, "plm:alps: reset LD_LIBRARY_PATH: %s", newenv); } free(newenv); @@ -598,7 +598,7 @@ static int plm_alps_start_proc(int argc, char **argv, char **env, execve(exec_argv, argv, env); - opal_output(0, "plm:alps:start_proc: exec failed"); + orte_output(0, "plm:alps:start_proc: exec failed"); /* don't return - need to exit - returning would be bad - we're not in the calling process anymore */ exit(1); diff --git a/orte/mca/plm/base/plm_base_close.c b/orte/mca/plm/base/plm_base_close.c index 056e321d87..be0130f33a 100644 --- a/orte/mca/plm/base/plm_base_close.c +++ b/orte/mca/plm/base/plm_base_close.c @@ -23,7 +23,7 @@ #include "opal/mca/mca.h" #include "opal/mca/base/base.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "orte/util/proc_info.h" #include "orte/mca/errmgr/errmgr.h" diff --git a/orte/mca/plm/base/plm_base_jobid.c b/orte/mca/plm/base/plm_base_jobid.c index c6a303cf69..a4a75c9562 100644 --- a/orte/mca/plm/base/plm_base_jobid.c +++ b/orte/mca/plm/base/plm_base_jobid.c @@ -21,7 +21,7 @@ #include -#include "opal/util/output.h" +#include "orte/util/output.h" #include "opal/hash_string.h" #include "orte/mca/errmgr/errmgr.h" @@ -46,7 +46,7 @@ int orte_plm_base_set_hnp_name(void) bias = (uint32_t)orte_process_info.pid; - OPAL_OUTPUT_VERBOSE((5, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((5, orte_plm_globals.output, "plm:base:set_hnp_name: initial bias %ld nodename hash %lu", (long)bias, (unsigned long)hash32)); @@ -56,7 +56,7 @@ int orte_plm_base_set_hnp_name(void) /* now compress to 16-bits */ jobfam = (uint16_t)(((0x0000ffff & (0xffff0000 & hash32) >> 16)) ^ (0x0000ffff & hash32)); - OPAL_OUTPUT_VERBOSE((5, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((5, orte_plm_globals.output, "plm:base:set_hnp_name: final jobfam %lu", (unsigned long)jobfam)); diff --git a/orte/mca/plm/base/plm_base_launch_support.c b/orte/mca/plm/base/plm_base_launch_support.c index ede884ff24..3d69ee7675 100644 --- a/orte/mca/plm/base/plm_base_launch_support.c +++ b/orte/mca/plm/base/plm_base_launch_support.c @@ -25,12 +25,11 @@ #include #endif -#include "opal/util/show_help.h" #include "opal/util/argv.h" -#include "opal/util/output.h" #include "opal/runtime/opal_progress.h" #include "opal/dss/dss.h" +#include "orte/util/output.h" #include "orte/mca/errmgr/errmgr.h" #include "orte/mca/iof/iof.h" #include "orte/mca/ras/ras.h" @@ -66,7 +65,7 @@ int orte_plm_base_setup_job(orte_job_t *jdata) int rc; orte_process_name_t name = {ORTE_JOBID_INVALID, 0}; - OPAL_OUTPUT_VERBOSE((5, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((5, orte_plm_globals.output, "%s plm:base:setup_job for job %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_JOBID_PRINT(jdata->jobid))); @@ -147,7 +146,7 @@ int orte_plm_base_launch_apps(orte_jobid_t job) orte_process_name_t name = {ORTE_JOBID_INVALID, 0}; - OPAL_OUTPUT_VERBOSE((5, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((5, orte_plm_globals.output, "%s plm:base:launch_apps for job %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_JOBID_PRINT(job))); @@ -180,7 +179,7 @@ int orte_plm_base_launch_apps(orte_jobid_t job) /* wait for all the daemons to report apps launched */ if (ORTE_SUCCESS != (rc = orte_plm_base_report_launched(job))) { - OPAL_OUTPUT_VERBOSE((5, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((5, orte_plm_globals.output, "%s plm:base:launch failed for job %s on error %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_JOBID_PRINT(job), ORTE_ERROR_NAME(rc))); @@ -188,7 +187,7 @@ int orte_plm_base_launch_apps(orte_jobid_t job) } /* complete wiring up the iof */ - OPAL_OUTPUT_VERBOSE((5, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((5, orte_plm_globals.output, "%s plm:base:launch wiring up iof", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME))); name.jobid = job; @@ -201,7 +200,7 @@ int orte_plm_base_launch_apps(orte_jobid_t job) #if 0 orte_totalview_init_after_spawn(job); #endif - OPAL_OUTPUT_VERBOSE((5, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((5, orte_plm_globals.output, "%s plm:base:launch completed for job %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_JOBID_PRINT(job))); @@ -219,7 +218,7 @@ void orte_plm_base_launch_failed(orte_jobid_t job, bool daemons_launching, pid_t { orte_job_t *jdata; - OPAL_OUTPUT_VERBOSE((5, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((5, orte_plm_globals.output, "%s plm:base:launch_failed for job %s during %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_JOBID_PRINT(job), @@ -229,18 +228,18 @@ void orte_plm_base_launch_failed(orte_jobid_t job, bool daemons_launching, pid_t if (WIFSIGNALED(status)) { /* died on signal */ #ifdef WCOREDUMP if (WCOREDUMP(status)) { - opal_show_help("help-plm-base.txt", "daemon-died-signal-core", true, + orte_show_help("help-plm-base.txt", "daemon-died-signal-core", true, pid, WTERMSIG(status)); } else { - opal_show_help("help-plm-base.txt", "daemon-died-signal", true, + orte_show_help("help-plm-base.txt", "daemon-died-signal", true, pid, WTERMSIG(status)); } #else - opal_show_help("help-plm-base.txt", "daemon-died-signal", true, + orte_show_help("help-plm-base.txt", "daemon-died-signal", true, pid, WTERMSIG(status)); #endif /* WCOREDUMP */ } else { - opal_show_help("help-plm-base.txt", "daemon-died-no-signal", true, + orte_show_help("help-plm-base.txt", "daemon-died-no-signal", true, pid, WEXITSTATUS(status)); } orted_failed_launch = true; @@ -278,7 +277,7 @@ static void process_orted_launch_report(int fd, short event, void *data) int32_t arch; orte_node_t **nodes; - OPAL_OUTPUT_VERBOSE((5, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((5, orte_plm_globals.output, "%s plm:base:orted_report_launch from daemon %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(&mev->sender))); @@ -336,7 +335,7 @@ static void process_orted_launch_report(int fd, short event, void *data) CLEANUP: - OPAL_OUTPUT_VERBOSE((5, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((5, orte_plm_globals.output, "%s plm:base:orted_report_launch %s for daemon %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), orted_failed_launch ? "failed" : "completed", @@ -381,7 +380,7 @@ int orte_plm_base_daemon_callback(orte_std_cntr_t num_daemons) { int rc; - OPAL_OUTPUT_VERBOSE((5, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((5, orte_plm_globals.output, "%s plm:base:daemon_callback", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME))); @@ -409,7 +408,7 @@ int orte_plm_base_daemon_callback(orte_std_cntr_t num_daemons) return rc; } - OPAL_OUTPUT_VERBOSE((5, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((5, orte_plm_globals.output, "%s plm:base:daemon_callback completed", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME))); @@ -452,7 +451,7 @@ void orte_plm_base_app_report_launch(int fd, short event, void *data) orte_proc_t **procs; int rc; - OPAL_OUTPUT_VERBOSE((5, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((5, orte_plm_globals.output, "%s plm:base:app_report_launch from daemon %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(&mev->sender))); @@ -516,7 +515,7 @@ void orte_plm_base_app_report_launch(int fd, short event, void *data) goto CLEANUP; } - OPAL_OUTPUT_VERBOSE((5, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((5, orte_plm_globals.output, "%s plm:base:app_report_launched for proc %s from daemon %s: pid %lu state %0x exit %d", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(&(procs[vpid]->name)), @@ -528,7 +527,7 @@ void orte_plm_base_app_report_launch(int fd, short event, void *data) procs[vpid]->state = state; procs[vpid]->exit_code = exit_code; if (ORTE_PROC_STATE_FAILED_TO_START == state) { - OPAL_OUTPUT_VERBOSE((5, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((5, orte_plm_globals.output, "%s plm:base:app_report_launched daemon %s reports proc %s failed to start", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(&mev->sender), @@ -548,7 +547,7 @@ void orte_plm_base_app_report_launch(int fd, short event, void *data) ORTE_ERROR_LOG(rc); } - OPAL_OUTPUT_VERBOSE((5, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((5, orte_plm_globals.output, "%s plm:base:app_report_launch completed processing", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME))); @@ -581,7 +580,7 @@ static void app_report_launch(int status, orte_process_name_t* sender, */ ORTE_MESSAGE_EVENT(sender, buffer, tag, orte_plm_base_app_report_launch); - OPAL_OUTPUT_VERBOSE((5, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((5, orte_plm_globals.output, "%s plm:base:app_report_launch reissuing non-blocking recv", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME))); @@ -600,7 +599,7 @@ static int orte_plm_base_report_launched(orte_jobid_t job) int rc; orte_job_t *jdata; - OPAL_OUTPUT_VERBOSE((5, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((5, orte_plm_globals.output, "%s plm:base:report_launched for job %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_JOBID_PRINT(job))); @@ -631,7 +630,7 @@ static int orte_plm_base_report_launched(orte_jobid_t job) return rc; } - OPAL_OUTPUT_VERBOSE((5, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((5, orte_plm_globals.output, "%s plm:base:report_launched all apps reported", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME))); @@ -813,13 +812,13 @@ void orte_plm_base_check_job_completed(orte_job_t *jdata) * is check all jobs for complete */ if (NULL == jdata) { - OPAL_OUTPUT_VERBOSE((5, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((5, orte_plm_globals.output, "%s plm:base:check_job_completed called with NULL pointer", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME))); goto CHECK_ALL_JOBS; } - OPAL_OUTPUT_VERBOSE((5, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((5, orte_plm_globals.output, "%s plm:base:check_job_completed for job %s - num_terminated %lu num_procs %lu", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_JOBID_PRINT(jdata->jobid), @@ -885,7 +884,7 @@ void orte_plm_base_check_job_completed(orte_job_t *jdata) /* check the resulting job state and notify the appropriate places */ if (ORTE_JOB_STATE_FAILED_TO_START == jdata->state) { - OPAL_OUTPUT_VERBOSE((5, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((5, orte_plm_globals.output, "%s plm:base:check_job_completed declared job %s failed to start by proc %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_JOBID_PRINT(jdata->jobid), @@ -896,7 +895,7 @@ void orte_plm_base_check_job_completed(orte_job_t *jdata) } else if (ORTE_JOB_STATE_ABORTED == jdata->state || ORTE_JOB_STATE_ABORTED_BY_SIG == jdata->state || ORTE_JOB_STATE_ABORTED_WO_SYNC == jdata->state) { - OPAL_OUTPUT_VERBOSE((5, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((5, orte_plm_globals.output, "%s plm:base:check_job_completed declared job %s aborted by proc %s with code %d", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_JOBID_PRINT(jdata->jobid), @@ -910,7 +909,7 @@ void orte_plm_base_check_job_completed(orte_job_t *jdata) * the other jobs have also completed and wakeup if that is true */ jdata->state = ORTE_JOB_STATE_TERMINATED; - OPAL_OUTPUT_VERBOSE((5, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((5, orte_plm_globals.output, "%s plm:base:check_job_completed declared job %s normally terminated - checking all jobs", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_JOBID_PRINT(jdata->jobid))); @@ -961,7 +960,7 @@ CHECK_ALL_JOBS: if (ORTE_PROC_MY_NAME->jobid != jobs[j]->jobid && jobs[j]->num_terminated < jobs[j]->num_procs) { /* we have at least one job that is not done yet */ - OPAL_OUTPUT_VERBOSE((5, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((5, orte_plm_globals.output, "%s plm:base:check_job_completed job %s is not terminated", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_JOBID_PRINT(jobs[j]->jobid))); @@ -969,7 +968,7 @@ CHECK_ALL_JOBS: } } /* if we get here, then all jobs are done, so wakeup */ - OPAL_OUTPUT_VERBOSE((5, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((5, orte_plm_globals.output, "%s plm:base:check_job_completed all jobs terminated - waking up", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME))); orte_wakeup(); diff --git a/orte/mca/plm/base/plm_base_open.c b/orte/mca/plm/base/plm_base_open.c index a9d242ac22..ba7e8cb740 100644 --- a/orte/mca/plm/base/plm_base_open.c +++ b/orte/mca/plm/base/plm_base_open.c @@ -21,12 +21,13 @@ #include "orte/constants.h" #include "orte/types.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "opal/util/argv.h" #include "opal/mca/mca.h" #include "opal/mca/base/base.h" #include "orte/mca/errmgr/errmgr.h" +#include "orte/util/output.h" #include "orte/mca/plm/plm.h" #include "orte/mca/plm/base/base.h" @@ -74,7 +75,7 @@ int orte_plm_base_open(void) { /* Debugging / verbose output. Always have stream open, with verbose set by the mca open system... */ - orte_plm_globals.output = opal_output_open(NULL); + orte_plm_globals.output = orte_output_open(NULL, "PLM", "DEBUG", NULL); /* init selected to be false */ orte_plm_base.selected = false; diff --git a/orte/mca/plm/base/plm_base_orted_cmds.c b/orte/mca/plm/base/plm_base_orted_cmds.c index 028de97850..15b799970d 100644 --- a/orte/mca/plm/base/plm_base_orted_cmds.c +++ b/orte/mca/plm/base/plm_base_orted_cmds.c @@ -24,12 +24,11 @@ #include #endif -#include "opal/util/output.h" #include "opal/util/argv.h" -#include "opal/util/show_help.h" #include "opal/util/trace.h" #include "opal/dss/dss.h" +#include "orte/util/output.h" #include "orte/mca/odls/odls_types.h" #include "orte/mca/grpcomm/grpcomm.h" #include "orte/mca/errmgr/errmgr.h" @@ -52,7 +51,7 @@ static void failed_send(int fd, short event, void *arg) * don't get sent in time - set the done flag * so we can return the error */ - OPAL_OUTPUT_VERBOSE((5, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((5, orte_plm_globals.output, "%s plm:base:orted_cmd command messages timed out with num_sent %ld", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), (long)num_reported)); done_reporting = true; @@ -71,7 +70,7 @@ static void send_callback(int status, /* mark as done */ done_reporting = true; - OPAL_OUTPUT_VERBOSE((5, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((5, orte_plm_globals.output, "%s plm:base:orted_cmd all messages sent", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME))); @@ -86,7 +85,7 @@ int orte_plm_base_orted_exit(void) orte_job_t *daemons; orte_proc_t **procs; - OPAL_OUTPUT_VERBOSE((5, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((5, orte_plm_globals.output, "%s plm:base:orted_cmd sending orted_exit commands", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME))); @@ -135,7 +134,7 @@ int orte_plm_base_orted_exit(void) orte_vpid_t v; orte_process_name_t peer; - OPAL_OUTPUT_VERBOSE((5, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((5, orte_plm_globals.output, "%s plm:base:orted_cmd:orted_exit abnormal term ordered", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME))); @@ -188,7 +187,7 @@ int orte_plm_base_orted_exit(void) /* if all the sends didn't go, report that */ if (num_reported != num_being_sent) { - opal_show_help("help-plm-base.txt", "incomplete-exit-cmd", true); + orte_show_help("help-plm-base.txt", "incomplete-exit-cmd", true); return ORTE_ERR_SILENT; } @@ -212,7 +211,7 @@ int orte_plm_base_orted_kill_local_procs(orte_jobid_t job) opal_buffer_t cmd; orte_daemon_cmd_flag_t command=ORTE_DAEMON_KILL_LOCAL_PROCS; - OPAL_OUTPUT_VERBOSE((5, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((5, orte_plm_globals.output, "%s plm:base:orted_cmd sending kill_local_procs cmds", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME))); @@ -244,7 +243,7 @@ int orte_plm_base_orted_kill_local_procs(orte_jobid_t job) orte_job_t *daemons; orte_proc_t **procs; - OPAL_OUTPUT_VERBOSE((5, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((5, orte_plm_globals.output, "%s plm:base:orted_cmd:kill_local_procs abnormal term ordered", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME))); @@ -305,7 +304,7 @@ int orte_plm_base_orted_kill_local_procs(orte_jobid_t job) /* if all the sends didn't go, report that */ if (num_reported != num_being_sent) { - opal_show_help("help-plm-base.txt", "incomplete-kill-procs-cmd", true); + orte_show_help("help-plm-base.txt", "incomplete-kill-procs-cmd", true); return ORTE_ERR_SILENT; } @@ -331,7 +330,7 @@ int orte_plm_base_orted_signal_local_procs(orte_jobid_t job, int32_t signal) opal_buffer_t cmd; orte_daemon_cmd_flag_t command=ORTE_DAEMON_SIGNAL_LOCAL_PROCS; - OPAL_OUTPUT_VERBOSE((5, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((5, orte_plm_globals.output, "%s plm:base:orted_cmd sending signal_local_procs cmds", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME))); diff --git a/orte/mca/plm/base/plm_base_proxy.c b/orte/mca/plm/base/plm_base_proxy.c index 5b22b5e93d..656e6e8837 100644 --- a/orte/mca/plm/base/plm_base_proxy.c +++ b/orte/mca/plm/base/plm_base_proxy.c @@ -27,6 +27,7 @@ #include "orte/mca/iof/iof.h" #include "orte/mca/errmgr/errmgr.h" #include "orte/runtime/orte_globals.h" +#include "orte/util/output.h" #include "orte/mca/plm/base/plm_private.h" @@ -43,7 +44,7 @@ int orte_plm_proxy_spawn(orte_job_t *jdata) orte_process_name_t *target; int rc; - OPAL_OUTPUT_VERBOSE((5, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((5, orte_plm_globals.output, "%s plm:base:proxy spawn child job", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME))); @@ -67,14 +68,14 @@ int orte_plm_proxy_spawn(orte_job_t *jdata) /* identify who gets this command - the HNP or the local orted */ if (jdata->controls & ORTE_JOB_CONTROL_LOCAL_SPAWN) { /* for now, this is unsupported */ - opal_output(0, "LOCAL DAEMON SPAWN IS CURRENTLY UNSUPPORTED"); + orte_output(0, "LOCAL DAEMON SPAWN IS CURRENTLY UNSUPPORTED"); target = ORTE_PROC_MY_HNP; /* target = ORTE_PROC_MY_DAEMON; */ } else { target = ORTE_PROC_MY_HNP; } - OPAL_OUTPUT_VERBOSE((5, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((5, orte_plm_globals.output, "%s plm:base:proxy sending spawn cmd to %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(target))); @@ -87,7 +88,7 @@ int orte_plm_proxy_spawn(orte_job_t *jdata) OBJ_DESTRUCT(&buf); - OPAL_OUTPUT_VERBOSE((5, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((5, orte_plm_globals.output, "%s plm:base:proxy waiting for response", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME))); diff --git a/orte/mca/plm/base/plm_base_receive.c b/orte/mca/plm/base/plm_base_receive.c index e63b5dd6ed..cd977c34fb 100644 --- a/orte/mca/plm/base/plm_base_receive.c +++ b/orte/mca/plm/base/plm_base_receive.c @@ -28,7 +28,7 @@ #include "orte/types.h" #include "opal/class/opal_list.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "opal/mca/mca.h" #include "opal/mca/base/mca_base_param.h" @@ -59,7 +59,7 @@ int orte_plm_base_comm_start(void) return ORTE_SUCCESS; } - OPAL_OUTPUT_VERBOSE((5, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((5, orte_plm_globals.output, "%s plm:base:receive start comm", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME))); @@ -82,7 +82,7 @@ int orte_plm_base_comm_stop(void) return ORTE_SUCCESS; } - OPAL_OUTPUT_VERBOSE((5, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((5, orte_plm_globals.output, "%s plm:base:receive stop comm", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME))); @@ -116,7 +116,7 @@ void orte_plm_base_receive_process_msg(int fd, short event, void *data) switch (command) { case ORTE_PLM_LAUNCH_JOB_CMD: - OPAL_OUTPUT_VERBOSE((5, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((5, orte_plm_globals.output, "%s plm:base:receive job launch command", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME))); /* setup a default response */ @@ -160,7 +160,7 @@ void orte_plm_base_receive_process_msg(int fd, short event, void *data) } ANSWER_LAUNCH: - OPAL_OUTPUT_VERBOSE((5, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((5, orte_plm_globals.output, "%s plm:base:receive job %s launched", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_JOBID_PRINT(job))); @@ -182,7 +182,7 @@ void orte_plm_base_receive_process_msg(int fd, short event, void *data) jdata = NULL; while (ORTE_SUCCESS == (rc = opal_dss.unpack(mev->buffer, &job, &count, ORTE_JOBID))) { - OPAL_OUTPUT_VERBOSE((5, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((5, orte_plm_globals.output, "%s plm:base:receive got update_proc_state for job %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_JOBID_PRINT(job))); @@ -212,7 +212,7 @@ void orte_plm_base_receive_process_msg(int fd, short event, void *data) return; } - OPAL_OUTPUT_VERBOSE((5, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((5, orte_plm_globals.output, "%s plm:base:receive got update_proc_state for vpid %lu state %x exit_code %d", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), (unsigned long)vpid, (unsigned int)state, (int)exit_code)); @@ -275,7 +275,7 @@ void orte_plm_base_recv(int status, orte_process_name_t* sender, { int rc; - OPAL_OUTPUT_VERBOSE((5, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((5, orte_plm_globals.output, "%s plm:base:receive got message from %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(sender))); diff --git a/orte/mca/plm/base/plm_base_select.c b/orte/mca/plm/base/plm_base_select.c index 2b9c03d6bb..bfb1ec12d1 100644 --- a/orte/mca/plm/base/plm_base_select.c +++ b/orte/mca/plm/base/plm_base_select.c @@ -20,12 +20,11 @@ #include "orte/constants.h" #include "opal/class/opal_list.h" -#include "opal/util/output.h" -#include "opal/util/show_help.h" #include "opal/mca/mca.h" #include "opal/mca/base/base.h" #include "opal/mca/base/mca_base_component_repository.h" +#include "orte/util/output.h" #include "orte/util/proc_info.h" #include "orte/mca/errmgr/errmgr.h" diff --git a/orte/mca/plm/ccp/plm_ccp_component.c b/orte/mca/plm/ccp/plm_ccp_component.c index 464232c6af..f099f9ff11 100644 --- a/orte/mca/plm/ccp/plm_ccp_component.c +++ b/orte/mca/plm/ccp/plm_ccp_component.c @@ -17,7 +17,7 @@ #include "orte_config.h" #include "opal/mca/base/mca_base_param.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "opal/util/argv.h" #include "orte/constants.h" diff --git a/orte/mca/plm/ccp/plm_ccp_module.c b/orte/mca/plm/ccp/plm_ccp_module.c index ea4719faaa..8bb821ee05 100644 --- a/orte/mca/plm/ccp/plm_ccp_module.c +++ b/orte/mca/plm/ccp/plm_ccp_module.c @@ -41,9 +41,9 @@ #include "opal/threads/condition.h" #include "opal/event/event.h" #include "opal/util/argv.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "opal/util/opal_environ.h" -#include "opal/util/show_help.h" +#include "orte/util/show_help.h" #include "opal/util/path.h" #include "opal/util/basename.h" #include "opal/mca/base/mca_base_param.h" @@ -151,7 +151,7 @@ static int plm_ccp_launch_job(orte_job_t *jdata) /* check for timing request - get start time if so */ if (orte_timing) { if (0 != gettimeofday(&jobstart, NULL)) { - OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((1, orte_plm_globals.output, "plm_ccp: could not obtain job start time")); } } @@ -160,7 +160,7 @@ static int plm_ccp_launch_job(orte_job_t *jdata) * has been setup, so skip the setup actions */ if (ORTE_JOBID_INVALID != jdata->jobid) { - OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((1, orte_plm_globals.output, "%s plm:ccp: launching job %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_JOBID_PRINT(jdata->jobid))); @@ -173,7 +173,7 @@ static int plm_ccp_launch_job(orte_job_t *jdata) goto cleanup; } - OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((1, orte_plm_globals.output, "%s plm:ccp: launching job %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_JOBID_PRINT(jdata->jobid))); @@ -211,9 +211,9 @@ GETMAP: &proc_vpid_index, &node_name_index); - if (0 < opal_output_get_verbosity(orte_plm_globals.output)) { + if (0 < orte_output_get_verbosity(orte_plm_globals.output)) { param = opal_argv_join(argv, ' '); - OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((1, orte_plm_globals.output, "%s plm:ccp: final top-level argv:\n\t%s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), (NULL == param) ? "NULL" : param)); @@ -230,7 +230,7 @@ GETMAP: __uuidof(ICluster), reinterpret_cast (&pCluster) ); if (FAILED(hr)) { - opal_output(orte_plm_globals.output, + orte_output(orte_plm_globals.output, "plm:ccp: failed to create cluster object!"); goto cleanup; } @@ -245,7 +245,7 @@ GETMAP: hr = pCluster->CreateJob(&pJob); if (FAILED(hr)) { get_cluster_message(pCluster); - opal_output(orte_plm_globals.output, + orte_output(orte_plm_globals.output, "plm:ccp:failed to create cluster object!"); goto cleanup; } @@ -279,7 +279,7 @@ GETMAP: if (0 == strncmp("PATH=", env[i], 5)) { asprintf(&newenv, "%s/%s:%s", apps[0]->prefix_dir, bin_base, env[i] + 5); - OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((1, orte_plm_globals.output, "%s plm:ccp: resetting PATH: %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), newenv)); @@ -291,7 +291,7 @@ GETMAP: else if (0 == strncmp("LD_LIBRARY_PATH=", env[i], 16)) { asprintf(&newenv, "%s/%s:%s", apps[0]->prefix_dir, lib_base, env[i] + 16); - OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((1, orte_plm_globals.output, "%s plm:ccp: resetting LD_LIBRARY_PATH: %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), newenv)); @@ -335,21 +335,21 @@ GETMAP: pJob->put_MinimumNumberOfProcessors(num_processors); if (FAILED(hr)) { - OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((1, orte_plm_globals.output, "plm:ccp:failed to put min num of processors!")); goto cleanup; } pJob->put_MaximumNumberOfProcessors(num_processors); if (FAILED(hr)) { - OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((1, orte_plm_globals.output, "plm:ccp:failed to put max num of processors!")); goto cleanup; } hr = pJob->put_Priority(job_priority); if (FAILED(hr)) { - OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((1, orte_plm_globals.output, "plm:ccp:failed to set proiority!")); goto cleanup; } @@ -372,7 +372,7 @@ GETMAP: free(argv[node_name_index]); argv[node_name_index] = strdup(node->name); - OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((1, orte_plm_globals.output, "%s plm:ccp: launching on node %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), node->name)); @@ -380,7 +380,7 @@ GETMAP: /* setup process name */ rc = orte_util_convert_vpid_to_string(&vpid_string, nodes[i]->daemon->name.vpid); if (ORTE_SUCCESS != rc) { - OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((1, orte_plm_globals.output, "plm:ccp: unable to get daemon vpid as string")); exit(-1); } @@ -389,9 +389,9 @@ GETMAP: free(vpid_string); /* exec the daemon */ - if (0 < opal_output_get_verbosity(orte_plm_globals.output)) { + if (0 < orte_output_get_verbosity(orte_plm_globals.output)) { param = opal_argv_join(argv, ' '); - OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((1, orte_plm_globals.output, "%s plm:ccp: executing:\n\t%s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), (NULL == param) ? "NULL" : param)); @@ -401,7 +401,7 @@ GETMAP: /* check for timing request - get start time if so */ if (orte_timing) { if (0 != gettimeofday(&launchstart, NULL)) { - OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((1, orte_plm_globals.output, "plm_ccp: could not obtain start time")); launchstart.tv_sec = 0; launchstart.tv_usec = 0; @@ -411,28 +411,28 @@ GETMAP: hr = pCluster->CreateTask(&pTask); if (FAILED(hr)) { get_cluster_message(pCluster); - OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((1, orte_plm_globals.output, "plm:ccp:failed to create task object!")); goto cleanup; } pTask->put_MinimumNumberOfProcessors(node->num_procs); if (FAILED(hr)) { - OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((1, orte_plm_globals.output, "plm:ccp:failed to create task object!")); goto cleanup; } pTask->put_MaximumNumberOfProcessors(node->num_procs); if (FAILED(hr)) { - OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((1, orte_plm_globals.output, "plm:ccp:failed to create task object!")); goto cleanup; } pTask->put_RequiredNodes(_bstr_t(node->name)); if (FAILED(hr)) { - OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((1, orte_plm_globals.output, "plm:ccp:failed to set required nodes!")); goto cleanup; } @@ -442,28 +442,28 @@ GETMAP: hr = pTask->put_CommandLine(_bstr_t(command_line)); if (FAILED(hr)) { - OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((1, orte_plm_globals.output, "plm:ccp:failed to put command line!")); goto cleanup; } hr = pTask->put_Stdout(_bstr_t(L"ompi_ccp_output.txt")); if (FAILED(hr)) { - OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((1, orte_plm_globals.output, "plm:ccp:failed to set stdout!")); goto cleanup; } hr = pTask->put_Stderr(_bstr_t(L"ompi_ccp_error.txt")); if (FAILED(hr)) { - OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((1, orte_plm_globals.output, "plm:ccp:failed to set stderr!")); goto cleanup; } hr = pJob->AddTask(pTask); if (FAILED(hr)) { - OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((1, orte_plm_globals.output, "plm:ccp:failed to add task!")); goto cleanup; } @@ -480,19 +480,19 @@ GETMAP: /* Add job to the queue. */ hr = pCluster->QueueJob(pJob, NULL, NULL, VARIANT_TRUE, 0, &job_id); if (SUCCEEDED(hr)) { - OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((1, orte_plm_globals.output, "Added job %d to scheduling queue.\n", job_id)); }else { get_cluster_message(pCluster); } - OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((1, orte_plm_globals.output, "%s plm:ccp:launch: finished spawning orteds", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME))); /* wait for daemons to callback */ if (ORTE_SUCCESS != (rc = orte_plm_base_daemon_callback(map->num_new_daemons))) { - OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((1, orte_plm_globals.output, "%s plm:ccp: daemon launch failed for job %s on error %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_JOBID_PRINT(jdata->jobid), ORTE_ERROR_NAME(rc))); @@ -501,7 +501,7 @@ GETMAP: launch_apps: if (ORTE_SUCCESS != (rc = orte_plm_base_launch_apps(jdata->jobid))) { - OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((1, orte_plm_globals.output, "%s plm:ccp: launch of apps failed for job %s on error %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_JOBID_PRINT(jdata->jobid), ORTE_ERROR_NAME(rc))); @@ -514,21 +514,21 @@ launch_apps: /* check for timing request - get stop time for launch completion and report */ if (orte_timing) { if (0 != gettimeofday(&completionstop, NULL)) { - OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((1, orte_plm_globals.output, "plm_ccp: could not obtain completion stop time")); } else { deltat = (launchstop.tv_sec - launchstart.tv_sec)*1000000 + (launchstop.tv_usec - launchstart.tv_usec); - OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((1, orte_plm_globals.output, "plm_ccp: launch completion required %d usec", deltat)); } - OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((1, orte_plm_globals.output, "plm_ccp: Launch statistics:")); - OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((1, orte_plm_globals.output, "plm_ccp: Average time to launch an orted: %f usec", avgtime)); - OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((1, orte_plm_globals.output, "plm_ccp: Max time to launch an orted: %d usec at iter %d", maxtime, maxiter)); - OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((1, orte_plm_globals.output, "plm_ccp: Min time to launch an orted: %d usec at iter %d", mintime, miniter)); } @@ -562,17 +562,17 @@ launch_apps: /* check for timing request - get stop time and process if so */ if (orte_timing) { if (0 != gettimeofday(&jobstop, NULL)) { - OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((1, orte_plm_globals.output, "plm_ccp: could not obtain stop time")); } else { deltat = (jobstop.tv_sec - jobstart.tv_sec)*1000000 + (jobstop.tv_usec - jobstart.tv_usec); - OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((1, orte_plm_globals.output, "plm_ccp: launch of entire job required %d usec", deltat)); } } - OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((1, orte_plm_globals.output, "%s plm:ccp:launch: finished", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME))); @@ -648,7 +648,7 @@ static int plm_ccp_connect(ICluster* pCluster) _dupenv_s(&cluster_head, &len, "LOGONSERVER"); if(cluster_head == NULL) { - OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((1, orte_plm_globals.output, "plm:ccp:allocate: connot find cluster head node!")); return ORTE_ERROR; } @@ -662,11 +662,11 @@ static int plm_ccp_connect(ICluster* pCluster) /* Connect to the cluster's head node */ hr = pCluster->Connect(_bstr_t(cluster_head)); if (FAILED(hr)) { - OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((1, orte_plm_globals.output, "plm:ccp:allocate: connection failed!")); return ORTE_ERROR; } - OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((1, orte_plm_globals.output, "Connected to Cluster: %s. \n", cluster_head)); return ORTE_SUCCESS; } @@ -727,12 +727,12 @@ void get_cluster_message(ICluster* pCluster) hr = pCluster->get_ErrorMessage(&message); if (SUCCEEDED(hr)) { - OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((1, orte_plm_globals.output, _com_util::ConvertBSTRToString(message))); SysFreeString(message); } else { - OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((1, orte_plm_globals.output, "pCluster->get_ErrorMessage failed.\n")); } } diff --git a/orte/mca/plm/gridengine/plm_gridengine_component.c b/orte/mca/plm/gridengine/plm_gridengine_component.c index 18a56c3876..478a721f21 100644 --- a/orte/mca/plm/gridengine/plm_gridengine_component.c +++ b/orte/mca/plm/gridengine/plm_gridengine_component.c @@ -34,7 +34,7 @@ #include "opal/util/path.h" #include "opal/util/argv.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "opal/mca/base/mca_base_param.h" #include "orte/util/proc_info.h" @@ -138,14 +138,14 @@ int orte_plm_gridengine_component_query(mca_base_module_t **module, int *priorit { if (NULL != getenv("SGE_ROOT") && NULL != getenv("ARC") && NULL != getenv("PE_HOSTFILE") && NULL != getenv("JOB_ID")) { - opal_output_verbose(10, orte_plm_globals.output, + orte_output_verbose(10, orte_plm_globals.output, "plm:gridengine: available for selection"); *priority = mca_plm_gridengine_component.priority; *module = (mca_base_module_t *) &orte_plm_gridengine_module; return ORTE_SUCCESS; } - opal_output_verbose(10, orte_plm_globals.output, + orte_output_verbose(10, orte_plm_globals.output, "plm:gridengine: NOT available for selection"); *module = NULL; return ORTE_ERROR; diff --git a/orte/mca/plm/gridengine/plm_gridengine_module.c b/orte/mca/plm/gridengine/plm_gridengine_module.c index 044f34b4b6..c3b5551cfa 100644 --- a/orte/mca/plm/gridengine/plm_gridengine_module.c +++ b/orte/mca/plm/gridengine/plm_gridengine_module.c @@ -68,10 +68,10 @@ #include "opal/util/os_path.h" #include "opal/util/path.h" #include "opal/event/event.h" -#include "opal/util/show_help.h" +#include "orte/util/show_help.h" #include "opal/util/argv.h" #include "opal/util/opal_environ.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "opal/util/basename.h" #include "opal/util/opal_environ.h" @@ -139,7 +139,7 @@ static int orte_plm_gridengine_fill_orted_path(char** orted_path) if (NULL == path) { path = ("PATH is empty!"); } - opal_show_help("help-plm-gridengine.txt", "no-local-orted", + orte_show_help("help-plm-gridengine.txt", "no-local-orted", true, path, opal_install_dirs.bindir); return ORTE_ERR_NOT_FOUND; } @@ -158,31 +158,31 @@ static void orte_plm_gridengine_wait_daemon(pid_t pid, int status, void* cbdata) * SIGSTOP/SIGKILL. So just return and ignore the daemon_failed * at the end as that would kill off the user processes */ if (SIGUSR1 == status || SIGUSR2 == status) { - opal_output(0, "The daemon received a signal %d", status); + orte_output(0, "The daemon received a signal %d", status); return; } /* Otherwise, tell the user something went wrong. */ - opal_output(0, "ERROR: A daemon failed to start as expected."); - opal_output(0, "ERROR: There may be more information available from"); - opal_output(0, "ERROR: the 'qstat -t' command on the Grid Engine tasks."); - opal_output(0, "ERROR: If the problem persists, please restart the"); - opal_output(0, "ERROR: Grid Engine PE job"); + orte_output(0, "ERROR: A daemon failed to start as expected."); + orte_output(0, "ERROR: There may be more information available from"); + orte_output(0, "ERROR: the 'qstat -t' command on the Grid Engine tasks."); + orte_output(0, "ERROR: If the problem persists, please restart the"); + orte_output(0, "ERROR: Grid Engine PE job"); if (WIFEXITED(status)) { - opal_output(0, "ERROR: The daemon exited unexpectedly with status %d.", + orte_output(0, "ERROR: The daemon exited unexpectedly with status %d.", WEXITSTATUS(status)); } else if (WIFSIGNALED(status)) { #ifdef WCOREDUMP if (WCOREDUMP(status)) { - opal_output(0, "The daemon received a signal %d (with core).", + orte_output(0, "The daemon received a signal %d (with core).", WTERMSIG(status)); } else { - opal_output(0, "The daemon received a signal %d.", WTERMSIG(status)); + orte_output(0, "The daemon received a signal %d.", WTERMSIG(status)); } #else - opal_output(0, "The daemon received a signal %d.", WTERMSIG(status)); + orte_output(0, "The daemon received a signal %d.", WTERMSIG(status)); #endif /* WCOREDUMP */ } else { - opal_output(0, "No extra status information is available: %d.", status); + orte_output(0, "No extra status information is available: %d.", status); } /* report that the daemon has failed so we break out of the daemon @@ -227,7 +227,7 @@ static int plm_gridengine_launch_job(orte_job_t *jdata) goto cleanup; } - OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((1, orte_plm_globals.output, "%s plm:gridengine: launching job %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_JOBID_PRINT(jdata->jobid))); @@ -252,7 +252,7 @@ static int plm_gridengine_launch_job(orte_job_t *jdata) if (map->num_new_daemons == 0) { /* have all the daemons we need - launch app */ - OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((1, orte_plm_globals.output, "%s plm:gridengine: no new daemons to launch", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME))); goto launch_apps; @@ -299,11 +299,11 @@ static int plm_gridengine_launch_job(orte_job_t *jdata) */ env = opal_argv_copy(environ); - if (0 < opal_output_get_verbosity(orte_plm_globals.output)) { + if (0 < orte_output_get_verbosity(orte_plm_globals.output)) { param = opal_argv_join(argv, ' '); if (NULL != param) { - opal_output(0, "plm:gridengine: final template argv:"); - opal_output(0, "plm:gridengine: %s", param); + orte_output(0, "plm:gridengine: final template argv:"); + orte_output(0, "plm:gridengine: %s", param); free(param); } } @@ -338,7 +338,7 @@ static int plm_gridengine_launch_job(orte_job_t *jdata) newenv = temp; } opal_setenv("PATH", newenv, true, &env); - OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((1, orte_plm_globals.output, "%s plm:gridengine: reset PATH: %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), newenv)); @@ -354,7 +354,7 @@ static int plm_gridengine_launch_job(orte_job_t *jdata) newenv = temp; } opal_setenv("LD_LIBRARY_PATH", newenv, true, &env); - OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((1, orte_plm_globals.output, "%s plm:gridengine: reset LD_LIBRARY_PATH: %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), newenv)); @@ -401,7 +401,7 @@ static int plm_gridengine_launch_job(orte_job_t *jdata) char* var; long fd, fdmax = sysconf(_SC_OPEN_MAX); - OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((1, orte_plm_globals.output, "%s plm:gridengine: launching on node %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), nodes[nnode]->name)); @@ -414,12 +414,12 @@ static int plm_gridengine_launch_job(orte_job_t *jdata) asprintf(&exec_path, "%s/bin/%s/qrsh", sge_root, sge_arch); exec_path = opal_path_findv(exec_path, X_OK, environ, NULL); if (NULL == exec_path) { - opal_show_help("help-plm-gridengine.txt", "bad-qrsh-path", + orte_show_help("help-plm-gridengine.txt", "bad-qrsh-path", true, exec_path, sge_root, sge_arch); exit(-1); /* forked child must ALWAYS exit, not return */ } - OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((1, orte_plm_globals.output, "%s plm:gridengine: exec_argv[0]=%s, exec_path=%s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), exec_argv[0], exec_path)); @@ -445,14 +445,14 @@ static int plm_gridengine_launch_job(orte_job_t *jdata) } } asprintf(&argv[orted_index], orted_path); - OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((1, orte_plm_globals.output, "%s plm:gridengine: orted_path=%s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), orted_path)); var = opal_home_directory(); if (NULL != var) { - OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((1, orte_plm_globals.output, "%s plm:gridengine: changing to directory %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), var)); @@ -465,14 +465,14 @@ static int plm_gridengine_launch_job(orte_job_t *jdata) /* pass the vpid */ rc = orte_util_convert_vpid_to_string(¶m, nodes[nnode]->daemon->name.vpid); if (ORTE_SUCCESS != rc) { - opal_output(0, "plm:gridengine: unable to get daemon vpid as string"); + orte_output(0, "plm:gridengine: unable to get daemon vpid as string"); exit(-1); } free(argv[proc_vpid_index]); argv[proc_vpid_index] = strdup(param); free(param); - if (0 > opal_output_get_verbosity(orte_plm_globals.output)) { + if (0 > orte_output_get_verbosity(orte_plm_globals.output)) { /* setup stdin */ int fd = open("/dev/null", O_RDWR, 0); dup2(fd, 0); @@ -507,18 +507,18 @@ static int plm_gridengine_launch_job(orte_job_t *jdata) sigprocmask(SIG_UNBLOCK, &sigs, 0); /* exec the daemon */ - if (0 < opal_output_get_verbosity(orte_plm_globals.output)) { + if (0 < orte_output_get_verbosity(orte_plm_globals.output)) { param = opal_argv_join(exec_argv, ' '); if (NULL != param) { - opal_output(0, "plm:gridengine: executing: %s", param); + orte_output(0, "plm:gridengine: executing: %s", param); free(param); } } execve(exec_path, exec_argv, env); - opal_output(0, "plm:gridengine: execve failed with errno=%d\n", errno); + orte_output(0, "plm:gridengine: execve failed with errno=%d\n", errno); exit(-1); } else { /* parent */ - OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((1, orte_plm_globals.output, "%s plm:gridengine: parent", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME))); @@ -532,7 +532,7 @@ static int plm_gridengine_launch_job(orte_job_t *jdata) /* wait for daemons to callback */ if (ORTE_SUCCESS != (rc = orte_plm_base_daemon_callback(map->num_new_daemons))) { - OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((1, orte_plm_globals.output, "%s plm:gridengine: daemon launch failed for job %s on error %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_JOBID_PRINT(active_job), ORTE_ERROR_NAME(rc))); @@ -541,7 +541,7 @@ static int plm_gridengine_launch_job(orte_job_t *jdata) launch_apps: if (ORTE_SUCCESS != (rc = orte_plm_base_launch_apps(active_job))) { - OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((1, orte_plm_globals.output, "%s plm:gridengine: launch of apps failed for job %s on error %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_JOBID_PRINT(active_job), ORTE_ERROR_NAME(rc))); diff --git a/orte/mca/plm/lsf/plm_lsf_component.c b/orte/mca/plm/lsf/plm_lsf_component.c index 0f2859eec7..203bfe8362 100644 --- a/orte/mca/plm/lsf/plm_lsf_component.c +++ b/orte/mca/plm/lsf/plm_lsf_component.c @@ -29,7 +29,7 @@ #include #include "opal/mca/base/mca_base_param.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "opal/util/argv.h" #include "orte/util/proc_info.h" @@ -131,7 +131,7 @@ static int orte_plm_lsf_component_query(mca_base_module_t **module, int *priorit /* check if lsf is running here */ if (NULL == getenv("LSB_JOBID") || lsb_init("ORTE launcher") < 0) { /* nope, not here */ - opal_output_verbose(10, orte_plm_base.plm_output, + orte_output_verbose(10, orte_plm_base.plm_output, "plm:lsf: NOT available for selection"); *module = NULL; return ORTE_ERROR: diff --git a/orte/mca/plm/lsf/plm_lsf_module.c b/orte/mca/plm/lsf/plm_lsf_module.c index 2e25cc91e3..778063e060 100644 --- a/orte/mca/plm/lsf/plm_lsf_module.c +++ b/orte/mca/plm/lsf/plm_lsf_module.c @@ -55,10 +55,10 @@ #include "opal/mca/installdirs/installdirs.h" #include "opal/util/argv.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "opal/util/opal_environ.h" #include "opal/util/path.h" -#include "opal/util/show_help.h" +#include "orte/util/show_help.h" #include "opal/util/basename.h" #include "opal/mca/base/mca_base_param.h" @@ -146,7 +146,7 @@ static int plm_lsf_launch_job(orte_job_t *jdata) if (mca_plm_lsf_component.timing) { if (0 != gettimeofday(&joblaunchstart, NULL)) { - opal_output(0, "plm_lsf: could not obtain job start time"); + orte_output(0, "plm_lsf: could not obtain job start time"); } } @@ -156,7 +156,7 @@ static int plm_lsf_launch_job(orte_job_t *jdata) goto cleanup; } - OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((1, orte_plm_globals.output, "%s plm:lsf: launching job %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_JOBID_PRINT(jdata->jobid))); @@ -182,7 +182,7 @@ static int plm_lsf_launch_job(orte_job_t *jdata) num_nodes = map->num_new_daemons; if (num_nodes == 0) { /* have all the daemons we need - launch app */ - OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((1, orte_plm_globals.output, "%s plm:lsf: no new daemons to launch", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME))); goto launch_apps; @@ -231,18 +231,18 @@ static int plm_lsf_launch_job(orte_job_t *jdata) */ rc = orte_util_convert_vpid_to_string(&vpid_string, map->daemon_vpid_start); if (ORTE_SUCCESS != rc) { - opal_output(0, "plm_lsf: unable to get daemon vpid as string"); + orte_output(0, "plm_lsf: unable to get daemon vpid as string"); goto cleanup; } free(argv[proc_vpid_index]); argv[proc_vpid_index] = strdup(vpid_string); free(vpid_string); - if (0 < opal_output_get_verbosity(orte_plm_globals.output)) { + if (0 < orte_output_get_verbosity(orte_plm_globals.output)) { param = opal_argv_join(argv, ' '); if (NULL != param) { - opal_output(0, "plm:lsf: final top-level argv:"); - opal_output(0, "plm:lsf: %s", param); + orte_output(0, "plm:lsf: final top-level argv:"); + orte_output(0, "plm:lsf: %s", param); free(param); } } @@ -261,7 +261,7 @@ static int plm_lsf_launch_job(orte_job_t *jdata) if (NULL != app_prefix_dir) { if (NULL != cur_prefix && 0 != strcmp (cur_prefix, app_prefix_dir)) { - opal_show_help("help-plm-lsf.txt", "multiple-prefixes", + orte_show_help("help-plm-lsf.txt", "multiple-prefixes", true, cur_prefix, app_prefix_dir); rc = ORTE_ERR_FAILED_TO_START; goto cleanup; @@ -271,7 +271,7 @@ static int plm_lsf_launch_job(orte_job_t *jdata) same anyway */ if (NULL == cur_prefix) { cur_prefix = strdup(app_prefix_dir); - OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((1, orte_plm_globals.output, "%s plm:lsf: Set prefix:%s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), cur_prefix)); } @@ -283,7 +283,7 @@ static int plm_lsf_launch_job(orte_job_t *jdata) if (mca_plm_lsf_component.timing) { if (0 != gettimeofday(&launchstart, NULL)) { - opal_output(0, "plm_lsf: could not obtain start time"); + orte_output(0, "plm_lsf: could not obtain start time"); } } @@ -295,7 +295,7 @@ static int plm_lsf_launch_job(orte_job_t *jdata) */ if (lsb_launch(nodelist_argv, argv, LSF_DJOB_NOWAIT, env) < 0) { ORTE_ERROR_LOG(ORTE_ERR_FAILED_TO_START); - opal_output(0, "lsb_launch failed: %d", rc); + orte_output(0, "lsb_launch failed: %d", rc); rc = ORTE_ERR_FAILED_TO_START; goto cleanup; } @@ -318,19 +318,19 @@ launch_apps: if (mca_plm_lsf_component.timing) { if (0 != gettimeofday(&launchstop, NULL)) { - opal_output(0, "plm_lsf: could not obtain stop time"); + orte_output(0, "plm_lsf: could not obtain stop time"); } else { - opal_output(0, "plm_lsf: daemon block launch time is %ld usec", + orte_output(0, "plm_lsf: daemon block launch time is %ld usec", (launchstop.tv_sec - launchstart.tv_sec)*1000000 + (launchstop.tv_usec - launchstart.tv_usec)); - opal_output(0, "plm_lsf: total job launch time is %ld usec", + orte_output(0, "plm_lsf: total job launch time is %ld usec", (launchstop.tv_sec - joblaunchstart.tv_sec)*1000000 + (launchstop.tv_usec - joblaunchstart.tv_usec)); } } if (ORTE_SUCCESS != rc) { - opal_output(0, "plm:lsf: start_procs returned error %d", rc); + orte_output(0, "plm:lsf: start_procs returned error %d", rc); goto cleanup; } diff --git a/orte/mca/plm/process/plm_process_component.c b/orte/mca/plm/process/plm_process_component.c index 1266cb1be8..e5e84165ef 100644 --- a/orte/mca/plm/process/plm_process_component.c +++ b/orte/mca/plm/process/plm_process_component.c @@ -36,7 +36,7 @@ #include "opal/util/argv.h" #include "opal/util/path.h" #include "opal/util/basename.h" -#include "opal/util/show_help.h" +#include "orte/util/show_help.h" #include "opal/util/opal_environ.h" #include "opal/mca/base/mca_base_param.h" @@ -116,7 +116,7 @@ int orte_plm_process_component_open(void) "How many plm_process_agent instances to invoke concurrently (must be > 0)", false, false, 128, &tmp); if (tmp <= 0) { - opal_show_help("help-plm-process.txt", "concurrency-less-than-zero", + orte_show_help("help-plm-process.txt", "concurrency-less-than-zero", true, tmp); tmp = 1; } diff --git a/orte/mca/plm/process/plm_process_module.c b/orte/mca/plm/process/plm_process_module.c index a7bf1b77cc..8c816fa6ec 100644 --- a/orte/mca/plm/process/plm_process_module.c +++ b/orte/mca/plm/process/plm_process_module.c @@ -62,10 +62,10 @@ #include "opal/util/os_path.h" #include "opal/util/path.h" #include "opal/event/event.h" -#include "opal/util/show_help.h" +#include "orte/util/show_help.h" #include "opal/util/argv.h" #include "opal/util/opal_environ.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "opal/util/trace.h" #include "opal/util/basename.h" #include "opal/util/opal_environ.h" @@ -183,7 +183,7 @@ static int orte_plm_process_probe(orte_node_t * node, orte_plm_process_shell * s fd_set errset; char outbuf[4096]; - OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((1, orte_plm_globals.output, "%s plm:process: going to check SHELL variable on node %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), node->name)); @@ -215,7 +215,7 @@ static int orte_plm_process_probe(orte_node_t * node, orte_plm_process_shell * s ) { CloseHandle(myPipeFd[0]); CloseHandle(myPipeFd[1]); - opal_output(0, "plm:process: DuplicateHandle failed with errno=%d\n", errno); + orte_output(0, "plm:process: DuplicateHandle failed with errno=%d\n", errno); return ORTE_ERR_IN_ERRNO; } @@ -246,27 +246,27 @@ static int orte_plm_process_probe(orte_node_t * node, orte_plm_process_shell * s ) { CloseHandle(myPipeFd[1]); - opal_output(0, "plm:process: CreateProcess failed with errno=%d\n", errno); //, GetLastError() ); + orte_output(0, "plm:process: CreateProcess failed with errno=%d\n", errno); //, GetLastError() ); return ORTE_ERR_IN_ERRNO; } } #endif /* if ((pid = fork()) < 0) { - opal_output(0, "plm:process: fork failed with errno=%d\n", errno); + orte_output(0, "plm:process: fork failed with errno=%d\n", errno); return ORTE_ERR_IN_ERRNO; } else if (pid == 0) { // child //processInfo.hProcess if (dup2(fd[1], 1) < 0) { - opal_output(0, "plm:process: dup2 failed with errno=%d\n", errno); + orte_output(0, "plm:process: dup2 failed with errno=%d\n", errno); return ORTE_ERR_IN_ERRNO; } execvp(argv[0], argv); exit(errno); } if (close(fd[1])) { - opal_output(0, "plm:process: close failed with errno=%d\n", errno); + orte_output(0, "plm:process: close failed with errno=%d\n", errno); return ORTE_ERR_IN_ERRNO; } */ @@ -348,7 +348,7 @@ static int orte_plm_process_probe(orte_node_t * node, orte_plm_process_shell * s } } */ - OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((1, orte_plm_globals.output, "%s plm:process: node:%s has SHELL: %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), node->name, orte_plm_process_shell_name[*shell])); @@ -370,7 +370,7 @@ static int orte_plm_process_fill_exec_path( char ** exec_path ) if (NULL == path) { path = "PATH is empty!"; } - opal_show_help("help-plm-process.txt", "no-local-orted", + orte_show_help("help-plm-process.txt", "no-local-orted", true, path, opal_install_dirs.bindir); return ORTE_ERR_NOT_FOUND; } @@ -387,26 +387,26 @@ static void orte_plm_process_wait_daemon(pid_t pid, int status, void* cbdata) if (! WIFEXITED(status) || ! WEXITSTATUS(status) == 0) { /* tell the user something went wrong */ - opal_output(0, "ERROR: A daemon failed to start as expected."); - opal_output(0, "ERROR: There may be more information available from"); - opal_output(0, "ERROR: the remote shell (see above)."); + orte_output(0, "ERROR: A daemon failed to start as expected."); + orte_output(0, "ERROR: There may be more information available from"); + orte_output(0, "ERROR: the remote shell (see above)."); if (WIFEXITED(status)) { - opal_output(0, "ERROR: The daemon exited unexpectedly with status %d.", + orte_output(0, "ERROR: The daemon exited unexpectedly with status %d.", WEXITSTATUS(status)); } else if (WIFSIGNALED(status)) { #ifdef WCOREDUMP if (WCOREDUMP(status)) { - opal_output(0, "The daemon received a signal %d (with core).", + orte_output(0, "The daemon received a signal %d (with core).", WTERMSIG(status)); } else { - opal_output(0, "The daemon received a signal %d.", WTERMSIG(status)); + orte_output(0, "The daemon received a signal %d.", WTERMSIG(status)); } #else - opal_output(0, "The daemon received a signal %d.", WTERMSIG(status)); + orte_output(0, "The daemon received a signal %d.", WTERMSIG(status)); #endif /* WCOREDUMP */ } else { - opal_output(0, "No extra status information is available: %d.", status); + orte_output(0, "No extra status information is available: %d.", status); } /* report that the daemon has failed so we break out of the daemon * callback receive and can exit @@ -425,11 +425,11 @@ static void orte_plm_process_wait_daemon(pid_t pid, int status, void* cbdata) if (mca_plm_process_component.timing && mca_plm_process_component.num_children == 0) { if (0 != gettimeofday(&joblaunchstop, NULL)) { - opal_output(0, "plm_process: could not obtain job launch stop time"); + orte_output(0, "plm_process: could not obtain job launch stop time"); } else { deltat = (joblaunchstop.tv_sec - joblaunchstart.tv_sec)*1000000 + (joblaunchstop.tv_usec - joblaunchstart.tv_usec); - opal_output(0, "plm_process: total time to launch job is %lu usec", deltat); + orte_output(0, "plm_process: total time to launch job is %lu usec", deltat); } } @@ -466,7 +466,7 @@ int orte_plm_process_launch(orte_job_t *jdata) if (mca_plm_process_component.timing) { if (0 != gettimeofday(&joblaunchstart, NULL)) { - opal_output(0, "plm_process: could not obtain start time"); + orte_output(0, "plm_process: could not obtain start time"); joblaunchstart.tv_sec = 0; joblaunchstart.tv_usec = 0; } @@ -478,7 +478,7 @@ int orte_plm_process_launch(orte_job_t *jdata) return rc; } - OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((1, orte_plm_globals.output, "%s plm:process: launching job %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_JOBID_PRINT(jdata->jobid))); @@ -503,7 +503,7 @@ int orte_plm_process_launch(orte_job_t *jdata) if (0 == map->num_new_daemons) { /* have all the daemons we need - launch app */ - OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((1, orte_plm_globals.output, "%s plm:process: no new daemons to launch", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME))); goto launch_apps; @@ -524,7 +524,7 @@ int orte_plm_process_launch(orte_job_t *jdata) * As we cannot run in this situation, pretty print the error * and return an error code. */ - opal_show_help("help-plm-process.txt", "deadlock-params", + orte_show_help("help-plm-process.txt", "deadlock-params", true, mca_plm_process_component.num_concurrent, map->num_new_daemons); rc = ORTE_ERR_FATAL; goto cleanup; @@ -567,9 +567,9 @@ int orte_plm_process_launch(orte_job_t *jdata) &proc_vpid_index, &node_name_index2); - if (0 < opal_output_get_verbosity(orte_plm_globals.output)) { + if (0 < orte_output_get_verbosity(orte_plm_globals.output)) { param = opal_argv_join(argv, ' '); - OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((1, orte_plm_globals.output, "%s plm:process: final template argv:\n\t%s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), (NULL == param) ? "NULL" : param)); @@ -628,7 +628,7 @@ int orte_plm_process_launch(orte_job_t *jdata) */ if (NULL == nodes[nnode]->daemon) { ORTE_ERROR_LOG(ORTE_ERR_FATAL); - OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((1, orte_plm_globals.output, "%s plm:process:launch daemon failed to be defined on node %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), nodes[nnode]->name)); @@ -639,9 +639,9 @@ int orte_plm_process_launch(orte_job_t *jdata) free(argv[node_name_index2]); argv[node_name_index2] = strdup(nodes[nnode]->name); - if (0 < opal_output_get_verbosity(orte_plm_globals.output)) { + if (0 < orte_output_get_verbosity(orte_plm_globals.output)) { param = opal_argv_join(argv, ' '); - OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((1, orte_plm_globals.output, "%s plm:process: start daemon as:\n\t%s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), (NULL == param) ? "NULL" : param)); @@ -652,7 +652,7 @@ int orte_plm_process_launch(orte_job_t *jdata) char** env; char* var; - OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((1, orte_plm_globals.output, "%s plm:process: launching on node %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), nodes[nnode]->name)); @@ -706,7 +706,7 @@ int orte_plm_process_launch(orte_job_t *jdata) newenv = temp; } opal_setenv("PATH", newenv, true, &environ); - OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((1, orte_plm_globals.output, "%s plm:process: reset PATH: %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), newenv)); @@ -722,7 +722,7 @@ int orte_plm_process_launch(orte_job_t *jdata) newenv = temp; } opal_setenv("LD_LIBRARY_PATH", newenv, true, &environ); - OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((1, orte_plm_globals.output, "%s plm:process: reset LD_LIBRARY_PATH: %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), newenv)); @@ -746,7 +746,7 @@ int orte_plm_process_launch(orte_job_t *jdata) hope they start in $HOME. :-) */ var = opal_home_directory(); if (NULL != var) { - OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((1, orte_plm_globals.output, "%s plm:process: changing to directory %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), var)); @@ -760,7 +760,7 @@ int orte_plm_process_launch(orte_job_t *jdata) /* pass the vpid */ rc = orte_util_convert_vpid_to_string(&vpid_string, nodes[nnode]->daemon->name.vpid); if (ORTE_SUCCESS != rc) { - opal_output(0, "plm:process: unable to get daemon vpid as string"); + orte_output(0, "plm:process: unable to get daemon vpid as string"); goto cleanup; } free(argv[proc_vpid_index]); @@ -784,9 +784,9 @@ int orte_plm_process_launch(orte_job_t *jdata) env = opal_argv_copy(environ); /* exec the daemon */ - if (0 < opal_output_get_verbosity(orte_plm_globals.output)) { + if (0 < orte_output_get_verbosity(orte_plm_globals.output)) { param = opal_argv_join(exec_argv, ' '); - OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((1, orte_plm_globals.output, "%s plm:process: executing:\n\t%s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), (NULL == param) ? "NULL" : param)); @@ -801,7 +801,7 @@ int orte_plm_process_launch(orte_job_t *jdata) } /* indicate this daemon has been launched in case anyone is sitting on that trigger */ nodes[nnode]->daemon->state = ORTE_PROC_STATE_LAUNCHED; - opal_output(0, "plm:process: execv %s hopefully started (pid %d)\n", exec_path, pid); + orte_output(0, "plm:process: execv %s hopefully started (pid %d)\n", exec_path, pid); OPAL_THREAD_LOCK(&mca_plm_process_component.lock); /* This situation can lead to a deadlock if '--debug-daemons' is set. @@ -820,7 +820,7 @@ int orte_plm_process_launch(orte_job_t *jdata) orte_wait_cb(pid, orte_plm_process_wait_daemon, NULL); /* if required - add delay to avoid problems w/ X11 authentication */ - if (0 < opal_output_get_verbosity(orte_plm_globals.output) + if (0 < orte_output_get_verbosity(orte_plm_globals.output) && mca_plm_process_component.delay) { sleep(mca_plm_process_component.delay); } @@ -829,7 +829,7 @@ int orte_plm_process_launch(orte_job_t *jdata) /* wait for daemons to callback */ if (ORTE_SUCCESS != (rc = orte_plm_base_daemon_callback(map->num_new_daemons))) { - OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((1, orte_plm_globals.output, "%s plm:process: launch of apps failed for job %s on error %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_JOBID_PRINT(active_job), ORTE_ERROR_NAME(rc))); @@ -838,7 +838,7 @@ int orte_plm_process_launch(orte_job_t *jdata) launch_apps: if (ORTE_SUCCESS != (rc = orte_plm_base_launch_apps(active_job))) { - OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((1, orte_plm_globals.output, "%s plm:process: launch of apps failed for job %s on error %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_JOBID_PRINT(active_job), ORTE_ERROR_NAME(rc))); diff --git a/orte/mca/plm/rsh/plm_rsh_component.c b/orte/mca/plm/rsh/plm_rsh_component.c index 60242daa4e..b27e8466e2 100644 --- a/orte/mca/plm/rsh/plm_rsh_component.c +++ b/orte/mca/plm/rsh/plm_rsh_component.c @@ -37,12 +37,12 @@ #include "opal/util/argv.h" #include "opal/util/path.h" #include "opal/util/basename.h" -#include "opal/util/show_help.h" #include "opal/mca/base/mca_base_param.h" #include "orte/mca/errmgr/errmgr.h" #include "orte/mca/rml/rml.h" #include "orte/util/name_fns.h" +#include "orte/util/output.h" #include "orte/mca/plm/plm.h" #include "orte/mca/plm/base/plm_private.h" @@ -121,7 +121,7 @@ int orte_plm_rsh_component_open(void) "How many plm_rsh_agent instances to invoke concurrently (must be > 0)", false, false, 128, &tmp); if (tmp <= 0) { - opal_show_help("help-plm-rsh.txt", "concurrency-less-than-zero", + orte_show_help("help-plm-rsh.txt", "concurrency-less-than-zero", true, tmp); tmp = 1; } @@ -182,7 +182,7 @@ int orte_plm_rsh_component_query(mca_base_module_t **module, int *priority) bname = opal_basename(mca_plm_rsh_component.agent_argv[0]); if (NULL != bname && 0 == strcmp(bname, "ssh") - && 0 >= opal_output_get_verbosity(orte_plm_globals.output)) { + && 0 >= orte_output_get_verbosity(orte_plm_globals.output)) { for (i = 1; NULL != mca_plm_rsh_component.agent_argv[i]; ++i) { if (0 == strcasecmp("-x", mca_plm_rsh_component.agent_argv[i])) { @@ -203,7 +203,7 @@ int orte_plm_rsh_component_query(mca_base_module_t **module, int *priority) component */ if (NULL == mca_plm_rsh_component.agent_argv || NULL == mca_plm_rsh_component.agent_argv[0]) { - OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((1, orte_plm_globals.output, "%s plm:rsh: unable to be used: cannot find the " "launching agent. Looked for: %s\n", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), @@ -215,7 +215,7 @@ int orte_plm_rsh_component_query(mca_base_module_t **module, int *priority) opal_path_findv(mca_plm_rsh_component.agent_argv[0], X_OK, environ, NULL); if (NULL == mca_plm_rsh_component.agent_path) { - OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((1, orte_plm_globals.output, "%s plm:rsh: unable to be used: cannot find path " "for launching agent \"%s\"\n", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), diff --git a/orte/mca/plm/rsh/plm_rsh_module.c b/orte/mca/plm/rsh/plm_rsh_module.c index 8fe5e4a12b..061981a3dd 100644 --- a/orte/mca/plm/rsh/plm_rsh_module.c +++ b/orte/mca/plm/rsh/plm_rsh_module.c @@ -64,16 +64,14 @@ #include "opal/util/os_path.h" #include "opal/util/path.h" #include "opal/event/event.h" -#include "opal/util/show_help.h" #include "opal/util/argv.h" #include "opal/util/opal_environ.h" -#include "opal/util/output.h" #include "opal/util/trace.h" #include "opal/util/basename.h" #include "opal/util/bit_ops.h" +#include "orte/util/output.h" #include "orte/util/session_dir.h" - #include "orte/runtime/orte_wait.h" #include "orte/runtime/orte_wakeup.h" #include "orte/runtime/orte_globals.h" @@ -177,21 +175,21 @@ static int orte_plm_rsh_probe(char *nodename, pid_t pid; char outbuf[4096]; - OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((1, orte_plm_globals.output, "%s plm:rsh: going to check SHELL variable on node %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), nodename)); *shell = ORTE_PLM_RSH_SHELL_UNKNOWN; if (pipe(fd)) { - OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((1, orte_plm_globals.output, "%s plm:rsh: pipe failed with errno=%d", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), errno)); return ORTE_ERR_IN_ERRNO; } if ((pid = fork()) < 0) { - OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((1, orte_plm_globals.output, "%s plm:rsh: fork failed with errno=%d", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), errno)); @@ -199,7 +197,7 @@ static int orte_plm_rsh_probe(char *nodename, } else if (pid == 0) { /* child */ if (dup2(fd[1], 1) < 0) { - OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((1, orte_plm_globals.output, "%s plm:rsh: dup2 failed with errno=%d", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), errno)); @@ -215,7 +213,7 @@ static int orte_plm_rsh_probe(char *nodename, exit(errno); } if (close(fd[1])) { - OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((1, orte_plm_globals.output, "%s plm:rsh: close failed with errno=%d", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), errno)); @@ -232,7 +230,7 @@ static int orte_plm_rsh_probe(char *nodename, if (ret < 0) { if (errno == EINTR) continue; - OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((1, orte_plm_globals.output, "%s plm:rsh: Unable to detect the remote shell (error %s)", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), strerror(errno))); @@ -268,7 +266,7 @@ static int orte_plm_rsh_probe(char *nodename, } } - OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((1, orte_plm_globals.output, "%s plm:rsh: node %s has SHELL: %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), nodename, @@ -295,7 +293,7 @@ static void orte_plm_rsh_wait_daemon(pid_t pid, int status, void* cbdata) if (!orte_process_info.hnp) { opal_buffer_t buf; orte_vpid_t *vpid=(orte_vpid_t*)cbdata; - OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((1, orte_plm_globals.output, "%s daemon %d failed with status %d", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), (int)*vpid, WEXITSTATUS(status))); @@ -308,7 +306,7 @@ static void orte_plm_rsh_wait_daemon(pid_t pid, int status, void* cbdata) OBJ_DESTRUCT(&buf); } else { orte_proc_t *daemon=(orte_proc_t*)cbdata; - OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((1, orte_plm_globals.output, "%s daemon %d failed with status %d", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), (int)daemon->name.vpid, WEXITSTATUS(status))); @@ -330,11 +328,11 @@ static void orte_plm_rsh_wait_daemon(pid_t pid, int status, void* cbdata) if (orte_timing && mca_plm_rsh_component.num_children == 0) { if (0 != gettimeofday(&joblaunchstop, NULL)) { - opal_output(0, "plm_rsh: could not obtain job launch stop time"); + orte_output(0, "plm_rsh: could not obtain job launch stop time"); } else { deltat = (joblaunchstop.tv_sec - joblaunchstart.tv_sec)*1000000 + (joblaunchstop.tv_usec - joblaunchstart.tv_usec); - opal_output(0, "plm_rsh: total time to launch job is %lu usec", deltat); + orte_output(0, "plm_rsh: total time to launch job is %lu usec", deltat); } } @@ -363,7 +361,7 @@ static int setup_launch(int *argcptr, char ***argvptr, /* This user is unknown to the system. Therefore, there is no reason we * spawn whatsoever in his name. Give up with a HUGE error message. */ - opal_show_help( "help-plm-rsh.txt", "unknown-user", true, (int)getuid() ); + orte_show_help( "help-plm-rsh.txt", "unknown-user", true, (int)getuid() ); return ORTE_ERR_FATAL; } else { param = p->pw_shell; @@ -385,13 +383,13 @@ static int setup_launch(int *argcptr, char ***argvptr, case ORTE_PLM_RSH_SHELL_TCSH: /* fall through */ case ORTE_PLM_RSH_SHELL_CSH: local_csh = true; break; default: - opal_output(0, "WARNING: local probe returned unhandled shell:%s assuming bash\n", + orte_output(0, "WARNING: local probe returned unhandled shell:%s assuming bash\n", (NULL != param) ? param : "unknown"); *remote_sh = true; break; } - OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((1, orte_plm_globals.output, "%s plm:rsh: local csh: %d, local sh: %d", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), local_csh, local_sh)); @@ -400,7 +398,7 @@ static int setup_launch(int *argcptr, char ***argvptr, if (mca_plm_rsh_component.assume_same_shell) { *remote_sh = local_sh; *remote_csh = local_csh; - OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((1, orte_plm_globals.output, "%s plm:rsh: assuming same remote shell as local shell", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME))); } else { @@ -420,12 +418,12 @@ static int setup_launch(int *argcptr, char ***argvptr, case ORTE_PLM_RSH_SHELL_TCSH: /* fall through */ case ORTE_PLM_RSH_SHELL_CSH: *remote_csh = true; break; default: - opal_output(0, "WARNING: rsh probe returned unhandled shell; assuming bash\n"); + orte_output(0, "WARNING: rsh probe returned unhandled shell; assuming bash\n"); *remote_sh = true; } } - OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((1, orte_plm_globals.output, "%s plm:rsh: remote csh: %d, remote sh: %d", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), *remote_csh, *remote_sh)); @@ -461,9 +459,9 @@ static int setup_launch(int *argcptr, char ***argvptr, proc_vpid_index, node_name_index2); - if (0 < opal_output_get_verbosity(orte_plm_globals.output)) { + if (0 < orte_output_get_verbosity(orte_plm_globals.output)) { param = opal_argv_join(argv, ' '); - OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((1, orte_plm_globals.output, "%s plm:rsh: final template argv:\n\t%s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), (NULL == param) ? "NULL" : param)); @@ -590,7 +588,7 @@ static void ssh_child(int argc, char **argv, /* pass the vpid */ rc = orte_util_convert_vpid_to_string(&var, vpid); if (ORTE_SUCCESS != rc) { - opal_output(0, "orte_plm_rsh: unable to get daemon vpid as string"); + orte_output(0, "orte_plm_rsh: unable to get daemon vpid as string"); exit(-1); } free(argv[proc_vpid_index]); @@ -598,7 +596,7 @@ static void ssh_child(int argc, char **argv, free(var); /* setup stdin if verbosity is not set */ - if (0 > opal_output_get_verbosity(orte_plm_globals.output)) { + if (0 > orte_output_get_verbosity(orte_plm_globals.output)) { fdin = open("/dev/null", O_RDWR); dup2(fdin, 0); close(fdin); @@ -633,14 +631,14 @@ static void ssh_child(int argc, char **argv, /* exec the daemon */ var = opal_argv_join(argv, ' '); - OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((1, orte_plm_globals.output, "%s plm:rsh: executing: (%s) [%s]", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), exec_path, (NULL == var) ? "NULL" : var)); if (NULL != var) free(var); execve(exec_path, exec_argv, env); - opal_output(0, "plm:rsh: execv of %s failed with errno=%s(%d)\n", + orte_output(0, "plm:rsh: execv of %s failed with errno=%s(%d)\n", exec_path, strerror(errno), errno); exit(-1); } @@ -691,7 +689,7 @@ static int remote_spawn(opal_buffer_t *launch) pid_t pid; orte_std_cntr_t n; - OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((1, orte_plm_globals.output, "%s plm:rsh: remote spawn called", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME))); @@ -721,7 +719,7 @@ static int remote_spawn(opal_buffer_t *launch) /* if I have no children, just return */ if (opal_list_is_empty(&mca_plm_rsh_component.children)) { - OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((1, orte_plm_globals.output, "%s plm:rsh: remote spawn - have no children!", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME))); failed_launch = false; @@ -749,7 +747,7 @@ static int remote_spawn(opal_buffer_t *launch) vpid = child->name.vpid; if (NULL == nodes[vpid]) { - opal_output(0, "%s NULL in daemonmap at position %d", + orte_output(0, "%s NULL in daemonmap at position %d", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), (int)vpid); rc = ORTE_ERR_NOT_FOUND; goto cleanup; @@ -771,7 +769,7 @@ static int remote_spawn(opal_buffer_t *launch) /* child */ if (pid == 0) { - OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((1, orte_plm_globals.output, "%s plm:rsh: launching on node %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), nodes[vpid]->name)); @@ -861,7 +859,7 @@ int orte_plm_rsh_launch(orte_job_t *jdata) if (orte_timing) { if (0 != gettimeofday(&joblaunchstart, NULL)) { - opal_output(0, "plm_rsh: could not obtain start time"); + orte_output(0, "plm_rsh: could not obtain start time"); joblaunchstart.tv_sec = 0; joblaunchstart.tv_usec = 0; } @@ -873,7 +871,7 @@ int orte_plm_rsh_launch(orte_job_t *jdata) goto cleanup; } - OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((1, orte_plm_globals.output, "%s plm:rsh: setting up job %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_JOBID_PRINT(jdata->jobid))); @@ -898,13 +896,13 @@ int orte_plm_rsh_launch(orte_job_t *jdata) if (0 == map->num_new_daemons) { /* have all the daemons we need - launch app */ - OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((1, orte_plm_globals.output, "%s plm:rsh: no new daemons to launch", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME))); goto launch_apps; } - if (0 < opal_output_get_verbosity(orte_plm_globals.output) && + if (0 < orte_output_get_verbosity(orte_plm_globals.output) && mca_plm_rsh_component.num_concurrent < map->num_new_daemons) { /** * If we are in '--debug-daemons' we keep the ssh connection @@ -919,7 +917,7 @@ int orte_plm_rsh_launch(orte_job_t *jdata) * As we cannot run in this situation, pretty print the error * and return an error code. */ - opal_show_help("help-plm-rsh.txt", "deadlock-params", + orte_show_help("help-plm-rsh.txt", "deadlock-params", true, mca_plm_rsh_component.num_concurrent, map->num_new_daemons); rc = ORTE_ERR_FATAL; goto cleanup; @@ -1023,7 +1021,7 @@ int orte_plm_rsh_launch(orte_job_t *jdata) launch: /* if this daemon already exists, don't launch it! */ if (nodes[nnode]->daemon_launched) { - OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((1, orte_plm_globals.output, "%s plm:rsh:launch daemon already exists on node %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), nodes[nnode]->name)); @@ -1035,7 +1033,7 @@ launch: */ if (NULL == nodes[nnode]->daemon) { ORTE_ERROR_LOG(ORTE_ERR_FATAL); - OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((1, orte_plm_globals.output, "%s plm:rsh:launch daemon failed to be defined on node %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), nodes[nnode]->name)); @@ -1056,7 +1054,7 @@ launch: free(argv[node_name_index2]); argv[node_name_index2] = strdup(nodes[nnode]->name); - OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((1, orte_plm_globals.output, "%s plm:rsh: launching on node %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), nodes[nnode]->name)); @@ -1084,7 +1082,7 @@ launch: /* record the pid */ nodes[nnode]->daemon->pid = pid; - OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((1, orte_plm_globals.output, "%s plm:rsh: recording launch of daemon %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(&nodes[nnode]->daemon->name))); @@ -1106,7 +1104,7 @@ launch: orte_wait_cb(pid, orte_plm_rsh_wait_daemon, (void*)nodes[nnode]->daemon); /* if required - add delay to avoid problems w/ X11 authentication */ - if (0 < opal_output_get_verbosity(orte_plm_globals.output) + if (0 < orte_output_get_verbosity(orte_plm_globals.output) && mca_plm_rsh_component.delay) { sleep(mca_plm_rsh_component.delay); } @@ -1117,7 +1115,7 @@ next_node: /* wait for daemons to callback */ if (ORTE_SUCCESS != (rc = orte_plm_base_daemon_callback(map->num_new_daemons))) { - OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((1, orte_plm_globals.output, "%s plm:rsh: daemon launch failed for job %s on error %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_JOBID_PRINT(active_job), ORTE_ERROR_NAME(rc))); @@ -1126,7 +1124,7 @@ next_node: launch_apps: if (ORTE_SUCCESS != (rc = orte_plm_base_launch_apps(active_job))) { - OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((1, orte_plm_globals.output, "%s plm:rsh: launch of apps failed for job %s on error %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_JOBID_PRINT(active_job), ORTE_ERROR_NAME(rc))); @@ -1175,7 +1173,7 @@ static int find_children(int rank, int parent, int me, int num_procs) child = OBJ_NEW(orte_namelist_t); child->name.jobid = ORTE_PROC_MY_NAME->jobid; child->name.vpid = peer; - OPAL_OUTPUT_VERBOSE((3, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((3, orte_plm_globals.output, "%s plm:rsh find-children found child %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(&child->name))); diff --git a/orte/mca/plm/slurm/plm_slurm_component.c b/orte/mca/plm/slurm/plm_slurm_component.c index 0f7bff9852..1f4564c9c3 100644 --- a/orte/mca/plm/slurm/plm_slurm_component.c +++ b/orte/mca/plm/slurm/plm_slurm_component.c @@ -25,7 +25,7 @@ #include "orte_config.h" #include "orte/constants.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "opal/mca/base/mca_base_param.h" #include "orte/util/name_fns.h" @@ -123,7 +123,7 @@ static int orte_plm_slurm_component_query(mca_base_module_t **module, int *prior if (NULL != getenv("SLURM_JOBID")) { *priority = mca_plm_slurm_component.priority; - OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((1, orte_plm_globals.output, "%s plm:slrum: available for selection", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME))); diff --git a/orte/mca/plm/slurm/plm_slurm_module.c b/orte/mca/plm/slurm/plm_slurm_module.c index dcaf70dc07..b8e8c4566c 100644 --- a/orte/mca/plm/slurm/plm_slurm_module.c +++ b/orte/mca/plm/slurm/plm_slurm_module.c @@ -52,13 +52,12 @@ #include "opal/mca/installdirs/installdirs.h" #include "opal/util/argv.h" -#include "opal/util/output.h" #include "opal/util/opal_environ.h" #include "opal/util/path.h" -#include "opal/util/show_help.h" #include "opal/util/basename.h" #include "opal/mca/base/mca_base_param.h" +#include "orte/util/output.h" #include "orte/util/name_fns.h" #include "orte/runtime/orte_globals.h" #include "orte/runtime/runtime.h" @@ -136,7 +135,7 @@ static int plm_slurm_launch_job(orte_job_t *jdata) char **argv = NULL; int argc; int rc; - char *tmp; + char *tmp, **tmpv; char** env = NULL; char* var; char *nodelist_flat; @@ -151,7 +150,7 @@ static int plm_slurm_launch_job(orte_job_t *jdata) if (orte_timing) { if (0 != gettimeofday(&launchstart, NULL)) { - opal_output(0, "plm_slurm: could not obtain job start time"); + orte_output(0, "plm_slurm: could not obtain job start time"); launchstart.tv_sec = 0; launchstart.tv_usec = 0; } @@ -166,7 +165,7 @@ static int plm_slurm_launch_job(orte_job_t *jdata) goto cleanup; } - OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((1, orte_plm_globals.output, "%s plm:slurm: launching job %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_JOBID_PRINT(jdata->jobid))); @@ -191,7 +190,7 @@ static int plm_slurm_launch_job(orte_job_t *jdata) if (0 == map->num_new_daemons) { /* no new daemons required - just launch apps */ - OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((1, orte_plm_globals.output, "%s plm:slurm: no new daemons to launch", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME))); goto launch_apps; @@ -249,7 +248,7 @@ static int plm_slurm_launch_job(orte_job_t *jdata) opal_argv_append(&nodelist_argc, &nodelist_argv, nodes[n]->name); } if (0 == opal_argv_count(nodelist_argv)) { - opal_show_help("help-plm-slurm.txt", "no-hosts-in-list", true); + orte_show_help("help-plm-slurm.txt", "no-hosts-in-list", true); rc = ORTE_ERR_FAILED_TO_START; goto cleanup; } @@ -259,7 +258,7 @@ static int plm_slurm_launch_job(orte_job_t *jdata) opal_argv_append(&argc, &argv, tmp); free(tmp); - OPAL_OUTPUT_VERBOSE((2, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((2, orte_plm_globals.output, "%s plm:slurm: launching on nodes %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), nodelist_flat)); @@ -268,7 +267,11 @@ static int plm_slurm_launch_job(orte_job_t *jdata) */ /* add the daemon command (as specified by user) */ - opal_argv_append(&argc, &argv, mca_plm_slurm_component.orted); + tmpv = opal_argv_split(mca_plm_slurm_component.orted, ' '); + for (i = 0; NULL != tmpv && NULL != tmpv[i]; ++i) { + opal_argv_append(&argc, &argv, tmpv[i]); + } + opal_argv_free(tmpv); /* Add basic orted command line options, including debug flags */ orte_plm_base_orted_append_basic_args(&argc, &argv, @@ -281,7 +284,7 @@ static int plm_slurm_launch_job(orte_job_t *jdata) */ rc = orte_util_convert_vpid_to_string(&name_string, map->daemon_vpid_start); if (ORTE_SUCCESS != rc) { - opal_output(0, "plm_slurm: unable to get daemon vpid as string"); + orte_output(0, "plm_slurm: unable to get daemon vpid as string"); goto cleanup; } @@ -289,9 +292,9 @@ static int plm_slurm_launch_job(orte_job_t *jdata) argv[proc_vpid_index] = strdup(name_string); free(name_string); - if (0 < opal_output_get_verbosity(orte_plm_globals.output)) { + if (0 < orte_output_get_verbosity(orte_plm_globals.output)) { param = opal_argv_join(argv, ' '); - OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((1, orte_plm_globals.output, "%s plm:slurm: final top-level argv:\n\t%s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), (NULL == param) ? "NULL" : param)); @@ -312,7 +315,7 @@ static int plm_slurm_launch_job(orte_job_t *jdata) if (NULL != app_prefix_dir) { if (NULL != cur_prefix && 0 != strcmp (cur_prefix, app_prefix_dir)) { - opal_show_help("help-plm-slurm.txt", "multiple-prefixes", + orte_show_help("help-plm-slurm.txt", "multiple-prefixes", true, cur_prefix, app_prefix_dir); return ORTE_ERR_FATAL; } @@ -321,7 +324,7 @@ static int plm_slurm_launch_job(orte_job_t *jdata) same anyway */ if (NULL == cur_prefix) { cur_prefix = strdup(app_prefix_dir); - OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((1, orte_plm_globals.output, "%s plm:slurm: Set prefix:%s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), cur_prefix)); @@ -351,7 +354,7 @@ static int plm_slurm_launch_job(orte_job_t *jdata) /* wait for daemons to callback */ if (ORTE_SUCCESS != (rc = orte_plm_base_daemon_callback(map->num_new_daemons))) { - OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((1, orte_plm_globals.output, "%s plm:slurm: daemon launch failed for job %s on error %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_JOBID_PRINT(active_job), ORTE_ERROR_NAME(rc))); @@ -360,7 +363,7 @@ static int plm_slurm_launch_job(orte_job_t *jdata) launch_apps: if (ORTE_SUCCESS != (rc = orte_plm_base_launch_apps(active_job))) { - OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((1, orte_plm_globals.output, "%s plm:slurm: launch of apps failed for job %s on error %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_JOBID_PRINT(active_job), ORTE_ERROR_NAME(rc))); @@ -372,16 +375,16 @@ launch_apps: if (orte_timing) { if (0 != gettimeofday(&launchstop, NULL)) { - opal_output(0, "plm_slurm: could not obtain stop time"); + orte_output(0, "plm_slurm: could not obtain stop time"); } else { - opal_output(0, "plm_slurm: total job launch time is %ld usec", + orte_output(0, "plm_slurm: total job launch time is %ld usec", (launchstop.tv_sec - launchstart.tv_sec)*1000000 + (launchstop.tv_usec - launchstart.tv_usec)); } } if (ORTE_SUCCESS != rc) { - opal_output(0, "plm:slurm: start_procs returned error %d", rc); + orte_output(0, "plm:slurm: start_procs returned error %d", rc); goto cleanup; } @@ -548,7 +551,7 @@ static int plm_slurm_start_proc(int argc, char **argv, char **env, asprintf(&newenv, "%s/%s", prefix, bin_base); } opal_setenv("PATH", newenv, true, &env); - OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((1, orte_plm_globals.output, "%s plm:slurm: reset PATH: %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), newenv)); @@ -562,7 +565,7 @@ static int plm_slurm_start_proc(int argc, char **argv, char **env, asprintf(&newenv, "%s/%s", prefix, lib_base); } opal_setenv("LD_LIBRARY_PATH", newenv, true, &env); - OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((1, orte_plm_globals.output, "%s plm:slurm: reset LD_LIBRARY_PATH: %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), newenv)); @@ -576,7 +579,7 @@ static int plm_slurm_start_proc(int argc, char **argv, char **env, /* When not in debug mode and --debug-daemons was not passed, * tie stdout/stderr to dev null so we don't see messages from orted */ - if (0 >= opal_output_get_verbosity(orte_plm_globals.output) && + if (0 >= orte_output_get_verbosity(orte_plm_globals.output) && !orte_debug_daemons_flag) { if (fd >= 0) { if (fd != 1) { @@ -599,7 +602,7 @@ static int plm_slurm_start_proc(int argc, char **argv, char **env, execve(exec_argv, argv, env); - opal_output(0, "plm:slurm:start_proc: exec failed"); + orte_output(0, "plm:slurm:start_proc: exec failed"); /* don't return - need to exit - returning would be bad - we're not in the calling process anymore */ exit(1); diff --git a/orte/mca/plm/submit/pls_submit_component.c b/orte/mca/plm/submit/pls_submit_component.c index d8d3c1fa9b..f96a425c81 100644 --- a/orte/mca/plm/submit/pls_submit_component.c +++ b/orte/mca/plm/submit/pls_submit_component.c @@ -30,7 +30,7 @@ #include "opal/util/argv.h" #include "opal/util/path.h" #include "opal/util/basename.h" -#include "opal/util/show_help.h" +#include "orte/util/show_help.h" #include "opal/mca/base/mca_base_param.h" #include "orte/mca/errmgr/errmgr.h" @@ -115,7 +115,7 @@ int orte_plm_submit_component_open(void) "How many plm_submit_agent instances to invoke concurrently (must be > 0)", false, false, 128, &tmp); if (tmp <= 0) { - opal_show_help("help-plm-submit.txt", "concurrency-less-than-zero", + orte_show_help("help-plm-submit.txt", "concurrency-less-than-zero", true, tmp); tmp = 1; } diff --git a/orte/mca/plm/submit/pls_submit_module.c b/orte/mca/plm/submit/pls_submit_module.c index 4f71f61a41..060e21132f 100644 --- a/orte/mca/plm/submit/pls_submit_module.c +++ b/orte/mca/plm/submit/pls_submit_module.c @@ -54,10 +54,10 @@ #include "opal/util/os_path.h" #include "opal/util/path.h" #include "opal/event/event.h" -#include "opal/util/show_help.h" +#include "orte/util/show_help.h" #include "opal/util/argv.h" #include "opal/util/opal_environ.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "opal/util/trace.h" #include "opal/util/basename.h" #include "opal/util/opal_environ.h" @@ -159,21 +159,21 @@ static int orte_plm_submit_probe(orte_node_t *node, orte_plm_submit_shell * shel char outbuf[4096]; if (mca_plm_submit_component.debug) { - opal_output(0, "plm:submit: going to check SHELL variable on node %s\n", + orte_output(0, "plm:submit: going to check SHELL variable on node %s\n", node->name); } *shell = ORTE_PLM_submit_SHELL_UNKNOWN; if (pipe(fd)) { - opal_output(0, "plm:submit: pipe failed with errno=%d\n", errno); + orte_output(0, "plm:submit: pipe failed with errno=%d\n", errno); return ORTE_ERR_IN_ERRNO; } if ((pid = fork()) < 0) { - opal_output(0, "plm:submit: fork failed with errno=%d\n", errno); + orte_output(0, "plm:submit: fork failed with errno=%d\n", errno); return ORTE_ERR_IN_ERRNO; } else if (pid == 0) { /* child */ if (dup2(fd[1], 1) < 0) { - opal_output(0, "plm:submit: dup2 failed with errno=%d\n", errno); + orte_output(0, "plm:submit: dup2 failed with errno=%d\n", errno); exit(01); } /* Build argv array */ @@ -186,7 +186,7 @@ static int orte_plm_submit_probe(orte_node_t *node, orte_plm_submit_shell * shel exit(errno); } if (close(fd[1])) { - opal_output(0, "plm:submit: close failed with errno=%d\n", errno); + orte_output(0, "plm:submit: close failed with errno=%d\n", errno); return ORTE_ERR_IN_ERRNO; } @@ -200,7 +200,7 @@ static int orte_plm_submit_probe(orte_node_t *node, orte_plm_submit_shell * shel if (ret < 0) { if (errno == EINTR) continue; - opal_output( 0, "Unable to detect the remote shell (error %s)\n", + orte_output( 0, "Unable to detect the remote shell (error %s)\n", strerror(errno) ); rc = ORTE_ERR_IN_ERRNO; break; @@ -235,10 +235,10 @@ static int orte_plm_submit_probe(orte_node_t *node, orte_plm_submit_shell * shel } if (mca_plm_submit_component.debug) { if( ORTE_PLM_submit_SHELL_UNKNOWN == *shell ) { - opal_output(0, "plm:submit: node:%s has unhandled SHELL\n", + orte_output(0, "plm:submit: node:%s has unhandled SHELL\n", node->name); } else { - opal_output(0, "plm:submit: node:%s has SHELL: %s\n", + orte_output(0, "plm:submit: node:%s has SHELL: %s\n", node->name, orte_plm_submit_shell_name[*shell]); } } @@ -259,7 +259,7 @@ static int orte_plm_submit_fill_exec_path ( char ** exec_path) if (NULL == path) { path = ("PATH is empty!"); } - opal_show_help("help-plm-submit.txt", "no-local-orted", + orte_show_help("help-plm-submit.txt", "no-local-orted", true, path, opal_install_dirs.bindir); return ORTE_ERR_NOT_FOUND; } @@ -276,26 +276,26 @@ static void orte_plm_submit_wait_daemon(pid_t pid, int status, void* cbdata) if (! WIFEXITED(status) || ! WEXITSTATUS(status) == 0) { /* tell the user something went wrong */ - opal_output(0, "ERROR: A daemon failed to start as expected."); - opal_output(0, "ERROR: There may be more information available from"); - opal_output(0, "ERROR: the remote shell (see above)."); + orte_output(0, "ERROR: A daemon failed to start as expected."); + orte_output(0, "ERROR: There may be more information available from"); + orte_output(0, "ERROR: the remote shell (see above)."); if (WIFEXITED(status)) { - opal_output(0, "ERROR: The daemon exited unexpectedly with status %d.", + orte_output(0, "ERROR: The daemon exited unexpectedly with status %d.", WEXITSTATUS(status)); } else if (WIFSIGNALED(status)) { #ifdef WCOREDUMP if (WCOREDUMP(status)) { - opal_output(0, "The daemon received a signal %d (with core).", + orte_output(0, "The daemon received a signal %d (with core).", WTERMSIG(status)); } else { - opal_output(0, "The daemon received a signal %d.", WTERMSIG(status)); + orte_output(0, "The daemon received a signal %d.", WTERMSIG(status)); } #else - opal_output(0, "The daemon received a signal %d.", WTERMSIG(status)); + orte_output(0, "The daemon received a signal %d.", WTERMSIG(status)); #endif /* WCOREDUMP */ } else { - opal_output(0, "No extra status information is available: %d.", status); + orte_output(0, "No extra status information is available: %d.", status); } /* The usual reasons for ssh to exit abnormally all are a pretty good indication that the child processes aren't going to start up properly. @@ -317,11 +317,11 @@ static void orte_plm_submit_wait_daemon(pid_t pid, int status, void* cbdata) if (mca_plm_submit_component.timing && mca_plm_submit_component.num_children == 0) { if (0 != gettimeofday(&joblaunchstop, NULL)) { - opal_output(0, "plm_submit: could not obtain job launch stop time"); + orte_output(0, "plm_submit: could not obtain job launch stop time"); } else { deltat = (joblaunchstop.tv_sec - joblaunchstart.tv_sec)*1000000 + (joblaunchstop.tv_usec - joblaunchstart.tv_usec); - opal_output(0, "plm_submit: total time to launch job is %lu usec", deltat); + orte_output(0, "plm_submit: total time to launch job is %lu usec", deltat); } } @@ -364,7 +364,7 @@ int orte_plm_submit_launch(orte_job_t *jdata) if (mca_plm_submit_component.timing) { if (0 != gettimeofday(&joblaunchstart, NULL)) { - opal_output(0, "plm_submit: could not obtain start time"); + orte_output(0, "plm_submit: could not obtain start time"); joblaunchstart.tv_sec = 0; joblaunchstart.tv_usec = 0; } @@ -376,7 +376,7 @@ int orte_plm_submit_launch(orte_job_t *jdata) goto cleanup; } - OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((1, orte_plm_globals.output, "%s plm:submit: launching job %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_JOBID_PRINT(jdata->jobid))); @@ -408,7 +408,7 @@ int orte_plm_submit_launch(orte_job_t *jdata) num_nodes = map->num_new_daemons; if (0 == num_nodes) { /* have all the daemons we need - launch app */ - OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((1, orte_plm_globals.output, "%s plm:submit: no new daemons to launch", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME))); goto launch_apps; @@ -429,7 +429,7 @@ int orte_plm_submit_launch(orte_job_t *jdata) * As we cannot run in this situation, pretty print the error * and return an error code. */ - opal_show_help("help-plm-submit.txt", "deadlock-params", + orte_show_help("help-plm-submit.txt", "deadlock-params", true, mca_plm_submit_component.num_concurrent, num_nodes); rc = ORTE_ERR_FATAL; goto cleanup; @@ -460,7 +460,7 @@ int orte_plm_submit_launch(orte_job_t *jdata) /* This user is unknown to the system. Therefore, there is no reason we * spawn whatsoever in his name. Give up with a HUGE error message. */ - opal_show_help( "help-plm-submit.txt", "unknown-user", true, (int)getuid() ); + orte_show_help( "help-plm-submit.txt", "unknown-user", true, (int)getuid() ); rc = ORTE_ERR_FATAL; goto cleanup; } else { @@ -486,13 +486,13 @@ int orte_plm_submit_launch(orte_job_t *jdata) } } if ( i == ORTE_PLM_submit_SHELL_UNKNOWN ) { - opal_output(0, "WARNING: local probe returned unhandled shell:%s assuming bash\n", + orte_output(0, "WARNING: local probe returned unhandled shell:%s assuming bash\n", sh_name); local_sh = true; } if (mca_plm_submit_component.debug) { - opal_output(0, "plm:submit: local csh: %d, local sh: %d\n", + orte_output(0, "plm:submit: local csh: %d, local sh: %d\n", local_csh, local_sh); } } @@ -502,7 +502,7 @@ int orte_plm_submit_launch(orte_job_t *jdata) remote_sh = local_sh; remote_csh = local_csh; if (mca_plm_submit_component.debug) { - opal_output(0, "plm:submit: assuming same remote shell as local shell"); + orte_output(0, "plm:submit: assuming same remote shell as local shell"); } } else { orte_plm_submit_shell shell; @@ -520,13 +520,13 @@ int orte_plm_submit_launch(orte_job_t *jdata) case ORTE_PLM_submit_SHELL_TCSH: /* fall through */ case ORTE_PLM_submit_SHELL_CSH: remote_csh = true; break; default: - opal_output(0, "WARNING: submit probe returned unhandled shell:%s assuming bash\n", + orte_output(0, "WARNING: submit probe returned unhandled shell:%s assuming bash\n", orte_plm_submit_shell_name[shell]); remote_sh = true; } } if (mca_plm_submit_component.debug) { - opal_output(0, "plm:submit: remote csh: %d, remote sh: %d\n", + orte_output(0, "plm:submit: remote csh: %d, remote sh: %d\n", remote_csh, remote_sh); } @@ -554,8 +554,8 @@ int orte_plm_submit_launch(orte_job_t *jdata) if (mca_plm_submit_component.debug) { param = opal_argv_join(argv, ' '); if (NULL != param) { - opal_output(0, "plm:submit: final template argv:"); - opal_output(0, "plm:submit: %s", param); + orte_output(0, "plm:submit: final template argv:"); + orte_output(0, "plm:submit: %s", param); free(param); } } @@ -634,7 +634,7 @@ int orte_plm_submit_launch(orte_job_t *jdata) long fd, fdmax = sysconf(_SC_OPEN_MAX); if (mca_plm_submit_component.debug) { - opal_output(0, "plm:submit: launching on node %s\n", + orte_output(0, "plm:submit: launching on node %s\n", rmaps_node->nodename); } @@ -656,7 +656,7 @@ int orte_plm_submit_launch(orte_job_t *jdata) (0 == strcmp(nodes[nnode]->name, orte_process_info.nodename) || opal_ifislocal(nodes[nnode]->name))) { if (mca_plm_submit_component.debug) { - opal_output(0, "plm:submit: %s is a LOCAL node\n", + orte_output(0, "plm:submit: %s is a LOCAL node\n", nodes[nnode]->name); } @@ -712,7 +712,7 @@ int orte_plm_submit_launch(orte_job_t *jdata) } opal_setenv("PATH", newenv, true, &environ); if (mca_plm_submit_component.debug) { - opal_output(0, "plm:submit: reset PATH: %s", newenv); + orte_output(0, "plm:submit: reset PATH: %s", newenv); } free(newenv); @@ -727,7 +727,7 @@ int orte_plm_submit_launch(orte_job_t *jdata) } opal_setenv("LD_LIBRARY_PATH", newenv, true, &environ); if (mca_plm_submit_component.debug) { - opal_output(0, "plm:submit: reset LD_LIBRARY_PATH: %s", + orte_output(0, "plm:submit: reset LD_LIBRARY_PATH: %s", newenv); } free(newenv); @@ -761,7 +761,7 @@ int orte_plm_submit_launch(orte_job_t *jdata) var = opal_home_directory(); if (NULL != var) { if (mca_plm_submit_component.debug) { - opal_output(0, "plm:submit: changing to directory %s", var); + orte_output(0, "plm:submit: changing to directory %s", var); } /* Ignore errors -- what are we going to do? (and we ignore errors on the remote nodes @@ -770,7 +770,7 @@ int orte_plm_submit_launch(orte_job_t *jdata) } } else { if (mca_plm_submit_component.debug) { - opal_output(0, "plm:submit: %s is a REMOTE node\n", + orte_output(0, "plm:submit: %s is a REMOTE node\n", nodes[nnode]->name); } exec_argv = argv; @@ -823,7 +823,7 @@ int orte_plm_submit_launch(orte_job_t *jdata) /* pass the vpid */ rc = orte_util_convert_vpid_to_string(&vpid_string, nodes[nnode]->daemon->name.vpid); if (ORTE_SUCCESS != rc) { - opal_output(0, "orte_plm_submit: unable to get daemon vpid as string"); + orte_output(0, "orte_plm_submit: unable to get daemon vpid as string"); exit(-1); } free(argv[proc_vpid_index]); @@ -873,12 +873,12 @@ int orte_plm_submit_launch(orte_job_t *jdata) if (mca_plm_submit_component.debug) { param = opal_argv_join(exec_argv, ' '); if (NULL != param) { - opal_output(0, "plm:submit: executing: (%s) [%s]", exec_path, param); + orte_output(0, "plm:submit: executing: (%s) [%s]", exec_path, param); free(param); } } execve(exec_path, exec_argv, env); - opal_output(0, "plm:submit: execv of %s failed with errno=%s(%d)\n", + orte_output(0, "plm:submit: execv of %s failed with errno=%s(%d)\n", exec_path, strerror(errno), errno); exit(-1); @@ -911,7 +911,7 @@ int orte_plm_submit_launch(orte_job_t *jdata) /* wait for daemons to callback */ if (ORTE_SUCCESS != (rc = orte_plm_base_daemon_callback(map->num_new_daemons))) { - OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((1, orte_plm_globals.output, "%s plm:submit: daemon launch failed for job %s on error %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_JOBID_PRINT(active_job), ORTE_ERROR_NAME(rc))); @@ -920,7 +920,7 @@ int orte_plm_submit_launch(orte_job_t *jdata) launch_apps: if (ORTE_SUCCESS != (rc = orte_plm_base_launch_apps(active_job))) { - OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((1, orte_plm_globals.output, "%s plm:submit: launch of apps failed for job %s on error %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_JOBID_PRINT(active_job), ORTE_ERROR_NAME(rc))); diff --git a/orte/mca/plm/tm/plm_tm_component.c b/orte/mca/plm/tm/plm_tm_component.c index 1f6520e3ea..8f5398c6c7 100644 --- a/orte/mca/plm/tm/plm_tm_component.c +++ b/orte/mca/plm/tm/plm_tm_component.c @@ -27,7 +27,7 @@ #include "orte/constants.h" #include "opal/mca/base/mca_base_param.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "opal/util/argv.h" #include "orte/util/proc_info.h" diff --git a/orte/mca/plm/tm/plm_tm_module.c b/orte/mca/plm/tm/plm_tm_module.c index 95621347d8..d3304019fa 100644 --- a/orte/mca/plm/tm/plm_tm_module.c +++ b/orte/mca/plm/tm/plm_tm_module.c @@ -55,9 +55,9 @@ #include "opal/threads/condition.h" #include "opal/event/event.h" #include "opal/util/argv.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "opal/util/opal_environ.h" -#include "opal/util/show_help.h" +#include "orte/util/show_help.h" #include "opal/util/path.h" #include "opal/util/basename.h" #include "opal/mca/base/mca_base_param.h" @@ -151,7 +151,7 @@ static int plm_tm_launch_job(orte_job_t *jdata) /* check for timing request - get start time if so */ if (orte_timing) { if (0 != gettimeofday(&jobstart, NULL)) { - opal_output(0, "plm_tm: could not obtain job start time"); + orte_output(0, "plm_tm: could not obtain job start time"); } } @@ -161,7 +161,7 @@ static int plm_tm_launch_job(orte_job_t *jdata) goto cleanup; } - OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((1, orte_plm_globals.output, "%s plm:tm: launching job %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_JOBID_PRINT(jdata->jobid))); @@ -209,9 +209,9 @@ static int plm_tm_launch_job(orte_job_t *jdata) &proc_vpid_index, &node_name_index); - if (0 < opal_output_get_verbosity(orte_plm_globals.output)) { + if (0 < orte_output_get_verbosity(orte_plm_globals.output)) { param = opal_argv_join(argv, ' '); - OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((1, orte_plm_globals.output, "%s plm:tm: final top-level argv:\n\t%s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), (NULL == param) ? "NULL" : param)); @@ -254,7 +254,7 @@ static int plm_tm_launch_job(orte_job_t *jdata) if (0 == strncmp("PATH=", env[i], 5)) { asprintf(&newenv, "%s/%s:%s", apps[0]->prefix_dir, bin_base, env[i] + 5); - OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((1, orte_plm_globals.output, "%s plm:tm: resetting PATH: %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), newenv)); @@ -266,7 +266,7 @@ static int plm_tm_launch_job(orte_job_t *jdata) else if (0 == strncmp("LD_LIBRARY_PATH=", env[i], 16)) { asprintf(&newenv, "%s/%s:%s", apps[0]->prefix_dir, lib_base, env[i] + 16); - OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((1, orte_plm_globals.output, "%s plm:tm: resetting LD_LIBRARY_PATH: %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), newenv)); @@ -292,7 +292,7 @@ static int plm_tm_launch_job(orte_job_t *jdata) free(argv[node_name_index]); argv[node_name_index] = strdup(node->name); - OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((1, orte_plm_globals.output, "%s plm:tm: launching on node %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), node->name)); @@ -300,7 +300,7 @@ static int plm_tm_launch_job(orte_job_t *jdata) /* setup process name */ rc = orte_util_convert_vpid_to_string(&vpid_string, nodes[i]->daemon->name.vpid); if (ORTE_SUCCESS != rc) { - opal_output(0, "plm:tm: unable to get daemon vpid as string"); + orte_output(0, "plm:tm: unable to get daemon vpid as string"); exit(-1); } free(argv[proc_vpid_index]); @@ -308,9 +308,9 @@ static int plm_tm_launch_job(orte_job_t *jdata) free(vpid_string); /* exec the daemon */ - if (0 < opal_output_get_verbosity(orte_plm_globals.output)) { + if (0 < orte_output_get_verbosity(orte_plm_globals.output)) { param = opal_argv_join(argv, ' '); - OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((1, orte_plm_globals.output, "%s plm:tm: executing:\n\t%s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), (NULL == param) ? "NULL" : param)); @@ -320,7 +320,7 @@ static int plm_tm_launch_job(orte_job_t *jdata) /* check for timing request - get start time if so */ if (orte_timing) { if (0 != gettimeofday(&launchstart, NULL)) { - opal_output(0, "plm_tm: could not obtain start time"); + orte_output(0, "plm_tm: could not obtain start time"); launchstart.tv_sec = 0; launchstart.tv_usec = 0; } @@ -328,7 +328,7 @@ static int plm_tm_launch_job(orte_job_t *jdata) rc = tm_spawn(argc, argv, env, node->launch_id, tm_task_ids + launched, tm_events + launched); if (TM_SUCCESS != rc) { - opal_show_help("help-plm-tm.txt", "tm-spawn-failed", + orte_show_help("help-plm-tm.txt", "tm-spawn-failed", true, argv[0], node->name, node->launch_id); rc = ORTE_ERROR; goto cleanup; @@ -337,7 +337,7 @@ static int plm_tm_launch_job(orte_job_t *jdata) /* check for timing request - get stop time and process if so */ if (orte_timing) { if (0 != gettimeofday(&launchstop, NULL)) { - opal_output(0, "plm_tm: could not obtain stop time"); + orte_output(0, "plm_tm: could not obtain stop time"); } else { deltat = (launchstop.tv_sec - launchstart.tv_sec)*1000000 + (launchstop.tv_usec - launchstart.tv_usec); @@ -359,14 +359,14 @@ static int plm_tm_launch_job(orte_job_t *jdata) opal_event_loop(OPAL_EVLOOP_NONBLOCK); } - OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((1, orte_plm_globals.output, "%s plm:tm:launch: finished spawning orteds", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME))); /* check for timing request - get start time for launch completion */ if (orte_timing) { if (0 != gettimeofday(&completionstart, NULL)) { - opal_output(0, "plm_tm: could not obtain completion start time"); + orte_output(0, "plm_tm: could not obtain completion start time"); completionstart.tv_sec = 0; completionstart.tv_usec = 0; } @@ -377,14 +377,14 @@ static int plm_tm_launch_job(orte_job_t *jdata) rc = tm_poll(TM_NULL_EVENT, &event, 1, &local_err); if (TM_SUCCESS != rc) { errno = local_err; - opal_output(0, "plm:tm: failed to poll for a spawned daemon, return status = %d", rc); + orte_output(0, "plm:tm: failed to poll for a spawned daemon, return status = %d", rc); goto cleanup; } } /* wait for daemons to callback */ if (ORTE_SUCCESS != (rc = orte_plm_base_daemon_callback(map->num_new_daemons))) { - OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((1, orte_plm_globals.output, "%s plm:tm: daemon launch failed for job %s on error %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_JOBID_PRINT(jdata->jobid), ORTE_ERROR_NAME(rc))); @@ -394,21 +394,21 @@ static int plm_tm_launch_job(orte_job_t *jdata) /* check for timing request - get stop time for launch completion and report */ if (orte_timing) { if (0 != gettimeofday(&completionstop, NULL)) { - opal_output(0, "plm_tm: could not obtain completion stop time"); + orte_output(0, "plm_tm: could not obtain completion stop time"); } else { deltat = (completionstop.tv_sec - jobstart.tv_sec)*1000000 + (completionstop.tv_usec - completionstop.tv_usec); - opal_output(0, "plm_tm: time to launch/wireup all daemons: %d usec", deltat); + orte_output(0, "plm_tm: time to launch/wireup all daemons: %d usec", deltat); } - opal_output(0, "plm_tm: Launch statistics:"); - opal_output(0, "plm_tm: Average time to launch an orted: %f usec", avgtime); - opal_output(0, "plm_tm: Max time to launch an orted: %d usec at iter %d", maxtime, maxiter); - opal_output(0, "plm_tm: Min time to launch an orted: %d usec at iter %d", mintime, miniter); + orte_output(0, "plm_tm: Launch statistics:"); + orte_output(0, "plm_tm: Average time to launch an orted: %f usec", avgtime); + orte_output(0, "plm_tm: Max time to launch an orted: %d usec at iter %d", maxtime, maxiter); + orte_output(0, "plm_tm: Min time to launch an orted: %d usec at iter %d", mintime, miniter); } launch_apps: if (ORTE_SUCCESS != (rc = orte_plm_base_launch_apps(jdata->jobid))) { - OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((1, orte_plm_globals.output, "%s plm:tm: launch of apps failed for job %s on error %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_JOBID_PRINT(jdata->jobid), ORTE_ERROR_NAME(rc))); @@ -452,15 +452,15 @@ launch_apps: /* check for timing request - get stop time and process if so */ if (orte_timing) { if (0 != gettimeofday(&jobstop, NULL)) { - opal_output(0, "plm_tm: could not obtain stop time"); + orte_output(0, "plm_tm: could not obtain stop time"); } else { deltat = (jobstop.tv_sec - jobstart.tv_sec)*1000000 + (jobstop.tv_usec - jobstart.tv_usec); - opal_output(0, "plm_tm: launch of entire job required %d usec", deltat); + orte_output(0, "plm_tm: launch of entire job required %d usec", deltat); } } - OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((1, orte_plm_globals.output, "%s plm:tm:launch: finished", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME))); diff --git a/orte/mca/plm/xgrid/src/plm_xgrid_client.m b/orte/mca/plm/xgrid/src/plm_xgrid_client.m index a64b91ad53..dde5e87407 100644 --- a/orte/mca/plm/xgrid/src/plm_xgrid_client.m +++ b/orte/mca/plm/xgrid/src/plm_xgrid_client.m @@ -148,7 +148,7 @@ myServicePrincipal = [NSString stringWithFormat:@"xgrid/%@", [connection name]]; } - opal_output_verbose(1, orte_plm_globals.output, + orte_output_verbose(1, orte_plm_globals.output, "orte:plm:xgrid: Kerberos servicePrincipal: %s", [myServicePrincipal cString]); @@ -163,13 +163,13 @@ portnumber:0] autorelease]; if (nil == controller_password) { - opal_output_verbose(1, orte_plm_globals.output, + orte_output_verbose(1, orte_plm_globals.output, "orte:plm:xgrid: Using Kerberos authentication"); XGGSSAuthenticator *authenticator = [[[XGGSSAuthenticator alloc] init] autorelease]; - opal_output_verbose(1, orte_plm_globals.output, + orte_output_verbose(1, orte_plm_globals.output, "orte:plm:xgrid: Kerberos principal: %s", [[self servicePrincipal] cString]); @@ -177,7 +177,7 @@ [connection setAuthenticator:authenticator]; } else { - opal_output_verbose(1, orte_plm_globals.output, + orte_output_verbose(1, orte_plm_globals.output, "orte:plm:xgrid: Using password authentication"); XGTwoWayRandomAuthenticator *authenticator = @@ -205,7 +205,7 @@ return ORTE_ERR_NOT_AVAILABLE; } - opal_output_verbose(1, orte_plm_globals.output, + orte_output_verbose(1, orte_plm_globals.output, "orte:plm:xgrid: connection name: %s", [[connection name] cString]); @@ -215,7 +215,7 @@ opal_progress(); grid = [controller defaultGrid]; - opal_output_verbose(1, orte_plm_globals.output, + orte_output_verbose(1, orte_plm_globals.output, "plm: xgrid: grid name: %s", [[grid identifier] cString]); @@ -247,7 +247,7 @@ /* Shortcut out of here */ if (0 == map->num_new_daemons) { /* have all the daemons we need - launch app */ - OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((1, orte_plm_globals.output, "%s plm:rsh: no new daemons to launch", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME))); return ORTE_SUCCESS; @@ -259,7 +259,7 @@ /* build up the array of task specifications */ NSMutableDictionary *taskSpecifications = [NSMutableDictionary dictionary]; for (nnode=0 ; nnode < map->num_nodes ; nnode++) { - opal_output_verbose(1, orte_plm_globals.output, + orte_output_verbose(1, orte_plm_globals.output, "orte:plm:xgrid: launching on node %s", nodes[nnode]->name); @@ -278,7 +278,7 @@ rc = orte_util_convert_vpid_to_string(&vpid_string, nodes[nnode]->daemon->name.vpid); if (ORTE_SUCCESS != rc) { - opal_output(0, "orte_plm_rsh: unable to get daemon vpid as string"); + orte_output(0, "orte_plm_rsh: unable to get daemon vpid as string"); goto cleanup; } [taskArguments addObject: [NSString stringWithCString: vpid_string]]; @@ -335,7 +335,7 @@ /* wait for daemons to callback */ if (ORTE_SUCCESS != (rc = orte_plm_base_daemon_callback(map->num_new_daemons))) { - OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((1, orte_plm_globals.output, "%s plm:xgrid: daemon launch failed for job %s on error %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_JOBID_PRINT(jdata->jobid), ORTE_ERROR_NAME(rc))); @@ -343,7 +343,7 @@ } cleanup: - opal_output_verbose(1, orte_plm_globals.output, + orte_output_verbose(1, orte_plm_globals.output, "orte:plm:xgrid:launch: finished, rc=%d\n", rc); return rc; @@ -392,7 +392,7 @@ cleanup: -(void) connectionDidNotOpen:(XGConnection*) myConnection withError: (NSError*) error { - opal_output(orte_plm_globals.output, + orte_output(orte_plm_globals.output, "orte:plm:xgrid: Controller connection did not open: (%d) %s", [error code], [[error localizedDescription] cString]); @@ -410,19 +410,19 @@ cleanup: break; case 530: case 535: - opal_output(orte_plm_globals.output, + orte_output(orte_plm_globals.output, "orte:plm:xgrid: Connection to XGrid controller failed due to authentication error (%d):", [[myConnection error] code]); break; default: - opal_output(orte_plm_globals.output, + orte_output(orte_plm_globals.output, "orte:plm:xgrid: Connection to XGrid controller unexpectedly closed: (%d) %s", [[myConnection error] code], [[[myConnection error] localizedDescription] cString]); break; } } else { - opal_output(orte_plm_globals.output, + orte_output(orte_plm_globals.output, "orte:plm:xgrid: Connection to XGrid controller unexpectedly closed"); } diff --git a/orte/mca/plm/xgrid/src/plm_xgrid_component.m b/orte/mca/plm/xgrid/src/plm_xgrid_component.m index c6c647e3f9..60edd9bab8 100644 --- a/orte/mca/plm/xgrid/src/plm_xgrid_component.m +++ b/orte/mca/plm/xgrid/src/plm_xgrid_component.m @@ -120,13 +120,13 @@ int orte_plm_xgrid_component_query(mca_base_module_t **module, int *priority) int ret, val, param; if (NULL == getenv("XGRID_CONTROLLER_HOSTNAME")) { - opal_output_verbose(10, orte_plm_globals.output, + orte_output_verbose(10, orte_plm_globals.output, "orte:plm:xgrid: not available: controller info not set"); *module = NULL; return ORTE_ERROR; } - opal_output_verbose(1, orte_plm_globals.output, + orte_output_verbose(1, orte_plm_globals.output, "orte:plm:xgrid: initializing PlmXGridClient"); mca_plm_xgrid_component.pool = [[NSAutoreleasePool alloc] init]; mca_plm_xgrid_component.client = [[PlmXGridClient alloc] init]; @@ -157,14 +157,14 @@ int orte_plm_xgrid_component_query(mca_base_module_t **module, int *priority) ret = [mca_plm_xgrid_component.client connect]; if (ret != ORTE_SUCCESS) { - opal_output_verbose(10, orte_plm_globals.output, + orte_output_verbose(10, orte_plm_globals.output, "orte:plm:xgrid: not available: connection failed"); orte_plm_xgrid_finalize(); *module = NULL; return ORTE_ERROR; } - opal_output_verbose(10, orte_plm_globals.output, + orte_output_verbose(10, orte_plm_globals.output, "orte:plm:xgrid: initialized"); *module = (mca_base_module_t *) &orte_plm_xgrid_module; return ORTE_SUCCESS; diff --git a/orte/mca/plm/xgrid/src/plm_xgrid_module.m b/orte/mca/plm/xgrid/src/plm_xgrid_module.m index 3485620728..31d53b6362 100644 --- a/orte/mca/plm/xgrid/src/plm_xgrid_module.m +++ b/orte/mca/plm/xgrid/src/plm_xgrid_module.m @@ -33,7 +33,7 @@ #import "orte/constants.h" #import "opal/util/argv.h" -#import "opal/util/output.h" +#import "orte/util/output.h" #import "orte/util/session_dir.h" #import "opal/event/event.h" #import "orte/runtime/orte_wait.h" @@ -141,7 +141,7 @@ orte_plm_xgrid_spawn(orte_job_t *jdata) goto cleanup; } - OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((1, orte_plm_globals.output, "%s plm:xgrid: setting up job %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_JOBID_PRINT(jdata->jobid))); @@ -154,7 +154,7 @@ orte_plm_xgrid_spawn(orte_job_t *jdata) goto cleanup; } - OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((1, orte_plm_globals.output, "%s plm:xgrid: mapping job %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_JOBID_PRINT(jdata->jobid))); @@ -164,7 +164,7 @@ orte_plm_xgrid_spawn(orte_job_t *jdata) goto cleanup; } - OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((1, orte_plm_globals.output, "%s plm:xgrid: setting up I/O for %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_JOBID_PRINT(jdata->jobid))); @@ -189,7 +189,7 @@ orte_plm_xgrid_spawn(orte_job_t *jdata) /* Daemons are running - launch the applications */ if (ORTE_SUCCESS != (rc = orte_plm_base_launch_apps(jdata->jobid))) { - OPAL_OUTPUT_VERBOSE((1, orte_plm_globals.output, + ORTE_OUTPUT_VERBOSE((1, orte_plm_globals.output, "%s plm:xgrid: launch of apps failed for job %s on error %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_JOBID_PRINT(jdata->jobid), ORTE_ERROR_NAME(rc))); diff --git a/orte/mca/ras/alps/ras_alps_component.c b/orte/mca/ras/alps/ras_alps_component.c index da3de8e172..d85ebffde5 100644 --- a/orte/mca/ras/alps/ras_alps_component.c +++ b/orte/mca/ras/alps/ras_alps_component.c @@ -19,7 +19,7 @@ #include "orte_config.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "opal/mca/base/base.h" #include "opal/mca/base/mca_base_param.h" #include "orte/constants.h" @@ -94,7 +94,7 @@ static int orte_ras_alps_component_query(mca_base_module_t **module, int *priori if (NULL != getenv("BATCH_PARTITION_ID")) { mca_base_param_lookup_int(param_priority, priority); - OPAL_OUTPUT_VERBOSE((1, orte_ras_base.ras_output, + ORTE_OUTPUT_VERBOSE((1, orte_ras_base.ras_output, "ras:alps: available for selection")); *module = (mca_base_module_t *) &orte_ras_alps_module; return ORTE_SUCCESS; @@ -102,7 +102,7 @@ static int orte_ras_alps_component_query(mca_base_module_t **module, int *priori /* Sadly, no */ - opal_output(orte_ras_base.ras_output, + orte_output(orte_ras_base.ras_output, "ras:alps: NOT available for selection"); *module = NULL; return ORTE_ERROR; diff --git a/orte/mca/ras/alps/ras_alps_module.c b/orte/mca/ras/alps/ras_alps_module.c index a417151b09..8240cd1ee5 100644 --- a/orte/mca/ras/alps/ras_alps_module.c +++ b/orte/mca/ras/alps/ras_alps_module.c @@ -26,9 +26,9 @@ #include "opal/mca/installdirs/installdirs.h" #include "opal/util/argv.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "opal/util/os_path.h" -#include "opal/util/show_help.h" +#include "orte/util/show_help.h" #include "opal/dss/dss.h" #include "orte/mca/errmgr/errmgr.h" @@ -70,7 +70,7 @@ static int orte_ras_alps_allocate(opal_list_t *nodes) alps_batch_id = getenv("BATCH_PARTITION_ID"); if (NULL == alps_batch_id) { - opal_show_help("help-ras-alps.txt", "alps-env-var-not-found", 1, + orte_show_help("help-ras-alps.txt", "alps-env-var-not-found", 1, "BATCH_PARTITION_ID"); return ORTE_ERR_NOT_FOUND; } @@ -78,7 +78,7 @@ static int orte_ras_alps_allocate(opal_list_t *nodes) node_file = opal_os_path(false, orte_process_info.job_session_dir, "orte_ras_alps_node_file.txt", NULL); - OPAL_OUTPUT_VERBOSE((1, orte_ras_base.ras_output, + ORTE_OUTPUT_VERBOSE((1, orte_ras_base.ras_output, "ras:alps:allocate: node_file in %s", node_file)); asprintf(&str, "%s/ras-alps-command.sh", @@ -99,12 +99,12 @@ static int orte_ras_alps_allocate(opal_list_t *nodes) node_file ); - OPAL_OUTPUT_VERBOSE((1, orte_ras_base.ras_output, + ORTE_OUTPUT_VERBOSE((1, orte_ras_base.ras_output, "ras:alps:allocate: got command string %s", alps_node_cmd_str)); if(system(alps_node_cmd_str)) { - opal_output(0, "Error in orte_ras_alps_allocate: system call returned an error, for reference I tried to run: %s", + orte_output(0, "Error in orte_ras_alps_allocate: system call returned an error, for reference I tried to run: %s", alps_node_cmd_str); return ORTE_ERROR; } @@ -131,10 +131,10 @@ cleanup: /* All done */ if (ORTE_SUCCESS == ret) { - OPAL_OUTPUT_VERBOSE((1, orte_ras_base.ras_output, + ORTE_OUTPUT_VERBOSE((1, orte_ras_base.ras_output, "ras:alps:allocate: success")); } else { - OPAL_OUTPUT_VERBOSE((1, orte_ras_base.ras_output, + ORTE_OUTPUT_VERBOSE((1, orte_ras_base.ras_output, "ras:alps:allocate: failure (base_allocate_nodes=%d)", ret)); } return ret; @@ -170,7 +170,7 @@ int orte_ras_alps_read_nodename_file(opal_list_t *nodes, char *filename) } while (NULL != (hostname = ras_alps_getline(fp))) { - OPAL_OUTPUT_VERBOSE((1, orte_ras_base.ras_output, + ORTE_OUTPUT_VERBOSE((1, orte_ras_base.ras_output, "ras:alps:read_nodename: got hostname %s", hostname)); /* if this matches the prior nodename, then just add @@ -185,7 +185,7 @@ int orte_ras_alps_read_nodename_file(opal_list_t *nodes, char *filename) } /* must be a new name, so add a new item to the list */ - OPAL_OUTPUT_VERBOSE((1, orte_ras_base.ras_output, + ORTE_OUTPUT_VERBOSE((1, orte_ras_base.ras_output, "ras:alps:read_nodename: not found -- added to list")); node = OBJ_NEW(orte_node_t); node->name = hostname; @@ -207,7 +207,7 @@ int orte_ras_alps_read_nodename_file(opal_list_t *nodes, char *filename) */ static int orte_ras_alps_finalize(void) { - OPAL_OUTPUT_VERBOSE((1, orte_ras_base.ras_output, + ORTE_OUTPUT_VERBOSE((1, orte_ras_base.ras_output, "ras:alps:finalize: success (nothing to do)")); return ORTE_SUCCESS; } diff --git a/orte/mca/ras/base/base.h b/orte/mca/ras/base/base.h index fe5e5be5e2..61da78aa0d 100644 --- a/orte/mca/ras/base/base.h +++ b/orte/mca/ras/base/base.h @@ -38,6 +38,7 @@ BEGIN_C_DECLS */ typedef struct orte_ras_base_t { int ras_output; + int alloc_output; opal_list_t ras_opened; bool allocation_read; bool display_alloc; diff --git a/orte/mca/ras/base/ras_base_allocate.c b/orte/mca/ras/base/ras_base_allocate.c index 10b3cbb642..40aa8bc4a5 100644 --- a/orte/mca/ras/base/ras_base_allocate.c +++ b/orte/mca/ras/base/ras_base_allocate.c @@ -22,10 +22,9 @@ #include "opal/mca/mca.h" #include "opal/mca/base/base.h" -#include "opal/util/output.h" #include "opal/class/opal_list.h" -#include "opal/util/show_help.h" +#include "orte/util/output.h" #include "opal/dss/dss.h" #include "orte/mca/errmgr/errmgr.h" #include "orte/util/name_fns.h" @@ -49,7 +48,7 @@ int orte_ras_base_allocate(orte_job_t *jdata) bool override_oversubscribed; orte_app_context_t **apps; - OPAL_OUTPUT_VERBOSE((5, orte_ras_base.ras_output, + ORTE_OUTPUT_VERBOSE((5, orte_ras_base.ras_output, "%s ras:base:allocate", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME))); @@ -58,7 +57,7 @@ int orte_ras_base_allocate(orte_job_t *jdata) */ if (orte_ras_base.allocation_read) { - OPAL_OUTPUT_VERBOSE((5, orte_ras_base.ras_output, + ORTE_OUTPUT_VERBOSE((5, orte_ras_base.ras_output, "%s ras:base:allocate allocation already read", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME))); @@ -109,7 +108,7 @@ int orte_ras_base_allocate(orte_job_t *jdata) - OPAL_OUTPUT_VERBOSE((5, orte_ras_base.ras_output, + ORTE_OUTPUT_VERBOSE((5, orte_ras_base.ras_output, "%s ras:base:allocate nothing found in module - proceeding to hostfile", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME))); @@ -119,7 +118,7 @@ int orte_ras_base_allocate(orte_job_t *jdata) * as set by an mca param */ if (NULL != orte_default_hostfile) { - OPAL_OUTPUT_VERBOSE((5, orte_ras_base.ras_output, + ORTE_OUTPUT_VERBOSE((5, orte_ras_base.ras_output, "%s ras:base:allocate parsing default hostfile %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), orte_default_hostfile)); @@ -165,7 +164,7 @@ int orte_ras_base_allocate(orte_job_t *jdata) for (i=0; i < jdata->num_apps; i++) { if (NULL != apps[i]->hostfile) { - OPAL_OUTPUT_VERBOSE((5, orte_ras_base.ras_output, + ORTE_OUTPUT_VERBOSE((5, orte_ras_base.ras_output, "%s ras:base:allocate checking hostfile %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), apps[i]->hostfile)); @@ -200,7 +199,7 @@ int orte_ras_base_allocate(orte_job_t *jdata) - OPAL_OUTPUT_VERBOSE((5, orte_ras_base.ras_output, + ORTE_OUTPUT_VERBOSE((5, orte_ras_base.ras_output, "%s ras:base:allocate nothing found in hostfiles - checking dash-host options", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME))); @@ -247,7 +246,7 @@ int orte_ras_base_allocate(orte_job_t *jdata) - OPAL_OUTPUT_VERBOSE((5, orte_ras_base.ras_output, + ORTE_OUTPUT_VERBOSE((5, orte_ras_base.ras_output, "%s ras:base:allocate nothing found in dash-host - inserting current node", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME))); @@ -286,12 +285,11 @@ DISPLAY: /* shall we display the results? */ if (orte_ras_base.display_alloc) { alloc = (orte_node_t**)orte_node_pool->addr; - opal_output(0, "*** ALLOCATED NODES ***"); for (i=0; i < orte_node_pool->size; i++) { if (NULL == alloc[i]) { break; } - opal_dss.dump(0, alloc[i], ORTE_NODE); + opal_dss.dump(orte_ras_base.alloc_output, alloc[i], ORTE_NODE); } } diff --git a/orte/mca/ras/base/ras_base_node.c b/orte/mca/ras/base/ras_base_node.c index b94b4fa215..74a31e459a 100644 --- a/orte/mca/ras/base/ras_base_node.c +++ b/orte/mca/ras/base/ras_base_node.c @@ -21,7 +21,7 @@ #include -#include "opal/util/output.h" +#include "orte/util/output.h" #include "opal/util/argv.h" #include "opal/util/if.h" @@ -73,7 +73,7 @@ int orte_ras_base_node_insert(opal_list_t* nodes, orte_job_t *jdata) return ORTE_SUCCESS; /* nothing to do */ } - OPAL_OUTPUT_VERBOSE((5, orte_ras_base.ras_output, + ORTE_OUTPUT_VERBOSE((5, orte_ras_base.ras_output, "%s ras:base:node_insert inserting %ld nodes", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), (long)num_nodes)); @@ -98,7 +98,7 @@ int orte_ras_base_node_insert(opal_list_t* nodes, orte_job_t *jdata) * if this node is the same as the HNP's node so we don't double-enter it */ if (0 == strcmp(node->name, hnp_node->name) || opal_ifislocal(node->name)) { - OPAL_OUTPUT_VERBOSE((5, orte_ras_base.ras_output, + ORTE_OUTPUT_VERBOSE((5, orte_ras_base.ras_output, "%s ras:base:node_insert updating HNP info to %ld slots", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), (long)node->slots)); @@ -121,7 +121,7 @@ int orte_ras_base_node_insert(opal_list_t* nodes, orte_job_t *jdata) OBJ_RELEASE(node); } else { /* insert the object onto the orte_nodes global array */ - OPAL_OUTPUT_VERBOSE((5, orte_ras_base.ras_output, + ORTE_OUTPUT_VERBOSE((5, orte_ras_base.ras_output, "%s ras:base:node_insert node %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), (NULL == node->name) ? "NULL" : node->name)); diff --git a/orte/mca/ras/base/ras_base_open.c b/orte/mca/ras/base/ras_base_open.c index 42ec972e33..17e1ff7112 100644 --- a/orte/mca/ras/base/ras_base_open.c +++ b/orte/mca/ras/base/ras_base_open.c @@ -23,13 +23,14 @@ #include "opal/mca/mca.h" #include "opal/mca/base/base.h" #include "opal/mca/base/mca_base_param.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "opal/util/os_path.h" #include "opal/mca/installdirs/installdirs.h" #include "opal/threads/mutex.h" #include "orte/mca/errmgr/errmgr.h" #include "orte/util/proc_info.h" +#include "orte/util/output.h" #include "orte/mca/ras/base/ras_private.h" #include "orte/mca/ras/base/base.h" @@ -77,8 +78,9 @@ int orte_ras_base_open(void) /* Debugging / verbose output. Always have stream open, with verbose set by the mca open system... */ - orte_ras_base.ras_output = opal_output_open(NULL); - + orte_ras_base.ras_output = orte_output_open(NULL, "RAS", "DEBUG", NULL); + orte_ras_base.alloc_output = orte_output_open(NULL, "RAS", "ALLOC", NULL); + /* Open up all available components */ if (ORTE_SUCCESS != mca_base_components_open("ras", orte_ras_base.ras_output, diff --git a/orte/mca/ras/base/ras_base_select.c b/orte/mca/ras/base/ras_base_select.c index 3809bd079e..c74a41cdba 100644 --- a/orte/mca/ras/base/ras_base_select.c +++ b/orte/mca/ras/base/ras_base_select.c @@ -21,7 +21,7 @@ #include "opal/mca/mca.h" #include "opal/mca/base/base.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "orte/mca/errmgr/errmgr.h" #include "orte/util/name_fns.h" diff --git a/orte/mca/ras/ccp/ras_ccp_component.c b/orte/mca/ras/ccp/ras_ccp_component.c index a5bba1ae56..638abd1e83 100644 --- a/orte/mca/ras/ccp/ras_ccp_component.c +++ b/orte/mca/ras/ccp/ras_ccp_component.c @@ -17,7 +17,7 @@ #include "opal/mca/base/base.h" #include "opal/mca/base/mca_base_param.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "opal/util/basename.h" #include "orte/constants.h" #include "orte/util/proc_info.h" diff --git a/orte/mca/ras/ccp/ras_ccp_module.c b/orte/mca/ras/ccp/ras_ccp_module.c index 627cb80156..230df08179 100644 --- a/orte/mca/ras/ccp/ras_ccp_module.c +++ b/orte/mca/ras/ccp/ras_ccp_module.c @@ -25,9 +25,9 @@ #include #include "opal/util/argv.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "opal/util/os_path.h" -#include "opal/util/show_help.h" +#include "orte/util/show_help.h" #include "orte/mca/errmgr/errmgr.h" #include "orte/runtime/orte_globals.h" @@ -84,7 +84,7 @@ static int orte_ras_ccp_allocate(opal_list_t *nodes) reinterpret_cast (&pCluster) ); if (FAILED(hr)) { - OPAL_OUTPUT_VERBOSE((1, orte_ras_base.ras_output, + ORTE_OUTPUT_VERBOSE((1, orte_ras_base.ras_output, "ras:ccp:allocate: failed to create cluster object!")); return ORTE_ERROR; } @@ -93,7 +93,7 @@ static int orte_ras_ccp_allocate(opal_list_t *nodes) _dupenv_s(&cluster_head, &len, "LOGONSERVER"); if(cluster_head == NULL) { - OPAL_OUTPUT_VERBOSE((1, orte_ras_base.ras_output, + ORTE_OUTPUT_VERBOSE((1, orte_ras_base.ras_output, "ras:ccp:allocate: connot find cluster head node!")); return ORTE_ERROR; } @@ -108,13 +108,13 @@ static int orte_ras_ccp_allocate(opal_list_t *nodes) hr = pCluster->Connect(_bstr_t(cluster_head)); if (FAILED(hr)) { get_cluster_message(pCluster); - OPAL_OUTPUT_VERBOSE((1, orte_ras_base.ras_output, + ORTE_OUTPUT_VERBOSE((1, orte_ras_base.ras_output, "ras:ccp:allocate: connection failed!")); return ORTE_ERROR; } if (ORTE_SUCCESS != (ret = discover(nodes, pCluster))) { - OPAL_OUTPUT_VERBOSE((1, orte_ras_base.ras_output, + ORTE_OUTPUT_VERBOSE((1, orte_ras_base.ras_output, "ras:ccp:allocate: discover failed!")); return ret; } @@ -123,7 +123,7 @@ static int orte_ras_ccp_allocate(opal_list_t *nodes) * is an unrecoverable error - report it */ if (opal_list_is_empty(nodes)) { - opal_show_help("help-ras-ccp.txt", "no-nodes-found", true); + orte_show_help("help-ras-ccp.txt", "no-nodes-found", true); return ORTE_ERR_NOT_FOUND; } @@ -139,7 +139,7 @@ static int orte_ras_ccp_allocate(opal_list_t *nodes) */ static int orte_ras_ccp_finalize(void) { - OPAL_OUTPUT_VERBOSE((1, orte_ras_base.ras_output, + ORTE_OUTPUT_VERBOSE((1, orte_ras_base.ras_output, "ras:ccp:finalize: success (nothing to do)")); return ORTE_SUCCESS; } @@ -180,7 +180,7 @@ static int discover(opal_list_t* nodelist, ICluster* pCluster) hr = pCluster->get_ComputeNodes(&pNodesCollection); if (FAILED(hr)) { get_cluster_message(pCluster); - OPAL_OUTPUT_VERBOSE((1, orte_ras_base.ras_output, + ORTE_OUTPUT_VERBOSE((1, orte_ras_base.ras_output, "ras:ccp:pCluster->get_ComputeNodes failed.")); return ORTE_ERROR; } @@ -189,7 +189,7 @@ static int discover(opal_list_t* nodelist, ICluster* pCluster) hr = pNodesCollection->GetEnumerator(&pNodes); if (FAILED(hr)) { get_cluster_message(pCluster); - OPAL_OUTPUT_VERBOSE((1, orte_ras_base.ras_output, + ORTE_OUTPUT_VERBOSE((1, orte_ras_base.ras_output, "ras:ccp:pNodesCollection->GetEnumerator failed.")); return ORTE_ERROR; } @@ -213,7 +213,7 @@ static int discover(opal_list_t* nodelist, ICluster* pCluster) */ hr = pNode->get_Status(&Status); if (FAILED(hr)) { - OPAL_OUTPUT_VERBOSE((1, orte_ras_base.ras_output, + ORTE_OUTPUT_VERBOSE((1, orte_ras_base.ras_output, "ras:ccp:pNode->get_Status failed.")); ret = ORTE_ERROR; goto cleanup; @@ -222,7 +222,7 @@ static int discover(opal_list_t* nodelist, ICluster* pCluster) /* Get available number of processors on each node. */ hr = pNode->get_NumberOfIdleProcessors(&idle_processors); if (FAILED(hr)) { - OPAL_OUTPUT_VERBOSE((1, orte_ras_base.ras_output, + ORTE_OUTPUT_VERBOSE((1, orte_ras_base.ras_output, "ras:ccp:pNode->get_NumberOfIdleProcessors failed.")); ret = ORTE_ERROR; goto cleanup; @@ -236,7 +236,7 @@ static int discover(opal_list_t* nodelist, ICluster* pCluster) /* Get node name. */ hr = pNode->get_Name(&node_name); if (FAILED(hr)) { - OPAL_OUTPUT_VERBOSE((1, orte_ras_base.ras_output, + ORTE_OUTPUT_VERBOSE((1, orte_ras_base.ras_output, "ras:ccp:pNode->get_Name failed.")); ret = ORTE_ERROR; goto cleanup; @@ -245,7 +245,7 @@ static int discover(opal_list_t* nodelist, ICluster* pCluster) /* Get node processor architecture. */ hr = pNode->get_ProcessorArchitecture(&node_arch); if (FAILED(hr)) { - OPAL_OUTPUT_VERBOSE((1, orte_ras_base.ras_output, + ORTE_OUTPUT_VERBOSE((1, orte_ras_base.ras_output, "ras:ccp:pNode->get_ProcessorArchitecture failed.")); ret = ORTE_ERROR; goto cleanup; @@ -259,7 +259,7 @@ static int discover(opal_list_t* nodelist, ICluster* pCluster) node = (orte_node_t*) item; if (0 == strcmp(node->name, (char *)node_name)) { ++node->slots; - OPAL_OUTPUT_VERBOSE((1, orte_ras_base.ras_output, + ORTE_OUTPUT_VERBOSE((1, orte_ras_base.ras_output, "ras:ccp:allocate:discover: found -- bumped slots to %d", node->slots)); break; @@ -271,7 +271,7 @@ static int discover(opal_list_t* nodelist, ICluster* pCluster) /* Nope -- didn't find it, so add a new item to the list */ - OPAL_OUTPUT_VERBOSE((1, orte_ras_base.ras_output, + ORTE_OUTPUT_VERBOSE((1, orte_ras_base.ras_output, "ras:ccp:allocate:discover: not found -- added to list")); node = OBJ_NEW(orte_node_t); @@ -302,10 +302,10 @@ static int discover(opal_list_t* nodelist, ICluster* pCluster) cleanup: if (ORTE_SUCCESS == ret) { - OPAL_OUTPUT_VERBOSE((1, orte_ras_base.ras_output, + ORTE_OUTPUT_VERBOSE((1, orte_ras_base.ras_output, "ras:ccp:allocate:discover: success")); } else { - OPAL_OUTPUT_VERBOSE((1, orte_ras_base.ras_output, + ORTE_OUTPUT_VERBOSE((1, orte_ras_base.ras_output, "ras:ccp:allocate:discover: failed (rc=%d)", ret)); } @@ -316,7 +316,7 @@ cleanup: /* check for timing request - get stop time and report elapsed time if so */ if (orte_timing) { gettimeofday(&stop, NULL); - opal_output(0, "ras_ccp: time to allocate is %ld usec", + orte_output(0, "ras_ccp: time to allocate is %ld usec", (long int)((stop.tv_sec - start.tv_sec)*1000000 + (stop.tv_usec - start.tv_usec))); gettimeofday(&start, NULL); diff --git a/orte/mca/ras/gridengine/ras_gridengine_component.c b/orte/mca/ras/gridengine/ras_gridengine_component.c index e36418259b..5a1ae3cf52 100644 --- a/orte/mca/ras/gridengine/ras_gridengine_component.c +++ b/orte/mca/ras/gridengine/ras_gridengine_component.c @@ -24,11 +24,14 @@ #include "orte_config.h" #include "orte/constants.h" + #include "opal/mca/base/base.h" #include "opal/mca/base/mca_base_param.h" +#include "orte/util/output.h" + #include "orte/util/proc_info.h" #include "orte/util/name_fns.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "orte/mca/ras/base/ras_private.h" #include "ras_gridengine.h" @@ -91,7 +94,7 @@ static int orte_ras_gridengine_open(void) false, false, 0, &mca_ras_gridengine_component.show_jobid); if (value != 0) { - mca_ras_gridengine_component.verbose = opal_output_open(NULL); + mca_ras_gridengine_component.verbose = orte_output_open(NULL, "RAS", "GRIDENGINE", "DEBUG", NULL); } else { mca_ras_gridengine_component.verbose = -1; } @@ -104,13 +107,13 @@ static int orte_ras_gridengine_component_query(mca_base_module_t **module, int * if (NULL != getenv("SGE_ROOT") && NULL != getenv("ARC") && NULL != getenv("PE_HOSTFILE") && NULL != getenv("JOB_ID")) { - OPAL_OUTPUT_VERBOSE((1, orte_ras_base.ras_output, + ORTE_OUTPUT_VERBOSE((1, orte_ras_base.ras_output, "%s ras:gridengine: available for selection", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME))); *module = (mca_base_module_t *) &orte_ras_gridengine_module; return ORTE_SUCCESS; } - OPAL_OUTPUT_VERBOSE((1, orte_ras_base.ras_output, + ORTE_OUTPUT_VERBOSE((1, orte_ras_base.ras_output, "%s ras:gridengine: NOT available for selection", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME))); *module = NULL; diff --git a/orte/mca/ras/gridengine/ras_gridengine_module.c b/orte/mca/ras/gridengine/ras_gridengine_module.c index 6f68661eb0..f48dcc31d8 100644 --- a/orte/mca/ras/gridengine/ras_gridengine_module.c +++ b/orte/mca/ras/gridengine/ras_gridengine_module.c @@ -28,8 +28,8 @@ #include #include "opal/util/argv.h" -#include "opal/util/output.h" -#include "opal/util/show_help.h" +#include "orte/util/output.h" +#include "orte/util/show_help.h" #include "orte/mca/errmgr/errmgr.h" #include "orte/runtime/orte_globals.h" @@ -71,12 +71,12 @@ static int orte_ras_gridengine_allocate(opal_list_t *nodelist) /* show the Grid Engine's JOB_ID */ if (mca_ras_gridengine_component.show_jobid || mca_ras_gridengine_component.verbose != -1) { - opal_output(0, "ras:gridengine: JOB_ID: %s", job_id); + orte_output(0, "ras:gridengine: JOB_ID: %s", job_id); } /* check the PE_HOSTFILE before continuing on */ if (!(fp = fopen(pe_hostfile, "r"))) { - opal_show_help("help-ras-gridengine.txt", "cannot-read-pe-hostfile", + orte_show_help("help-ras-gridengine.txt", "cannot-read-pe-hostfile", true, pe_hostfile, strerror(errno)); rc = ORTE_ERROR; ORTE_ERROR_LOG(rc); @@ -103,7 +103,7 @@ static int orte_ras_gridengine_allocate(opal_list_t *nodelist) node->slots_inuse = 0; node->slots_max = 0; node->slots = (int)strtol(num, (char **)NULL, 10); - opal_output(mca_ras_gridengine_component.verbose, + orte_output(mca_ras_gridengine_component.verbose, "ras:gridengine: %s: PE_HOSTFILE shows slots=%d", node->name, node->slots); opal_list_append(nodelist, &node->super); @@ -119,7 +119,7 @@ cleanup: * is considered an unrecoverable error and we need to report it */ if (opal_list_is_empty(nodelist)) { - opal_show_help("help-ras-gridengine.txt", "no-nodes-found", true); + orte_show_help("help-ras-gridengine.txt", "no-nodes-found", true); return ORTE_ERR_NOT_FOUND; } @@ -141,7 +141,7 @@ static int get_slot_count(char* node_name, int* slot_cnt) /* check the PE_HOSTFILE before continuing on */ if (!(fp = fopen(pe_hostfile, "r"))) { - opal_show_help("help-ras-gridengine.txt", "cannot-read-pe-hostfile", + orte_show_help("help-ras-gridengine.txt", "cannot-read-pe-hostfile", true, pe_hostfile, strerror(errno)); ORTE_ERROR_LOG(ORTE_ERROR); return(ORTE_ERROR); @@ -155,7 +155,7 @@ static int get_slot_count(char* node_name, int* slot_cnt) if(strcmp(node_name,name) == 0) { *slot_cnt = (int) strtol(num, (char **)NULL, 10); - opal_output(mca_ras_gridengine_component.verbose, + orte_output(mca_ras_gridengine_component.verbose, "ras:gridengine: %s: PE_HOSTFILE shows slots=%d", node_name, *slot_cnt); fclose(fp); @@ -175,7 +175,7 @@ static int get_slot_count(char* node_name, int* slot_cnt) static int orte_ras_gridengine_finalize(void) { /* Nothing to do */ - opal_output(mca_ras_gridengine_component.verbose, + orte_output(mca_ras_gridengine_component.verbose, "ras:gridengine:finalize: success (nothing to do)"); return ORTE_SUCCESS; } diff --git a/orte/mca/ras/loadleveler/ras_loadleveler_component.c b/orte/mca/ras/loadleveler/ras_loadleveler_component.c index d031d2e303..a2bdf91250 100644 --- a/orte/mca/ras/loadleveler/ras_loadleveler_component.c +++ b/orte/mca/ras/loadleveler/ras_loadleveler_component.c @@ -20,7 +20,7 @@ #include "opal/mca/base/base.h" #include "opal/mca/base/mca_base_param.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "orte/util/proc_info.h" #include "orte/util/name_fns.h" @@ -90,7 +90,7 @@ static int orte_ras_loadleveler_component_query(mca_base_module_t **module, int /* Are we running under a LOADLEVELER job? */ if (NULL != getenv("LOADL_STEP_ID")) { mca_base_param_lookup_int(param_priority, priority); - OPAL_OUTPUT_VERBOSE((1, orte_ras_base.ras_output, + ORTE_OUTPUT_VERBOSE((1, orte_ras_base.ras_output, "%s ras:loadleveler: available for selection", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME))); *module = (mca_base_module_t *) &orte_ras_loadleveler_module; @@ -98,7 +98,7 @@ static int orte_ras_loadleveler_component_query(mca_base_module_t **module, int } /* Sadly, no */ - OPAL_OUTPUT_VERBOSE((1, orte_ras_base.ras_output, + ORTE_OUTPUT_VERBOSE((1, orte_ras_base.ras_output, "%s ras:loadleveler: NOT available for selection", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME))); *module = NULL; diff --git a/orte/mca/ras/loadleveler/ras_loadleveler_module.c b/orte/mca/ras/loadleveler/ras_loadleveler_module.c index d82bce2adc..d40ac7acc9 100644 --- a/orte/mca/ras/loadleveler/ras_loadleveler_module.c +++ b/orte/mca/ras/loadleveler/ras_loadleveler_module.c @@ -40,7 +40,7 @@ #include #include "opal/util/argv.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "orte/mca/errmgr/errmgr.h" #include "orte/runtime/orte_globals.h" @@ -125,7 +125,7 @@ cleanup: */ static int orte_ras_loadleveler_finalize(void) { - opal_output(orte_ras_base.ras_output, + orte_output(orte_ras_base.ras_output, "ras:loadleveler:finalize: success (nothing to do)"); return ORTE_SUCCESS; } @@ -146,7 +146,7 @@ static int orte_ras_loadleveler_get_hostlist(int* num_hosts, char*** hostlist) /* Get the step ID from LOADL_STEP_ID environment variable. */ if(NULL == (ll_step_id = getenv("LOADL_STEP_ID"))) { - opal_output(orte_ras_base.ras_output, + orte_output(orte_ras_base.ras_output, "ras:loadleveler:allocate: could not get LOADL_STEP_ID " "from environment!"); return ORTE_ERROR; @@ -161,7 +161,7 @@ static int orte_ras_loadleveler_get_hostlist(int* num_hosts, char*** hostlist) /* Initialize the LL API. Specify that query type is JOBS. */ if(NULL == (queryObject = ll_query(JOBS))) { - opal_output(orte_ras_base.ras_output, + orte_output(orte_ras_base.ras_output, "ras:loadleveler:allocate: ll_query faild on JOBS!"); return ORTE_ERROR; } @@ -169,7 +169,7 @@ static int orte_ras_loadleveler_get_hostlist(int* num_hosts, char*** hostlist) /* Specify that this is a QUERY_STEPID type of query. */ rc = ll_set_request(queryObject, QUERY_STEPID, job_step_list, ALL_DATA); if(0 > rc) { - opal_output(orte_ras_base.ras_output, + orte_output(orte_ras_base.ras_output, "ras:loadleveler:allocate: ll_set request failed: error " "%d!", rc); return ORTE_ERROR; @@ -178,20 +178,20 @@ static int orte_ras_loadleveler_get_hostlist(int* num_hosts, char*** hostlist) /* Get a Job object from LoadL_schedd that contains the relevant job step */ job = ll_get_objs(queryObject, LL_CM, NULL, &obj_count, &err_code); if(NULL == job) { - opal_output(orte_ras_base.ras_output, + orte_output(orte_ras_base.ras_output, "ras:loadleveler:allocate: ll_get_objs faild!"); return ORTE_ERROR; } if (obj_count != 1) { /* Only 1 Job object is expected. */ - opal_output(orte_ras_base.ras_output, + orte_output(orte_ras_base.ras_output, "ras:loadleveler:allocate: ll_get_objs: expected one job " "to match, got %d!", obj_count); return ORTE_ERROR; } if(0 != (rc = ll_get_data(job, LL_JobSchedd, &schedd_host_name))) { - opal_output(orte_ras_base.ras_output, + orte_output(orte_ras_base.ras_output, "ras:loadleveler:allocate: ll_get_data: failure. RC= %d!", rc); return ORTE_ERROR; @@ -200,7 +200,7 @@ static int orte_ras_loadleveler_get_hostlist(int* num_hosts, char*** hostlist) job_step_list[0] = ll_step_id; job_step_list[1] = NULL; } else { - opal_output(orte_ras_base.ras_output, + orte_output(orte_ras_base.ras_output, "ras:loadleveler:allocate: ll_get_objs() Error: Could not " "determine managing schedd for job %s.\n", job_step_list[0]); @@ -214,7 +214,7 @@ static int orte_ras_loadleveler_get_hostlist(int* num_hosts, char*** hostlist) /* Initialize the LL API. Specify that query type is JOBS. */ if(NULL == (queryObject = ll_query(JOBS))) { - opal_output(orte_ras_base.ras_output, + orte_output(orte_ras_base.ras_output, "ras:loadleveler:allocate: ll_query faild on JOBS!"); return ORTE_ERROR; } @@ -222,7 +222,7 @@ static int orte_ras_loadleveler_get_hostlist(int* num_hosts, char*** hostlist) /* Specify that this is a QUERY_STEPID type of query. */ rc = ll_set_request(queryObject, QUERY_STEPID, job_step_list, ALL_DATA); if(0 != rc) { - opal_output(orte_ras_base.ras_output, + orte_output(orte_ras_base.ras_output, "ras:loadleveler:allocate: ll_set request failed: error " "%d!", rc); return ORTE_ERROR; @@ -232,27 +232,27 @@ static int orte_ras_loadleveler_get_hostlist(int* num_hosts, char*** hostlist) job = ll_get_objs(queryObject, LL_SCHEDD, schedd_host_name, &obj_count, &err_code); if(NULL == job) { - opal_output(orte_ras_base.ras_output, + orte_output(orte_ras_base.ras_output, "ras:loadleveler:allocate: ll_set request failed: error " "%d!", rc); return ORTE_ERROR; } if (obj_count != 1) { /* Only 1 Job object is expected. */ - opal_output(orte_ras_base.ras_output, + orte_output(orte_ras_base.ras_output, "ras:loadleveler:allocate: ll_get_objs: expected one job " "to match, got %d!", obj_count); return ORTE_ERROR; } if(0 != (rc = ll_get_data(job, LL_JobStepCount, &job_step_count))) { - opal_output(orte_ras_base.ras_output, + orte_output(orte_ras_base.ras_output, "ras:loadleveler:allocate: ll_get_data: failure. RC= %d!", rc); return ORTE_ERROR; } if (job_step_count != 1) { /* Only 1 Job Step object is expected. */ - opal_output(orte_ras_base.ras_output, + orte_output(orte_ras_base.ras_output, "ras:loadleveler:allocate: ll_get_objs: expected one job " "step to match, got %d!", obj_count); return ORTE_ERROR; @@ -260,13 +260,13 @@ static int orte_ras_loadleveler_get_hostlist(int* num_hosts, char*** hostlist) step = NULL; if(0 != (rc = ll_get_data(job, LL_JobGetFirstStep, &step))) { - opal_output(orte_ras_base.ras_output, + orte_output(orte_ras_base.ras_output, "ras:loadleveler:allocate: ll_get_data: failure. RC= %d!", rc); return ORTE_ERROR; } if(NULL == step) { - opal_output(orte_ras_base.ras_output, + orte_output(orte_ras_base.ras_output, "ll_get_data() Error: Unable to obtain Job Step " "information.\n"); return ORTE_ERROR; @@ -274,7 +274,7 @@ static int orte_ras_loadleveler_get_hostlist(int* num_hosts, char*** hostlist) step_mode = -1; if(0 != (rc = ll_get_data(step, LL_StepParallelMode, &step_mode))) { - opal_output(orte_ras_base.ras_output, + orte_output(orte_ras_base.ras_output, "ras:loadleveler:allocate: ll_get_data: failure on " "LL_StepParallelMode. RC= %d!", rc); return ORTE_ERROR; @@ -282,7 +282,7 @@ static int orte_ras_loadleveler_get_hostlist(int* num_hosts, char*** hostlist) /* Serial job step: step_mode==0; Parallel: step_mode==1; Others:2,3,4. */ if ((step_mode != 0) && (step_mode != 1)) { - opal_output(orte_ras_base.ras_output, + orte_output(orte_ras_base.ras_output, "ras:loadleveler:allocate: We support only Serial and " "Parallel LoadLeveler job types. PVM, NQS, and Blue Gene" "jobs are not supported by the LoadLeveler RAS!"); @@ -292,14 +292,14 @@ static int orte_ras_loadleveler_get_hostlist(int* num_hosts, char*** hostlist) if(step_mode == 0) { /* serial job */ node = NULL; if(0 != (rc = ll_get_data(step, LL_StepGetFirstNode, &node))) { - opal_output(orte_ras_base.ras_output, + orte_output(orte_ras_base.ras_output, "ras:loadleveler:allocate: ll_get_data: failure on " "LL_StepGetFirstNode. RC= %d!", rc); return ORTE_ERROR; } task = NULL; if(0 != (rc = ll_get_data(node, LL_NodeGetFirstTask, &task))) { - opal_output(orte_ras_base.ras_output, + orte_output(orte_ras_base.ras_output, "ras:loadleveler:allocate: ll_get_data: failure on " "LL_NodeGetFirstTask. RC= %d!", rc); return ORTE_ERROR; @@ -307,7 +307,7 @@ static int orte_ras_loadleveler_get_hostlist(int* num_hosts, char*** hostlist) task_instance = NULL; rc = ll_get_data(task, LL_TaskGetFirstTaskInstance, &task_instance); if(0 != rc) { - opal_output(orte_ras_base.ras_output, + orte_output(orte_ras_base.ras_output, "ras:loadleveler:allocate: ll_get_data: failure on " "LL_TaskGetFirstInstance. RC= %d!", rc); return ORTE_ERROR; @@ -315,7 +315,7 @@ static int orte_ras_loadleveler_get_hostlist(int* num_hosts, char*** hostlist) task_machine_name = NULL; if(0 != (rc = ll_get_data(task_instance, LL_TaskInstanceMachineName, &task_machine_name))) { - opal_output(orte_ras_base.ras_output, + orte_output(orte_ras_base.ras_output, "ras:loadleveler:allocate: ll_get_data: failure on " "LL_TaskInstanceMachineName. RC= %d!", rc); return ORTE_ERROR; @@ -326,7 +326,7 @@ static int orte_ras_loadleveler_get_hostlist(int* num_hosts, char*** hostlist) node = NULL; if(0 != (rc = ll_get_data(step, LL_StepGetFirstNode, &node))) { - opal_output(orte_ras_base.ras_output, + orte_output(orte_ras_base.ras_output, "ras:loadleveler:allocate: ll_get_data: failure on " "LL_StepGetFirstNode. RC= %d!", rc); return ORTE_ERROR; @@ -335,7 +335,7 @@ static int orte_ras_loadleveler_get_hostlist(int* num_hosts, char*** hostlist) while(NULL != node) { /* Loop through the "Node" objects. */ task = NULL; if(0 != (rc = ll_get_data(node, LL_NodeGetFirstTask, &task))) { - opal_output(orte_ras_base.ras_output, + orte_output(orte_ras_base.ras_output, "ras:loadleveler:allocate: ll_get_data: failure on " "LL_NodeGetFirstTask. RC= %d!", rc); return ORTE_ERROR; @@ -345,7 +345,7 @@ static int orte_ras_loadleveler_get_hostlist(int* num_hosts, char*** hostlist) ll_master_task = 0; rc = ll_get_data(task, LL_TaskIsMaster, &ll_master_task); if(0 != rc) { - opal_output(orte_ras_base.ras_output, + orte_output(orte_ras_base.ras_output, "ras:loadleveler:allocate: ll_get_data: failure" " on LL_TaskIsMaster. RC= %d!", rc); return ORTE_ERROR; @@ -358,7 +358,7 @@ static int orte_ras_loadleveler_get_hostlist(int* num_hosts, char*** hostlist) task_instance = NULL; if(0 != (rc = ll_get_data(task, LL_TaskGetFirstTaskInstance, &task_instance))) { - opal_output(orte_ras_base.ras_output, + orte_output(orte_ras_base.ras_output, "ras:loadleveler:allocate: ll_get_data: " "failure on LL_TaskGetFirstTaskInstance. " " RC= %d!", rc); @@ -372,7 +372,7 @@ static int orte_ras_loadleveler_get_hostlist(int* num_hosts, char*** hostlist) LL_TaskInstanceMachineName, &task_machine_name); if(0 != rc) { - opal_output(orte_ras_base.ras_output, + orte_output(orte_ras_base.ras_output, "ras:loadleveler:allocate: ll_get_data:" " failure on LL_TaskInstanceMachineName" "RC= %d!", rc); @@ -383,7 +383,7 @@ static int orte_ras_loadleveler_get_hostlist(int* num_hosts, char*** hostlist) rc = ll_get_data(task, LL_TaskGetNextTaskInstance, &task_instance); if(0 != rc) { - opal_output(orte_ras_base.ras_output, + orte_output(orte_ras_base.ras_output, "ras:loadleveler:allocate: ll_get_data:" " failure on LL_TaskGetNextInstance. " "RC= %d!", rc); @@ -393,7 +393,7 @@ static int orte_ras_loadleveler_get_hostlist(int* num_hosts, char*** hostlist) } task = NULL; if(0 != (rc = ll_get_data(node, LL_NodeGetNextTask, &task))) { - opal_output(orte_ras_base.ras_output, + orte_output(orte_ras_base.ras_output, "ras:loadleveler:allocate: ll_get_data: " "failure on LL_NodeGetNextTask. RC= %d!", rc); return ORTE_ERROR; @@ -401,7 +401,7 @@ static int orte_ras_loadleveler_get_hostlist(int* num_hosts, char*** hostlist) } node = NULL; if(0 != (rc = ll_get_data(step, LL_StepGetNextNode, &node))) { - opal_output(orte_ras_base.ras_output, + orte_output(orte_ras_base.ras_output, "ras:loadleveler:allocate: ll_get_data: failure " "on LL_StepGetNextNode. RC= %d!", rc); return ORTE_ERROR; diff --git a/orte/mca/ras/lsf/ras_lsf_component.c b/orte/mca/ras/lsf/ras_lsf_component.c index 537f8be380..bc87060871 100644 --- a/orte/mca/ras/lsf/ras_lsf_component.c +++ b/orte/mca/ras/lsf/ras_lsf_component.c @@ -25,7 +25,7 @@ #include "opal/mca/base/base.h" #include "opal/mca/base/mca_base_param.h" #include "orte/util/proc_info.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "ras_lsf.h" diff --git a/orte/mca/ras/lsf/ras_lsf_module.c b/orte/mca/ras/lsf/ras_lsf_module.c index 44eaf79a22..a1ab294288 100644 --- a/orte/mca/ras/lsf/ras_lsf_module.c +++ b/orte/mca/ras/lsf/ras_lsf_module.c @@ -27,7 +27,7 @@ #include #include "opal/util/argv.h" -#include "opal/util/show_help.h" +#include "orte/util/show_help.h" #include "orte/mca/errmgr/errmgr.h" #include "orte/runtime/orte_globals.h" @@ -60,7 +60,7 @@ static int allocate(orte_jobid_t job, opal_list_t *nodes) /* get the list of allocated nodes */ if ((num_nodes = lsb_getalloc(&nodelist)) < 0) { - opal_show_help("help-ras-lsf.txt", "nodelist-failed", true); + orte_show_help("help-ras-lsf.txt", "nodelist-failed", true); return ORTE_ERR_NOT_AVAILABLE; } diff --git a/orte/mca/ras/slurm/ras_slurm_component.c b/orte/mca/ras/slurm/ras_slurm_component.c index 2426a1e39a..d458f765bf 100644 --- a/orte/mca/ras/slurm/ras_slurm_component.c +++ b/orte/mca/ras/slurm/ras_slurm_component.c @@ -19,7 +19,7 @@ #include "orte_config.h" #include "orte/constants.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "opal/mca/base/base.h" #include "opal/mca/base/mca_base_param.h" @@ -94,7 +94,7 @@ static int orte_ras_slurm_component_query(mca_base_module_t **module, int *prior if (NULL != getenv("SLURM_JOBID")) { mca_base_param_lookup_int(param_priority, priority); - OPAL_OUTPUT_VERBOSE((1, orte_ras_base.ras_output, + ORTE_OUTPUT_VERBOSE((1, orte_ras_base.ras_output, "%s ras:slurm: available for selection", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME))); *module = (mca_base_module_t *) &orte_ras_slurm_module; @@ -103,7 +103,7 @@ static int orte_ras_slurm_component_query(mca_base_module_t **module, int *prior /* Sadly, no */ - OPAL_OUTPUT_VERBOSE((1, orte_ras_base.ras_output, + ORTE_OUTPUT_VERBOSE((1, orte_ras_base.ras_output, "%s ras:slurm: NOT available for selection", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME))); *module = NULL; diff --git a/orte/mca/ras/slurm/ras_slurm_module.c b/orte/mca/ras/slurm/ras_slurm_module.c index 46195b4869..4379e18ad0 100644 --- a/orte/mca/ras/slurm/ras_slurm_module.c +++ b/orte/mca/ras/slurm/ras_slurm_module.c @@ -24,9 +24,8 @@ #include #include "opal/util/argv.h" -#include "opal/util/output.h" -#include "opal/util/show_help.h" +#include "orte/util/output.h" #include "orte/mca/errmgr/errmgr.h" #include "orte/util/name_fns.h" #include "orte/runtime/orte_globals.h" @@ -70,7 +69,7 @@ static int orte_ras_slurm_allocate(opal_list_t *nodes) slurm_node_str = getenv("SLURM_NODELIST"); if (NULL == slurm_node_str) { - opal_show_help("help-ras-slurm.txt", "slurm-env-var-not-found", 1, + orte_show_help("help-ras-slurm.txt", "slurm-env-var-not-found", 1, "SLURM_NODELIST"); return ORTE_ERR_NOT_FOUND; } @@ -78,7 +77,7 @@ static int orte_ras_slurm_allocate(opal_list_t *nodes) tasks_per_node = getenv("SLURM_TASKS_PER_NODE"); if (NULL == tasks_per_node) { - opal_show_help("help-ras-slurm.txt", "slurm-env-var-not-found", 1, + orte_show_help("help-ras-slurm.txt", "slurm-env-var-not-found", 1, "SLURM_TASKS_PER_NODE"); return ORTE_ERR_NOT_FOUND; } @@ -94,7 +93,7 @@ static int orte_ras_slurm_allocate(opal_list_t *nodes) if(NULL != tmp) { cpus_per_task = atoi(tmp); if(0 >= cpus_per_task) { - opal_output(0, "ras:slurm:allocate: Got bad value from SLURM_CPUS_PER_TASK. " + orte_output(0, "ras:slurm:allocate: Got bad value from SLURM_CPUS_PER_TASK. " "Variable was: %s\n", tmp); ORTE_ERROR_LOG(ORTE_ERROR); return ORTE_ERROR; @@ -107,7 +106,7 @@ static int orte_ras_slurm_allocate(opal_list_t *nodes) free(regexp); free(node_tasks); if (ORTE_SUCCESS != ret) { - OPAL_OUTPUT_VERBOSE((1, orte_ras_base.ras_output, + ORTE_OUTPUT_VERBOSE((1, orte_ras_base.ras_output, "%s ras:slurm:allocate: discover failed!", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME))); return ret; @@ -116,11 +115,11 @@ static int orte_ras_slurm_allocate(opal_list_t *nodes) /* All done */ if (ORTE_SUCCESS == ret) { - OPAL_OUTPUT_VERBOSE((1, orte_ras_base.ras_output, + ORTE_OUTPUT_VERBOSE((1, orte_ras_base.ras_output, "%s ras:slurm:allocate: success", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME))); } else { - OPAL_OUTPUT_VERBOSE((1, orte_ras_base.ras_output, + ORTE_OUTPUT_VERBOSE((1, orte_ras_base.ras_output, "%s ras:slurm:allocate: failure (base_allocate_nodes=%d)", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ret)); } @@ -133,7 +132,7 @@ static int orte_ras_slurm_allocate(opal_list_t *nodes) static int orte_ras_slurm_finalize(void) { - OPAL_OUTPUT_VERBOSE((1, orte_ras_base.ras_output, + ORTE_OUTPUT_VERBOSE((1, orte_ras_base.ras_output, "%s ras:slurm:finalize: success (nothing to do)", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME))); return ORTE_SUCCESS; @@ -171,7 +170,7 @@ static int orte_ras_slurm_discover(char *regexp, char *tasks_per_node, return ORTE_ERR_OUT_OF_RESOURCE; } - OPAL_OUTPUT_VERBOSE((1, orte_ras_base.ras_output, + ORTE_OUTPUT_VERBOSE((1, orte_ras_base.ras_output, "%s ras:slurm:allocate:discover: checking nodelist: %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), regexp)); @@ -202,7 +201,7 @@ static int orte_ras_slurm_discover(char *regexp, char *tasks_per_node, } if(i == 0) { /* we found a special character at the beginning of the string */ - opal_show_help("help-ras-slurm.txt", "slurm-env-var-bad-value", + orte_show_help("help-ras-slurm.txt", "slurm-env-var-bad-value", 1, regexp, tasks_per_node, "SLURM_NODELIST"); ORTE_ERROR_LOG(ORTE_ERR_BAD_PARAM); free(orig); @@ -219,7 +218,7 @@ static int orte_ras_slurm_discover(char *regexp, char *tasks_per_node, } if (j >= len) { /* we didn't find the end of the range */ - opal_show_help("help-ras-slurm.txt", "slurm-env-var-bad-value", + orte_show_help("help-ras-slurm.txt", "slurm-env-var-bad-value", 1, regexp, tasks_per_node, "SLURM_NODELIST"); ORTE_ERROR_LOG(ORTE_ERR_BAD_PARAM); free(orig); @@ -228,7 +227,7 @@ static int orte_ras_slurm_discover(char *regexp, char *tasks_per_node, ret = orte_ras_slurm_parse_ranges(base, base + i + 1, &names); if(ORTE_SUCCESS != ret) { - opal_show_help("help-ras-slurm.txt", "slurm-env-var-bad-value", + orte_show_help("help-ras-slurm.txt", "slurm-env-var-bad-value", 1, regexp, tasks_per_node, "SLURM_NODELIST"); ORTE_ERROR_LOG(ret); free(orig); @@ -243,7 +242,7 @@ static int orte_ras_slurm_discover(char *regexp, char *tasks_per_node, } else { /* If we didn't find a range, just add the node */ - OPAL_OUTPUT_VERBOSE((1, orte_ras_base.ras_output, + ORTE_OUTPUT_VERBOSE((1, orte_ras_base.ras_output, "%s ras:slurm:allocate:discover: found node %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), base)); @@ -311,7 +310,7 @@ static int orte_ras_slurm_discover(char *regexp, char *tasks_per_node, } else if (*endptr == '\0' || j >= num_nodes) { break; } else { - opal_show_help("help-ras-slurm.txt", "slurm-env-var-bad-value", 1, + orte_show_help("help-ras-slurm.txt", "slurm-env-var-bad-value", 1, regexp, tasks_per_node, "SLURM_TASKS_PER_NODE"); ORTE_ERROR_LOG(ORTE_ERR_BAD_PARAM); free(slots); @@ -327,7 +326,7 @@ static int orte_ras_slurm_discover(char *regexp, char *tasks_per_node, for (i = 0; NULL != names && NULL != names[i]; ++i) { orte_node_t *node; - OPAL_OUTPUT_VERBOSE((1, orte_ras_base.ras_output, + ORTE_OUTPUT_VERBOSE((1, orte_ras_base.ras_output, "%s ras:slurm:allocate:discover: adding node %s (%d slot%s)", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), names[i], slots[i], (1 == slots[i]) ? "" : "s")); @@ -385,7 +384,7 @@ static int orte_ras_slurm_parse_ranges(char *base, char *ranges, char ***names) if (start < orig + len) { - OPAL_OUTPUT_VERBOSE((1, orte_ras_base.ras_output, + ORTE_OUTPUT_VERBOSE((1, orte_ras_base.ras_output, "%s ras:slurm:allocate:discover: parse range %s (2)", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), start)); diff --git a/orte/mca/ras/tm/ras_tm_component.c b/orte/mca/ras/tm/ras_tm_component.c index 644c5169e0..fa59f3c64b 100644 --- a/orte/mca/ras/tm/ras_tm_component.c +++ b/orte/mca/ras/tm/ras_tm_component.c @@ -22,7 +22,7 @@ #include "opal/mca/base/base.h" #include "opal/mca/base/mca_base_param.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "opal/util/basename.h" #include "orte/mca/ras/base/ras_private.h" diff --git a/orte/mca/ras/tm/ras_tm_module.c b/orte/mca/ras/tm/ras_tm_module.c index f409ae892a..0b6291d721 100644 --- a/orte/mca/ras/tm/ras_tm_module.c +++ b/orte/mca/ras/tm/ras_tm_module.c @@ -28,9 +28,9 @@ #endif /* HAVE_SYS_TIME_H */ #include "opal/util/argv.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "opal/util/os_path.h" -#include "opal/util/show_help.h" +#include "orte/util/show_help.h" #include "orte/mca/errmgr/errmgr.h" #include "orte/runtime/orte_globals.h" @@ -87,7 +87,7 @@ static int allocate(opal_list_t *nodes) * is an unrecoverable error - report it */ if (opal_list_is_empty(nodes)) { - opal_show_help("help-ras-tm.txt", "no-nodes-found", true, filename); + orte_show_help("help-ras-tm.txt", "no-nodes-found", true, filename); return ORTE_ERR_NOT_FOUND; } @@ -100,7 +100,7 @@ static int allocate(opal_list_t *nodes) */ static int finalize(void) { - OPAL_OUTPUT_VERBOSE((1, orte_ras_base.ras_output, + ORTE_OUTPUT_VERBOSE((1, orte_ras_base.ras_output, "%s ras:tm:finalize: success (nothing to do)", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME))); return ORTE_SUCCESS; @@ -158,7 +158,7 @@ static int discover(opal_list_t* nodelist, char *pbs_jobid) nodeid=0; while (NULL != (hostname = tm_getline(fp))) { - OPAL_OUTPUT_VERBOSE((1, orte_ras_base.ras_output, + ORTE_OUTPUT_VERBOSE((1, orte_ras_base.ras_output, "%s ras:tm:allocate:discover: got hostname %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), hostname)); @@ -172,7 +172,7 @@ static int discover(opal_list_t* nodelist, char *pbs_jobid) if (0 == strcmp(node->name, hostname)) { ++node->slots; - OPAL_OUTPUT_VERBOSE((1, orte_ras_base.ras_output, + ORTE_OUTPUT_VERBOSE((1, orte_ras_base.ras_output, "%s ras:tm:allocate:discover: found -- bumped slots to %d", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), node->slots)); @@ -186,7 +186,7 @@ static int discover(opal_list_t* nodelist, char *pbs_jobid) /* Nope -- didn't find it, so add a new item to the list */ - OPAL_OUTPUT_VERBOSE((1, orte_ras_base.ras_output, + ORTE_OUTPUT_VERBOSE((1, orte_ras_base.ras_output, "%s ras:tm:allocate:discover: not found -- added to list", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME))); @@ -210,7 +210,7 @@ static int discover(opal_list_t* nodelist, char *pbs_jobid) /* check for timing request - get stop time and report elapsed time if so */ if (orte_timing) { gettimeofday(&stop, NULL); - opal_output(0, "ras_tm: time to allocate is %ld usec", + orte_output(0, "ras_tm: time to allocate is %ld usec", (long int)((stop.tv_sec - start.tv_sec)*1000000 + (stop.tv_usec - start.tv_usec))); gettimeofday(&start, NULL); diff --git a/orte/mca/rmaps/base/base.h b/orte/mca/rmaps/base/base.h index 9b149ef368..d1fa9dcf5f 100644 --- a/orte/mca/rmaps/base/base.h +++ b/orte/mca/rmaps/base/base.h @@ -45,6 +45,7 @@ BEGIN_C_DECLS typedef struct { /** Verbose/debug output stream */ int rmaps_output; + int map_output; /** List of available components */ opal_list_t available_components; /** selected module */ diff --git a/orte/mca/rmaps/base/rmaps_base_close.c b/orte/mca/rmaps/base/rmaps_base_close.c index f9302ca51e..8a6a0586ae 100644 --- a/orte/mca/rmaps/base/rmaps_base_close.c +++ b/orte/mca/rmaps/base/rmaps_base_close.c @@ -21,7 +21,7 @@ #include -#include "opal/util/output.h" +#include "orte/util/output.h" #include "opal/mca/mca.h" #include "opal/mca/base/base.h" diff --git a/orte/mca/rmaps/base/rmaps_base_map_job.c b/orte/mca/rmaps/base/rmaps_base_map_job.c index a49dc018c1..2a416cf720 100644 --- a/orte/mca/rmaps/base/rmaps_base_map_job.c +++ b/orte/mca/rmaps/base/rmaps_base_map_job.c @@ -21,7 +21,7 @@ #include -#include "opal/util/output.h" +#include "orte/util/output.h" #include "opal/mca/mca.h" #include "opal/mca/base/base.h" @@ -89,8 +89,7 @@ int orte_rmaps_base_map_job(orte_job_t *jdata) /* if we wanted to display the map, now is the time to do it */ if (jdata->map->display_map) { - opal_output(0, "*** JOB MAP FOR JOB %s ***", ORTE_JOBID_PRINT(jdata->jobid)); - opal_dss.dump(0, jdata->map, ORTE_JOB_MAP); + opal_dss.dump(orte_rmaps_base.map_output, jdata->map, ORTE_JOB_MAP); } return ORTE_SUCCESS; diff --git a/orte/mca/rmaps/base/rmaps_base_open.c b/orte/mca/rmaps/base/rmaps_base_open.c index b031c518bc..e5d0bcc16f 100644 --- a/orte/mca/rmaps/base/rmaps_base_open.c +++ b/orte/mca/rmaps/base/rmaps_base_open.c @@ -23,9 +23,10 @@ #include "opal/mca/mca.h" #include "opal/mca/base/base.h" #include "opal/mca/base/mca_base_param.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "orte/mca/errmgr/errmgr.h" +#include "orte/util/output.h" #include "orte/mca/rmaps/base/rmaps_private.h" #include "orte/mca/rmaps/base/base.h" @@ -68,7 +69,8 @@ int orte_rmaps_base_open(void) /* Debugging / verbose output. Always have stream open, with verbose set by the mca open system... */ - orte_rmaps_base.rmaps_output = opal_output_open(NULL); + orte_rmaps_base.rmaps_output = orte_output_open(NULL, "RMAPS", "DEBUG", NULL); + orte_rmaps_base.map_output = orte_output_open(NULL, "RMAPS", "MAP", NULL); /* Are we scheduling by node or by slot? */ param = mca_base_param_reg_string_name("rmaps", "base_schedule_policy", diff --git a/orte/mca/rmaps/base/rmaps_base_select.c b/orte/mca/rmaps/base/rmaps_base_select.c index c7977e50b3..24fc1ac422 100644 --- a/orte/mca/rmaps/base/rmaps_base_select.c +++ b/orte/mca/rmaps/base/rmaps_base_select.c @@ -21,7 +21,7 @@ #include -#include "opal/util/output.h" +#include "orte/util/output.h" #include "opal/mca/mca.h" #include "opal/mca/base/base.h" diff --git a/orte/mca/rmaps/base/rmaps_base_support_fns.c b/orte/mca/rmaps/base/rmaps_base_support_fns.c index 45eec74368..dd93285d51 100644 --- a/orte/mca/rmaps/base/rmaps_base_support_fns.c +++ b/orte/mca/rmaps/base/rmaps_base_support_fns.c @@ -21,14 +21,13 @@ #include -#include "opal/util/output.h" #include "opal/util/argv.h" #include "opal/mca/mca.h" #include "opal/mca/base/base.h" #include "opal/mca/base/mca_base_param.h" #include "opal/util/if.h" -#include "opal/util/show_help.h" +#include "orte/util/output.h" #include "orte/util/name_fns.h" #include "orte/runtime/orte_globals.h" #include "orte/util/proc_info.h" @@ -72,7 +71,7 @@ int orte_rmaps_base_get_target_nodes(opal_list_t *allocated_nodes, orte_std_cntr /** check that anything is here */ if (0 == opal_list_get_size(allocated_nodes)) { - opal_show_help("help-orte-rmaps-base.txt", + orte_show_help("help-orte-rmaps-base.txt", "orte-rmaps-base:no-available-resources", true); return ORTE_ERR_SILENT; @@ -90,7 +89,7 @@ int orte_rmaps_base_get_target_nodes(opal_list_t *allocated_nodes, orte_std_cntr } /** check that anything is here */ if (0 == opal_list_get_size(allocated_nodes)) { - opal_show_help("help-orte-rmaps-base.txt", + orte_show_help("help-orte-rmaps-base.txt", "orte-rmaps-base:no-available-resources", true); return ORTE_ERR_SILENT; @@ -110,7 +109,7 @@ int orte_rmaps_base_get_target_nodes(opal_list_t *allocated_nodes, orte_std_cntr } /** check that anything is here */ if (0 == opal_list_get_size(allocated_nodes)) { - opal_show_help("help-orte-rmaps-base.txt", "orte-rmaps-base:no-mapped-node", + orte_show_help("help-orte-rmaps-base.txt", "orte-rmaps-base:no-mapped-node", true, app->app, app->hostfile); return ORTE_ERR_SILENT; } @@ -126,7 +125,7 @@ int orte_rmaps_base_get_target_nodes(opal_list_t *allocated_nodes, orte_std_cntr } /** check that anything is left! */ if (0 == opal_list_get_size(allocated_nodes)) { - opal_show_help("help-orte-rmaps-base.txt", "orte-rmaps-base:no-mapped-node", + orte_show_help("help-orte-rmaps-base.txt", "orte-rmaps-base:no-mapped-node", true, app->app, ""); return ORTE_ERR_SILENT; } @@ -152,7 +151,7 @@ int orte_rmaps_base_get_target_nodes(opal_list_t *allocated_nodes, orte_std_cntr } /** check that anything is left! */ if (0 == opal_list_get_size(allocated_nodes)) { - opal_show_help("help-orte-rmaps-base.txt", + orte_show_help("help-orte-rmaps-base.txt", "orte-rmaps-base:nolocal-no-available-resources", true); return ORTE_ERR_SILENT; } @@ -185,7 +184,7 @@ int orte_rmaps_base_get_target_nodes(opal_list_t *allocated_nodes, orte_std_cntr /* Sanity check to make sure we have resources available */ if (0 == num_slots) { - opal_show_help("help-orte-rmaps-base.txt", + orte_show_help("help-orte-rmaps-base.txt", "orte-rmaps-base:all-available-resources-used", true); return ORTE_ERR_SILENT; } @@ -214,7 +213,7 @@ int orte_rmaps_base_add_proc_to_map(orte_job_map_t *map, orte_node_t *node, } } /* if we get here, then this node isn't already in the map - add it */ - OPAL_OUTPUT_VERBOSE((5, orte_rmaps_base.rmaps_output, + ORTE_OUTPUT_VERBOSE((5, orte_rmaps_base.rmaps_output, "%s rmaps:base: adding node %s to map", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), (NULL == node->name) ? "NULL" : node->name)); @@ -231,7 +230,7 @@ PROCESS: * that the proc isn't already there as this would be an error * in the mapper */ - OPAL_OUTPUT_VERBOSE((5, orte_rmaps_base.rmaps_output, + ORTE_OUTPUT_VERBOSE((5, orte_rmaps_base.rmaps_output, "%s rmaps:base: mapping proc %s to node %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(&proc->name), @@ -288,7 +287,7 @@ int orte_rmaps_base_claim_slot(orte_job_t *jdata, * about keeping the array left-justified as all vpids * from 0 to num_procs will be filled */ - OPAL_OUTPUT_VERBOSE((5, orte_rmaps_base.rmaps_output, + ORTE_OUTPUT_VERBOSE((5, orte_rmaps_base.rmaps_output, "%s rmaps:base:claim_slot mapping rank %d to job %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), vpid, ORTE_JOBID_PRINT(jdata->jobid))); @@ -349,7 +348,7 @@ int orte_rmaps_base_compute_usage(orte_job_t *jdata) uint8_t local_rank; orte_job_map_t *map; - OPAL_OUTPUT_VERBOSE((5, orte_rmaps_base.rmaps_output, + ORTE_OUTPUT_VERBOSE((5, orte_rmaps_base.rmaps_output, "%s rmaps:base:compute_usage", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME))); @@ -416,7 +415,7 @@ int orte_rmaps_base_define_daemons(orte_job_map_t *map) orte_vpid_t numdaemons; int rc; - OPAL_OUTPUT_VERBOSE((5, orte_rmaps_base.rmaps_output, + ORTE_OUTPUT_VERBOSE((5, orte_rmaps_base.rmaps_output, "%s rmaps:base:define_daemons", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME))); @@ -445,14 +444,14 @@ int orte_rmaps_base_define_daemons(orte_job_map_t *map) proc->name.jobid = ORTE_PROC_MY_NAME->jobid; if (ORTE_VPID_MAX-1 <= daemons->num_procs) { /* no more daemons available */ - opal_show_help("help-orte-rmaps-base.txt", "out-of-vpids", true); + orte_show_help("help-orte-rmaps-base.txt", "out-of-vpids", true); OBJ_RELEASE(proc); return ORTE_ERR_OUT_OF_RESOURCE; } proc->name.vpid = daemons->num_procs; /* take the next available vpid */ proc->node = node; proc->nodename = node->name; - OPAL_OUTPUT_VERBOSE((5, orte_rmaps_base.rmaps_output, + ORTE_OUTPUT_VERBOSE((5, orte_rmaps_base.rmaps_output, "%s rmaps:base:define_daemons add new daemon %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(&proc->name))); @@ -476,7 +475,7 @@ int orte_rmaps_base_define_daemons(orte_job_map_t *map) } else { /* this daemon was previously defined - flag it */ node->daemon_launched = true; - OPAL_OUTPUT_VERBOSE((5, orte_rmaps_base.rmaps_output, + ORTE_OUTPUT_VERBOSE((5, orte_rmaps_base.rmaps_output, "%s rmaps:base:define_daemons existing daemon %s already launched", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(&node->daemon->name))); diff --git a/orte/mca/rmaps/rank_file/rmaps_rank_file.c b/orte/mca/rmaps/rank_file/rmaps_rank_file.c index eee7ebdb05..4c1c2efafc 100644 --- a/orte/mca/rmaps/rank_file/rmaps_rank_file.c +++ b/orte/mca/rmaps/rank_file/rmaps_rank_file.c @@ -33,14 +33,12 @@ #endif /* HAVE_STRING_H */ #include "opal/mca/base/mca_base_param.h" -#include "opal/util/output.h" #include "opal/util/trace.h" -#include "opal/util/show_help.h" #include "opal/util/argv.h" #include "opal/util/if.h" #include "orte/mca/errmgr/errmgr.h" - +#include "orte/util/output.h" #include "orte/mca/rmaps/base/rmaps_private.h" #include "orte/mca/rmaps/base/base.h" #include "orte/mca/rmaps/rank_file/rmaps_rank_file.h" @@ -86,7 +84,7 @@ static int map_app_by_user_map( * used) as we cycle through the loop */ if(0 >= opal_list_get_size(nodes) ) { /* No more nodes to allocate :( */ - opal_show_help("help-rmaps_rank_file.txt", "orte-rmaps-rf:alloc-error", + orte_show_help("help-rmaps_rank_file.txt", "orte-rmaps-rf:alloc-error", true, app->num_procs, app->app); return ORTE_ERR_SILENT; } @@ -107,14 +105,14 @@ static int map_app_by_user_map( node = (orte_node_t*) cur_node_item; cur_node_item = next; if ( round_cnt == 2 ) { - opal_show_help("help-rmaps_rank_file.txt","bad-host", true,rankmap[orte_rmaps_rank_file_num_alloc+vpid_start].node_name); + orte_show_help("help-rmaps_rank_file.txt","bad-host", true,rankmap[orte_rmaps_rank_file_num_alloc+vpid_start].node_name); ORTE_ERROR_LOG(ORTE_ERR_BAD_PARAM); return ORTE_ERR_BAD_PARAM; } } while ( strcmp(node->name, rankmap[orte_rmaps_rank_file_num_alloc + vpid_start].node_name)); node->slot_list = strdup(rankmap[orte_rmaps_rank_file_num_alloc+vpid_start].slot_list); if (mca_rmaps_rank_file_component.debug) { - opal_output(0, "rank_file RMAPS component: [%s:%d]->slot_list=%s\n", + orte_output(0, "rank_file RMAPS component: [%s:%d]->slot_list=%s\n", rankmap[orte_rmaps_rank_file_num_alloc + vpid_start].node_name,rankmap[orte_rmaps_rank_file_num_alloc+vpid_start].rank, node->slot_list); } if (ORTE_SUCCESS != (rc = orte_rmaps_base_claim_slot(jdata, node, rankmap[orte_rmaps_rank_file_num_alloc+vpid_start].rank, app->idx, @@ -180,7 +178,7 @@ static int map_app_by_node( * used) as we cycle through the loop */ if(0 >= opal_list_get_size(nodes) ) { /* No more nodes to allocate :( */ - opal_show_help("help-rmaps_rank_file.txt", "orte-rmaps-rf:alloc-error", + orte_show_help("help-rmaps_rank_file.txt", "orte-rmaps-rf:alloc-error", true, app->num_procs, app->app); return ORTE_ERR_SILENT; } @@ -250,7 +248,7 @@ static int map_app_by_slot( * used) as we cycle through the loop */ if(0 >= opal_list_get_size(nodes) ) { /* Everything is at max usage! :( */ - opal_show_help("help-rmaps_rank_file.txt", "orte-rmaps-rf:alloc-error", + orte_show_help("help-rmaps_rank_file.txt", "orte-rmaps-rf:alloc-error", true, app->num_procs, app->app); return ORTE_ERR_SILENT; } @@ -387,7 +385,7 @@ static int orte_rmaps_rf_map(orte_job_t *jdata) * all available slots. We'll double-check the single app_context rule first */ if (0 == app->num_procs && 1 < jdata->num_apps) { - opal_show_help("help-rmaps_rank_file.txt", "orte-rmaps-rf:multi-apps-and-zero-np", + orte_show_help("help-rmaps_rank_file.txt", "orte-rmaps-rf:multi-apps-and-zero-np", true, jdata->num_apps, NULL); rc = ORTE_ERR_SILENT; goto error; @@ -451,7 +449,7 @@ static int orte_rmaps_rf_map(orte_job_t *jdata) if (0 == app->num_procs) { app->num_procs = num_nodes; } else if (app->num_procs > num_nodes) { - opal_show_help("help-rmaps_rank_file.txt", "orte-rmaps-rf:per-node-and-too-many-procs", + orte_show_help("help-rmaps_rank_file.txt", "orte-rmaps-rf:per-node-and-too-many-procs", true, app->num_procs, num_nodes, NULL); rc = ORTE_ERR_SILENT; goto error; @@ -462,7 +460,7 @@ static int orte_rmaps_rf_map(orte_job_t *jdata) */ slots_per_node = num_slots / num_nodes; if (map->npernode > slots_per_node) { - opal_show_help("help-rmaps_rank_file.txt", "orte-rmaps-rf:n-per-node-and-not-enough-slots", + orte_show_help("help-rmaps_rank_file.txt", "orte-rmaps-rf:n-per-node-and-not-enough-slots", true, map->npernode, slots_per_node, NULL); rc = ORTE_ERR_SILENT; goto error; @@ -478,7 +476,7 @@ static int orte_rmaps_rf_map(orte_job_t *jdata) /* set the num_procs to equal the specified num/node * the number of nodes */ app->num_procs = map->npernode * num_nodes; } else if (app->num_procs > (map->npernode * num_nodes)) { - opal_show_help("help-rmaps_rank_file.txt", "orte-rmaps-rf:n-per-node-and-too-many-procs", + orte_show_help("help-rmaps_rank_file.txt", "orte-rmaps-rf:n-per-node-and-too-many-procs", true, app->num_procs, map->npernode, num_nodes, num_slots, NULL); rc = ORTE_ERR_SILENT; goto error; @@ -487,7 +485,7 @@ static int orte_rmaps_rf_map(orte_job_t *jdata) /* we can't handle this - it should have been set when we got * the map info. If it wasn't, then we can only error out */ - opal_show_help("help-rmaps_rank_file.txt", "orte-rmaps-rf:no-np-and-user-map", + orte_show_help("help-rmaps_rank_file.txt", "orte-rmaps-rf:no-np-and-user-map", true, app->num_procs, map->npernode, num_nodes, num_slots, NULL); rc = ORTE_ERR_SILENT; goto error; @@ -586,7 +584,7 @@ static int orte_rmaps_rank_file_parse(const char *rankfile, int np) orte_rmaps_rank_file_in = fopen(rankfile, "r"); if (NULL == orte_rmaps_rank_file_in) { - opal_show_help("help-rmaps_rank_file.txt", "no-rankfile", true, rankfile, np); + orte_show_help("help-rmaps_rank_file.txt", "no-rankfile", true, rankfile, np); rc = OPAL_ERR_NOT_FOUND; goto unlock; } @@ -605,7 +603,7 @@ static int orte_rmaps_rank_file_parse(const char *rankfile, int np) case ORTE_RANKFILE_EQUAL: ival = orte_rmaps_rank_file_value.ival; if ( ival > (np-1) ) { - opal_show_help("help-rmaps_rank_file.txt", "bad-rankfile", true, ival, rankfile); + orte_show_help("help-rmaps_rank_file.txt", "bad-rankfile", true, ival, rankfile); rc = ORTE_ERR_BAD_PARAM; goto unlock; } @@ -631,7 +629,7 @@ static int orte_rmaps_rank_file_parse(const char *rankfile, int np) node_name = strdup(argv[1]); } else { - opal_show_help("help-rmaps_rank_file.txt", "bad-syntax", true, rankfile); + orte_show_help("help-rmaps_rank_file.txt", "bad-syntax", true, rankfile); rc = ORTE_ERR_BAD_PARAM; goto unlock; } @@ -647,7 +645,7 @@ static int orte_rmaps_rank_file_parse(const char *rankfile, int np) break; case ORTE_RANKFILE_SLOT: if ( NULL == (value = orte_rmaps_rank_file_parse_string_or_int())) { - opal_show_help("help-rmaps_rank_file.txt", "bad-syntax", true, rankfile); + orte_show_help("help-rmaps_rank_file.txt", "bad-syntax", true, rankfile); rc = ORTE_ERR_BAD_PARAM; goto unlock; } diff --git a/orte/mca/rmaps/rank_file/rmaps_rank_file_component.c b/orte/mca/rmaps/rank_file/rmaps_rank_file_component.c index df32c2f7d8..7893b50411 100644 --- a/orte/mca/rmaps/rank_file/rmaps_rank_file_component.c +++ b/orte/mca/rmaps/rank_file/rmaps_rank_file_component.c @@ -26,7 +26,7 @@ #include "opal/mca/base/base.h" #include "opal/mca/base/mca_base_param.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "orte/mca/rmaps/base/rmaps_private.h" #include "orte/mca/rmaps/rank_file/rmaps_rank_file.h" @@ -98,7 +98,7 @@ static int orte_rmaps_rank_file_open(void) if (index >= 0) { if (OPAL_SUCCESS == mca_base_param_lookup_int(index, &paffinity_alone)) { if ( 1000000 == mca_rmaps_rank_file_component.priority && paffinity_alone ){ - opal_output(0, "WARNING: paffinity_alone cannot be set with paffinity_slot_list or rank_file\nTherefore mca_rmaps_rank_file_component.priority set to 0\n"); + orte_output(0, "WARNING: paffinity_alone cannot be set with paffinity_slot_list or rank_file\nTherefore mca_rmaps_rank_file_component.priority set to 0\n"); mca_rmaps_rank_file_component.priority = 0; } } diff --git a/orte/mca/rmaps/round_robin/rmaps_rr.c b/orte/mca/rmaps/round_robin/rmaps_rr.c index 26e1dc9ff5..4e004db73c 100644 --- a/orte/mca/rmaps/round_robin/rmaps_rr.c +++ b/orte/mca/rmaps/round_robin/rmaps_rr.c @@ -30,11 +30,10 @@ #endif /* HAVE_STRING_H */ #include "opal/mca/base/mca_base_param.h" -#include "opal/util/output.h" #include "opal/util/trace.h" -#include "opal/util/show_help.h" #include "opal/util/argv.h" +#include "orte/util/output.h" #include "orte/mca/errmgr/errmgr.h" #include "orte/mca/rmaps/base/rmaps_private.h" @@ -89,7 +88,7 @@ static int map_app_by_node( * used) as we cycle through the loop */ if(0 >= opal_list_get_size(nodes) ) { /* No more nodes to allocate :( */ - opal_show_help("help-orte-rmaps-rr.txt", "orte-rmaps-rr:alloc-error", + orte_show_help("help-orte-rmaps-rr.txt", "orte-rmaps-rr:alloc-error", true, app->num_procs, app->app); return ORTE_ERR_SILENT; } @@ -161,7 +160,7 @@ static int map_app_by_slot( * used) as we cycle through the loop */ if(0 >= opal_list_get_size(nodes) ) { /* Everything is at max usage! :( */ - opal_show_help("help-orte-rmaps-rr.txt", "orte-rmaps-rr:alloc-error", + orte_show_help("help-orte-rmaps-rr.txt", "orte-rmaps-rr:alloc-error", true, app->num_procs, app->app); return ORTE_ERR_SILENT; } @@ -296,7 +295,7 @@ static int orte_rmaps_rr_map(orte_job_t *jdata) app = apps[i]; if (0 == app->num_procs) { /* can't do it - tell user and quit */ - opal_show_help("help-orte-rmaps-rr.txt", + orte_show_help("help-orte-rmaps-rr.txt", "orte-rmaps-rr:loadbalance-and-zero-np", true); rc = ORTE_ERR_SILENT; @@ -334,7 +333,7 @@ static int orte_rmaps_rr_map(orte_job_t *jdata) * all available slots. We'll double-check the single app_context rule first */ if (0 == app->num_procs && 1 < jdata->num_apps) { - opal_show_help("help-orte-rmaps-rr.txt", "orte-rmaps-rr:multi-apps-and-zero-np", + orte_show_help("help-orte-rmaps-rr.txt", "orte-rmaps-rr:multi-apps-and-zero-np", true, jdata->num_apps, NULL); rc = ORTE_ERR_SILENT; goto error; @@ -417,7 +416,7 @@ static int orte_rmaps_rr_map(orte_job_t *jdata) if (0 == app->num_procs) { app->num_procs = num_nodes; } else if (app->num_procs > num_nodes) { - opal_show_help("help-orte-rmaps-rr.txt", "orte-rmaps-rr:per-node-and-too-many-procs", + orte_show_help("help-orte-rmaps-rr.txt", "orte-rmaps-rr:per-node-and-too-many-procs", true, app->num_procs, num_nodes, NULL); rc = ORTE_ERR_SILENT; goto error; @@ -428,7 +427,7 @@ static int orte_rmaps_rr_map(orte_job_t *jdata) */ slots_per_node = num_slots / num_nodes; if (map->npernode > slots_per_node) { - opal_show_help("help-orte-rmaps-rr.txt", "orte-rmaps-rr:n-per-node-and-not-enough-slots", + orte_show_help("help-orte-rmaps-rr.txt", "orte-rmaps-rr:n-per-node-and-not-enough-slots", true, map->npernode, slots_per_node, NULL); rc = ORTE_ERR_SILENT; goto error; @@ -444,7 +443,7 @@ static int orte_rmaps_rr_map(orte_job_t *jdata) /* set the num_procs to equal the specified num/node * the number of nodes */ app->num_procs = map->npernode * num_nodes; } else if (app->num_procs > (map->npernode * num_nodes)) { - opal_show_help("help-orte-rmaps-rr.txt", "orte-rmaps-rr:n-per-node-and-too-many-procs", + orte_show_help("help-orte-rmaps-rr.txt", "orte-rmaps-rr:n-per-node-and-too-many-procs", true, app->num_procs, map->npernode, num_nodes, num_slots, NULL); rc = ORTE_ERR_SILENT; goto error; @@ -461,7 +460,7 @@ static int orte_rmaps_rr_map(orte_job_t *jdata) /* we can't handle this - it should have been set when we got * the map info. If it wasn't, then we can only error out */ - opal_show_help("help-orte-rmaps-rr.txt", "orte-rmaps-rr:no-np-and-user-map", + orte_show_help("help-orte-rmaps-rr.txt", "orte-rmaps-rr:no-np-and-user-map", true, app->num_procs, map->npernode, num_nodes, num_slots, NULL); rc = ORTE_ERR_SILENT; goto error; diff --git a/orte/mca/rmaps/round_robin/rmaps_rr_component.c b/orte/mca/rmaps/round_robin/rmaps_rr_component.c index fda4b80d30..37b35631ed 100644 --- a/orte/mca/rmaps/round_robin/rmaps_rr_component.c +++ b/orte/mca/rmaps/round_robin/rmaps_rr_component.c @@ -21,7 +21,7 @@ #include "opal/mca/base/base.h" #include "opal/mca/base/mca_base_param.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "orte/mca/rmaps/base/rmaps_private.h" #include "rmaps_rr.h" diff --git a/orte/mca/rmaps/seq/rmaps_seq.c b/orte/mca/rmaps/seq/rmaps_seq.c index 0c144bb585..5f680a57ae 100644 --- a/orte/mca/rmaps/seq/rmaps_seq.c +++ b/orte/mca/rmaps/seq/rmaps_seq.c @@ -30,11 +30,10 @@ #endif /* HAVE_STRING_H */ #include "opal/mca/base/mca_base_param.h" -#include "opal/util/output.h" #include "opal/util/trace.h" -#include "opal/util/show_help.h" #include "opal/util/argv.h" +#include "orte/util/output.h" #include "orte/mca/errmgr/errmgr.h" #include "orte/util/hostfile/hostfile.h" #include "orte/util/name_fns.h" @@ -69,7 +68,7 @@ static int orte_rmaps_seq_map(orte_job_t *jdata) opal_list_t *default_node_list=NULL; opal_list_t *node_list=NULL; - OPAL_OUTPUT_VERBOSE((1, orte_rmaps_base.rmaps_output, + ORTE_OUTPUT_VERBOSE((1, orte_rmaps_base.rmaps_output, "%s rmaps:seq mapping job %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_JOBID_PRINT(jdata->jobid))); @@ -108,7 +107,7 @@ static int orte_rmaps_seq_map(orte_job_t *jdata) node_list = default_node_list; } if (NULL == node_list || 0 == (num_nodes = (orte_std_cntr_t)opal_list_get_size(node_list))) { - opal_show_help("help-orte-rmaps-base.txt", + orte_show_help("help-orte-rmaps-base.txt", "orte-rmaps-base:no-available-resources", true); return ORTE_ERR_SILENT; @@ -149,7 +148,7 @@ static int orte_rmaps_seq_map(orte_job_t *jdata) */ if(0 >= opal_list_get_size(node_list) ) { /* Everything is at max usage! :( */ - opal_show_help("help-orte-rmaps-seq.txt", "orte-rmaps-seq:alloc-error", + orte_show_help("help-orte-rmaps-seq.txt", "orte-rmaps-seq:alloc-error", true, app->num_procs, app->app); return ORTE_ERR_SILENT; } @@ -182,7 +181,7 @@ static int orte_rmaps_seq_map(orte_job_t *jdata) } if (NULL == node) { /* wasn't found - that is an error */ - opal_show_help("help-orte-rmaps-seq.txt", + orte_show_help("help-orte-rmaps-seq.txt", "orte-rmaps-seq:resource-not-found", true, nd->name); rc = ORTE_ERR_SILENT; diff --git a/orte/mca/rmaps/seq/rmaps_seq_component.c b/orte/mca/rmaps/seq/rmaps_seq_component.c index 81c1eba184..6fe321a7b0 100644 --- a/orte/mca/rmaps/seq/rmaps_seq_component.c +++ b/orte/mca/rmaps/seq/rmaps_seq_component.c @@ -21,7 +21,7 @@ #include "opal/mca/base/base.h" #include "opal/mca/base/mca_base_param.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "orte/mca/rmaps/rmaps.h" #include "rmaps_seq.h" diff --git a/orte/mca/rmaps/topo/rmaps_topo.c b/orte/mca/rmaps/topo/rmaps_topo.c index c805248710..75fc431b06 100644 --- a/orte/mca/rmaps/topo/rmaps_topo.c +++ b/orte/mca/rmaps/topo/rmaps_topo.c @@ -30,12 +30,11 @@ #endif /* HAVE_STRING_H */ #include "opal/mca/base/mca_base_param.h" -#include "opal/util/output.h" #include "opal/util/trace.h" -#include "opal/util/show_help.h" #include "opal/util/argv.h" #include "opal/mca/carto/base/base.h" +#include "orte/util/output.h" #include "orte/mca/errmgr/errmgr.h" #include "orte/mca/rmaps/base/rmaps_private.h" @@ -95,7 +94,7 @@ static int map_app_by_node( * used) as we cycle through the loop */ if(0 >= opal_list_get_size(nodes) ) { /* No more nodes to allocate :( */ - opal_show_help("help-orte-rmaps-topo.txt", "orte-rmaps-topo:alloc-error", + orte_show_help("help-orte-rmaps-topo.txt", "orte-rmaps-topo:alloc-error", true, app->num_procs, app->app); return ORTE_ERR_SILENT; } @@ -167,7 +166,7 @@ static int map_app_by_slot( * used) as we cycle through the loop */ if(0 >= opal_list_get_size(nodes) ) { /* Everything is at max usage! :( */ - opal_show_help("help-orte-rmaps-topo.txt", "orte-rmaps-topo:alloc-error", + orte_show_help("help-orte-rmaps-topo.txt", "orte-rmaps-topo:alloc-error", true, app->num_procs, app->app); return ORTE_ERR_SILENT; } @@ -309,7 +308,7 @@ static int topo_map(orte_job_t *jdata) * all available slots. We'll double-check the single app_context rule first */ if (0 == app->num_procs && 1 < jdata->num_apps) { - opal_show_help("help-orte-rmaps-rr.txt", "orte-rmaps-rr:multi-apps-and-zero-np", + orte_show_help("help-orte-rmaps-rr.txt", "orte-rmaps-rr:multi-apps-and-zero-np", true, jdata->num_apps, NULL); rc = ORTE_ERR_SILENT; goto error; @@ -438,7 +437,7 @@ static int topo_map(orte_job_t *jdata) if (0 == app->num_procs) { app->num_procs = num_nodes; } else if (app->num_procs > num_nodes) { - opal_show_help("help-orte-rmaps-rr.txt", "orte-rmaps-rr:per-node-and-too-many-procs", + orte_show_help("help-orte-rmaps-rr.txt", "orte-rmaps-rr:per-node-and-too-many-procs", true, app->num_procs, num_nodes, NULL); rc = ORTE_ERR_SILENT; goto error; @@ -449,7 +448,7 @@ static int topo_map(orte_job_t *jdata) */ slots_per_node = num_slots / num_nodes; if (map->npernode > slots_per_node) { - opal_show_help("help-orte-rmaps-rr.txt", "orte-rmaps-rr:n-per-node-and-not-enough-slots", + orte_show_help("help-orte-rmaps-rr.txt", "orte-rmaps-rr:n-per-node-and-not-enough-slots", true, map->npernode, slots_per_node, NULL); rc = ORTE_ERR_SILENT; goto error; @@ -465,7 +464,7 @@ static int topo_map(orte_job_t *jdata) /* set the num_procs to equal the specified num/node * the number of nodes */ app->num_procs = map->npernode * num_nodes; } else if (app->num_procs > (map->npernode * num_nodes)) { - opal_show_help("help-orte-rmaps-rr.txt", "orte-rmaps-rr:n-per-node-and-too-many-procs", + orte_show_help("help-orte-rmaps-rr.txt", "orte-rmaps-rr:n-per-node-and-too-many-procs", true, app->num_procs, map->npernode, num_nodes, num_slots, NULL); rc = ORTE_ERR_SILENT; goto error; @@ -482,7 +481,7 @@ static int topo_map(orte_job_t *jdata) /* we can't handle this - it should have been set when we got * the map info. If it wasn't, then we can only error out */ - opal_show_help("help-orte-rmaps-rr.txt", "orte-rmaps-rr:no-np-and-user-map", + orte_show_help("help-orte-rmaps-rr.txt", "orte-rmaps-rr:no-np-and-user-map", true, app->num_procs, map->npernode, num_nodes, num_slots, NULL); rc = ORTE_ERR_SILENT; goto error; diff --git a/orte/mca/rmaps/topo/rmaps_topo_component.c b/orte/mca/rmaps/topo/rmaps_topo_component.c index 256802ddc1..3421ba0c63 100644 --- a/orte/mca/rmaps/topo/rmaps_topo_component.c +++ b/orte/mca/rmaps/topo/rmaps_topo_component.c @@ -21,7 +21,7 @@ #include "opal/mca/base/base.h" #include "opal/mca/base/mca_base_param.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "orte/mca/rmaps/base/rmaps_private.h" #include "rmaps_topo.h" diff --git a/orte/mca/rml/base/base.h b/orte/mca/rml/base/base.h index 8d661b2469..3de4fe13fa 100644 --- a/orte/mca/rml/base/base.h +++ b/orte/mca/rml/base/base.h @@ -119,7 +119,7 @@ ORTE_DECLSPEC int orte_rml_base_comm_stop(void); /** * Output stream for RML debugging * - * Output stream for the opal_output() code intended for RML output. + * Output stream for the orte_output() code intended for RML output. * It will be have its verbosity set according to the MCA parameter * rml_base_verbose. Useable between call to orte_rml_base_open() and * orte_rml_base_close(). diff --git a/orte/mca/rml/base/rml_base_components.c b/orte/mca/rml/base/rml_base_components.c index d087fd6cdf..999c68ac13 100644 --- a/orte/mca/rml/base/rml_base_components.c +++ b/orte/mca/rml/base/rml_base_components.c @@ -9,8 +9,11 @@ #include "orte_config.h" #include "opal/mca/mca.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "opal/mca/base/mca_base_component_repository.h" + +#include "orte/util/output.h" + #include "orte/mca/rml/rml.h" #include "orte/mca/rml/base/base.h" #include "orte/mca/errmgr/errmgr.h" @@ -24,7 +27,9 @@ int orte_rml_base_output = -1; opal_list_t orte_rml_base_subscriptions; -orte_rml_module_t orte_rml; +orte_rml_module_t orte_rml = { + NULL, +}; opal_list_t orte_rml_base_components; orte_rml_component_t *orte_rml_component = NULL; @@ -51,7 +56,7 @@ orte_rml_base_open(void) NULL, NULL); /* register parameters */ - orte_rml_base_output = opal_output_open(NULL); + orte_rml_base_output = orte_output_open(NULL, "RML", "DEBUG", NULL); /* Open up all available components */ ret = mca_base_components_open("rml", @@ -93,20 +98,20 @@ orte_rml_base_select(void) cli = (mca_base_component_list_item_t *) item; component = (orte_rml_component_t *) cli->cli_component; - opal_output_verbose(10, orte_rml_base_output, + orte_output_verbose(10, orte_rml_base_output, "orte_rml_base_select: initializing %s component %s", component->rml_version.mca_type_name, component->rml_version.mca_component_name); if (NULL == component->rml_init) { - opal_output_verbose(10, orte_rml_base_output, + orte_output_verbose(10, orte_rml_base_output, "orte_rml_base_select: no init function; ignoring component"); } else { int priority = 0; orte_rml_module_t* module = component->rml_init(&priority); if (NULL == module) { - opal_output_verbose(10, orte_rml_base_output, + orte_output_verbose(10, orte_rml_base_output, "orte_rml_base_select: init returned failure"); continue; } @@ -154,7 +159,7 @@ orte_rml_base_select(void) } /* Not the selected component */ if (component != selected_component) { - opal_output_verbose(10, orte_rml_base_output, + orte_output_verbose(10, orte_rml_base_output, "orte_rml_base_select: module %s unloaded", component->rml_version.mca_component_name); diff --git a/orte/mca/rml/base/rml_base_contact.c b/orte/mca/rml/base/rml_base_contact.c index d2923b1903..74c94ed3e7 100644 --- a/orte/mca/rml/base/rml_base_contact.c +++ b/orte/mca/rml/base/rml_base_contact.c @@ -22,7 +22,7 @@ #include "orte/types.h" #include "opal/util/argv.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "opal/dss/dss.h" #include "orte/mca/errmgr/errmgr.h" @@ -80,7 +80,7 @@ int orte_rml_base_update_contact_info(opal_buffer_t* data) cnt = 1; while (ORTE_SUCCESS == (rc = opal_dss.unpack(data, &rml_uri, &cnt, OPAL_STRING))) { - OPAL_OUTPUT_VERBOSE((5, orte_rml_base_output, + ORTE_OUTPUT_VERBOSE((5, orte_rml_base_output, "%s rml:base:update:contact:info got uri %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), NULL == rml_uri ? "NULL" : rml_uri)); diff --git a/orte/mca/rml/base/rml_base_receive.c b/orte/mca/rml/base/rml_base_receive.c index aa0b397703..dad0c87f3d 100644 --- a/orte/mca/rml/base/rml_base_receive.c +++ b/orte/mca/rml/base/rml_base_receive.c @@ -88,7 +88,7 @@ static void process_message(int fd, short event, void *data) orte_std_cntr_t count; int rc; - OPAL_OUTPUT_VERBOSE((5, orte_rml_base_output, + ORTE_OUTPUT_VERBOSE((5, orte_rml_base_output, "%s rml:base:recv: processing message from %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(&mev->sender))); diff --git a/orte/mca/rml/ftrm/rml_ftrm_component.c b/orte/mca/rml/ftrm/rml_ftrm_component.c index 786cfb0133..87131a261f 100644 --- a/orte/mca/rml/ftrm/rml_ftrm_component.c +++ b/orte/mca/rml/ftrm/rml_ftrm_component.c @@ -20,9 +20,12 @@ #include "orte/util/name_fns.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "opal/mca/base/base.h" #include "opal/mca/base/mca_base_param.h" + +#include "orte/util/output.h" + #include "orte/mca/rml/base/base.h" #include "rml_ftrm.h" @@ -114,7 +117,7 @@ orte_rml_module_t* orte_rml_ftrm_component_init(int* priority) orte_rml = orte_rml_ftrm_module; orte_rml_component = &mca_rml_ftrm_component; - opal_output_verbose(20, rml_ftrm_output_handle, + orte_output_verbose(20, rml_ftrm_output_handle, "orte_rml_ftrm: component_init(): Wrapped Component (%s)", mca_rml_ftrm_wrapped_component.rml_version.mca_component_name); @@ -154,15 +157,15 @@ static int orte_rml_ftrm_open(void) * otherwise take our parents level and output channel */ if ( 0 != value) { - rml_ftrm_output_handle = opal_output_open(NULL); - opal_output_set_verbosity(rml_ftrm_output_handle, value); + rml_ftrm_output_handle = orte_output_open(NULL, "RML", "FTRM", "DEBUG", NULL); + orte_output_set_verbosity(rml_ftrm_output_handle, value); } else { rml_ftrm_output_handle = -1; } - opal_output_verbose(10, rml_ftrm_output_handle, + orte_output_verbose(10, rml_ftrm_output_handle, "orte_rml_ftrm: open(): Priority = %d", ftrm_priority); - opal_output_verbose(10, rml_ftrm_output_handle, + orte_output_verbose(10, rml_ftrm_output_handle, "orte_rml_ftrm: open(): Verbosity = %d", value); return ORTE_SUCCESS; diff --git a/orte/mca/rml/ftrm/rml_ftrm_module.c b/orte/mca/rml/ftrm/rml_ftrm_module.c index 141ce99fa6..0f570f27b6 100644 --- a/orte/mca/rml/ftrm/rml_ftrm_module.c +++ b/orte/mca/rml/ftrm/rml_ftrm_module.c @@ -20,7 +20,7 @@ #include "orte/util/name_fns.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "opal/mca/base/base.h" #include "opal/mca/base/mca_base_param.h" @@ -40,7 +40,7 @@ int orte_rml_ftrm_module_enable_comm(void) { int ret; - opal_output_verbose(20, rml_ftrm_output_handle, + orte_output_verbose(20, rml_ftrm_output_handle, "orte_rml_ftrm: module_init(): Normal..."); if( NULL != orte_rml_ftrm_wrapped_module.enable_comm ) { @@ -59,7 +59,7 @@ int orte_rml_ftrm_module_finalize(void) { int ret; - opal_output_verbose(20, rml_ftrm_output_handle, + orte_output_verbose(20, rml_ftrm_output_handle, "orte_rml_ftrm: module_finalize()"); @@ -77,7 +77,7 @@ int orte_rml_ftrm_get_new_name(orte_process_name_t *name) { int ret; - opal_output_verbose(20, rml_ftrm_output_handle, + orte_output_verbose(20, rml_ftrm_output_handle, "orte_rml_ftrm: get_new_name()"); if( NULL != orte_rml_ftrm_wrapped_module.get_new_name ) { @@ -97,7 +97,7 @@ char * orte_rml_ftrm_get_contact_info(void) { char * rtn_val = NULL; - opal_output_verbose(20, rml_ftrm_output_handle, + orte_output_verbose(20, rml_ftrm_output_handle, "orte_rml_ftrm: get_uri()"); @@ -115,7 +115,7 @@ int orte_rml_ftrm_set_contact_info(const char* contact_info) { int ret; - opal_output_verbose(20, rml_ftrm_output_handle, + orte_output_verbose(20, rml_ftrm_output_handle, "orte_rml_ftrm: set_contact_info()"); if( NULL != orte_rml_ftrm_wrapped_module.set_contact_info ) { @@ -135,7 +135,7 @@ int orte_rml_ftrm_ping(const char* uri, const struct timeval* tv) { int ret; - opal_output_verbose(20, rml_ftrm_output_handle, + orte_output_verbose(20, rml_ftrm_output_handle, "orte_rml_ftrm: ping()"); if( NULL != orte_rml_ftrm_wrapped_module.ping ) { @@ -159,7 +159,7 @@ int orte_rml_ftrm_send(orte_process_name_t* peer, { int ret; - opal_output_verbose(20, rml_ftrm_output_handle, + orte_output_verbose(20, rml_ftrm_output_handle, "orte_rml_ftrm: send(%s, %d, %d, %d )", ORTE_NAME_PRINT(peer), count, tag, flags); @@ -185,7 +185,7 @@ int orte_rml_ftrm_send_nb(orte_process_name_t* peer, { int ret; - opal_output_verbose(20, rml_ftrm_output_handle, + orte_output_verbose(20, rml_ftrm_output_handle, "orte_rml_ftrm: send_nb(%s, %d, %d, %d )", ORTE_NAME_PRINT(peer), count, tag, flags); @@ -208,7 +208,7 @@ int orte_rml_ftrm_send_buffer(orte_process_name_t* peer, { int ret; - opal_output_verbose(20, rml_ftrm_output_handle, + orte_output_verbose(20, rml_ftrm_output_handle, "orte_rml_ftrm: send_buffer(%s, %d, %d )", ORTE_NAME_PRINT(peer), tag, flags); @@ -233,7 +233,7 @@ int orte_rml_ftrm_send_buffer_nb(orte_process_name_t* peer, { int ret; - opal_output_verbose(20, rml_ftrm_output_handle, + orte_output_verbose(20, rml_ftrm_output_handle, "orte_rml_ftrm: send_buffer_nb(%s, %d, %d )", ORTE_NAME_PRINT(peer), tag, flags); @@ -258,7 +258,7 @@ int orte_rml_ftrm_recv(orte_process_name_t* peer, { int ret; - opal_output_verbose(20, rml_ftrm_output_handle, + orte_output_verbose(20, rml_ftrm_output_handle, "orte_rml_ftrm: recv(%s, %d, %d, %d )", ORTE_NAME_PRINT(peer), count, tag, flags); @@ -284,7 +284,7 @@ int orte_rml_ftrm_recv_nb(orte_process_name_t* peer, { int ret; - opal_output_verbose(20, rml_ftrm_output_handle, + orte_output_verbose(20, rml_ftrm_output_handle, "orte_rml_ftrm: recv_nb(%s, %d, %d, %d )", ORTE_NAME_PRINT(peer), count, tag, flags); @@ -307,7 +307,7 @@ int orte_rml_ftrm_recv_buffer(orte_process_name_t* peer, { int ret; - opal_output_verbose(20, rml_ftrm_output_handle, + orte_output_verbose(20, rml_ftrm_output_handle, "orte_rml_ftrm: recv_buffer(%s, %d )", ORTE_NAME_PRINT(peer), tag); @@ -331,7 +331,7 @@ int orte_rml_ftrm_recv_buffer_nb(orte_process_name_t* peer, { int ret; - opal_output_verbose(20, rml_ftrm_output_handle, + orte_output_verbose(20, rml_ftrm_output_handle, "orte_rml_ftrm: recv_buffer_nb(%s, %d, %d)", ORTE_NAME_PRINT(peer), tag, flags); @@ -351,7 +351,7 @@ int orte_rml_ftrm_recv_cancel(orte_process_name_t* peer, orte_rml_tag_t tag) { int ret; - opal_output_verbose(20, rml_ftrm_output_handle, + orte_output_verbose(20, rml_ftrm_output_handle, "orte_rml_ftrm: recv_cancel()"); if( NULL != orte_rml_ftrm_wrapped_module.recv_cancel ) { @@ -371,7 +371,7 @@ int orte_rml_ftrm_add_exception_handler(orte_rml_exception_callback_t cbfunc) { int ret; - opal_output_verbose(20, rml_ftrm_output_handle, + orte_output_verbose(20, rml_ftrm_output_handle, "orte_rml_ftrm: add_exception_handler()"); if( NULL != orte_rml_ftrm_wrapped_module.add_exception_handler ) { @@ -387,7 +387,7 @@ int orte_rml_ftrm_del_exception_handler(orte_rml_exception_callback_t cbfunc) { int ret; - opal_output_verbose(20, rml_ftrm_output_handle, + orte_output_verbose(20, rml_ftrm_output_handle, "orte_rml_ftrm: del_exception_handler()"); if( NULL != orte_rml_ftrm_wrapped_module.del_exception_handler ) { @@ -406,7 +406,7 @@ int orte_rml_ftrm_ft_event(int state) { int ret; - opal_output_verbose(20, rml_ftrm_output_handle, + orte_output_verbose(20, rml_ftrm_output_handle, "orte_rml_ftrm: ft_event()"); if(OPAL_CRS_CHECKPOINT == state) { diff --git a/orte/mca/rml/oob/rml_oob_component.c b/orte/mca/rml/oob/rml_oob_component.c index 32c6e4c3b3..5491c8692f 100644 --- a/orte/mca/rml/oob/rml_oob_component.c +++ b/orte/mca/rml/oob/rml_oob_component.c @@ -20,7 +20,7 @@ #include "orte_config.h" #include "orte/constants.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "opal/mca/base/base.h" #include "opal/mca/base/mca_base_param.h" @@ -345,7 +345,7 @@ rml_oob_queued_progress(int fd, short event, void *arg) next = orte_routed.get_route(&hdr->destination); if (next.vpid == ORTE_VPID_INVALID) { - opal_output(0, + orte_output(0, "%s tried routing message to %s, can't find route", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(&hdr->destination)); @@ -353,7 +353,7 @@ rml_oob_queued_progress(int fd, short event, void *arg) } if (OPAL_EQUAL == orte_util_compare_name_fields(ORTE_NS_CMP_ALL, &next, ORTE_PROC_MY_NAME)) { - opal_output(0, "%s trying to get message to %s, routing loop", + orte_output(0, "%s trying to get message to %s, routing loop", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(&hdr->destination)); abort(); @@ -365,7 +365,7 @@ rml_oob_queued_progress(int fd, short event, void *arg) real_tag = ORTE_RML_TAG_RML_ROUTE; } - OPAL_OUTPUT_VERBOSE((1, orte_rml_base_output, + ORTE_OUTPUT_VERBOSE((1, orte_rml_base_output, "%s routing message from %s for %s to %s (tag: %d)", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(&hdr->origin), @@ -396,7 +396,7 @@ rml_oob_queued_progress(int fd, short event, void *arg) } OPAL_THREAD_UNLOCK(&orte_rml_oob_module.queued_lock); } else { - opal_output(0, + orte_output(0, "%s failed to send message to %s: %s (rc = %d)", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(&next), @@ -442,7 +442,7 @@ rml_oob_recv_route_callback(int status, next = orte_routed.get_route(&hdr->destination); if (next.vpid == ORTE_VPID_INVALID) { - opal_output(0, + orte_output(0, "%s tried routing message to %s, can't find route", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(&hdr->destination)); @@ -450,7 +450,7 @@ rml_oob_recv_route_callback(int status, } if (OPAL_EQUAL == orte_util_compare_name_fields(ORTE_NS_CMP_ALL, &next, ORTE_PROC_MY_NAME)) { - opal_output(0, "%s trying to get message to %s, routing loop", + orte_output(0, "%s trying to get message to %s, routing loop", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(&hdr->destination)); abort(); @@ -462,7 +462,7 @@ rml_oob_recv_route_callback(int status, real_tag = ORTE_RML_TAG_RML_ROUTE; } - OPAL_OUTPUT_VERBOSE((1, orte_rml_base_output, + ORTE_OUTPUT_VERBOSE((1, orte_rml_base_output, "%s routing message from %s for %s to %s (tag: %d)", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(&hdr->origin), @@ -485,7 +485,7 @@ rml_oob_recv_route_callback(int status, if (ORTE_ERR_ADDRESSEE_UNKNOWN == ret) { /* no route -- queue and hope we find a route */ orte_rml_oob_queued_msg_t *qmsg = OBJ_NEW(orte_rml_oob_queued_msg_t); - OPAL_OUTPUT_VERBOSE((1, orte_rml_base_output, + ORTE_OUTPUT_VERBOSE((1, orte_rml_base_output, "%s: no OOB information for %s. Queuing for later.", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(&next))); @@ -503,7 +503,7 @@ rml_oob_recv_route_callback(int status, } OPAL_THREAD_UNLOCK(&orte_rml_oob_module.queued_lock); } else { - opal_output(0, + orte_output(0, "%s failed to send message to %s: %s (rc = %d)", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(&next), diff --git a/orte/mca/rml/oob/rml_oob_recv.c b/orte/mca/rml/oob/rml_oob_recv.c index 9739e3bc55..0cc78481e6 100644 --- a/orte/mca/rml/oob/rml_oob_recv.c +++ b/orte/mca/rml/oob/rml_oob_recv.c @@ -8,7 +8,7 @@ #include "orte_config.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "orte/mca/rml/base/base.h" #include "opal/dss/dss.h" @@ -33,7 +33,7 @@ orte_rml_recv_msg_callback(int status, (orte_rml_oob_msg_header_t*) iov[0].iov_base; ORTE_RML_OOB_MSG_HEADER_NTOH(*hdr); - OPAL_OUTPUT_VERBOSE((1, orte_rml_base_output, + ORTE_OUTPUT_VERBOSE((1, orte_rml_base_output, "%s recv from %s for %s (tag %d)", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(&hdr->origin), diff --git a/orte/mca/rml/oob/rml_oob_send.c b/orte/mca/rml/oob/rml_oob_send.c index 3a3407e592..a3f64c45b2 100644 --- a/orte/mca/rml/oob/rml_oob_send.c +++ b/orte/mca/rml/oob/rml_oob_send.c @@ -18,7 +18,7 @@ #include "orte_config.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "orte/mca/routed/routed.h" #include "opal/dss/dss.h" @@ -103,7 +103,7 @@ orte_rml_oob_send(orte_process_name_t* peer, next = orte_routed.get_route(peer); if (next.vpid == ORTE_VPID_INVALID) { ORTE_ERROR_LOG(ORTE_ERR_ADDRESSEE_UNKNOWN); - opal_output(0, "%s could not get route to %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(peer)); + orte_output(0, "%s could not get route to %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(peer)); return ORTE_ERR_ADDRESSEE_UNKNOWN; } msg->msg_data = (struct iovec *) malloc(sizeof(struct iovec) * (count + 1)); @@ -127,7 +127,7 @@ orte_rml_oob_send(orte_process_name_t* peer, real_tag = ORTE_RML_TAG_RML_ROUTE; } - OPAL_OUTPUT_VERBOSE((1, orte_rml_base_output, + ORTE_OUTPUT_VERBOSE((1, orte_rml_base_output, "rml_send %s -> %s (router %s, tag %d, %d)", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(peer), @@ -144,7 +144,7 @@ orte_rml_oob_send(orte_process_name_t* peer, msg); if (ret < 0) { ORTE_ERROR_LOG(ret); - opal_output(0, "%s attempted to send to %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(&next)); + orte_output(0, "%s attempted to send to %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(&next)); goto cleanup; } @@ -191,7 +191,7 @@ orte_rml_oob_send_nb(orte_process_name_t* peer, next = orte_routed.get_route(peer); if (next.vpid == ORTE_VPID_INVALID) { ORTE_ERROR_LOG(ORTE_ERR_ADDRESSEE_UNKNOWN); - opal_output(0, "%s could not get route to %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(peer)); + orte_output(0, "%s could not get route to %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(peer)); return ORTE_ERR_ADDRESSEE_UNKNOWN; } @@ -217,7 +217,7 @@ orte_rml_oob_send_nb(orte_process_name_t* peer, real_tag = ORTE_RML_TAG_RML_ROUTE; } - OPAL_OUTPUT_VERBOSE((1, orte_rml_base_output, + ORTE_OUTPUT_VERBOSE((1, orte_rml_base_output, "rml_send_nb %s -> %s (router %s, tag %d, %d)", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(peer), @@ -233,7 +233,7 @@ orte_rml_oob_send_nb(orte_process_name_t* peer, msg); if (ret < 0) { ORTE_ERROR_LOG(ret); - opal_output(0, "%s attempted to send to %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(&next)); + orte_output(0, "%s attempted to send to %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(&next)); OBJ_RELEASE(msg); } @@ -310,7 +310,7 @@ orte_rml_oob_send_buffer_nb(orte_process_name_t* peer, next = orte_routed.get_route(peer); if (next.vpid == ORTE_VPID_INVALID) { ORTE_ERROR_LOG(ORTE_ERR_ADDRESSEE_UNKNOWN); - opal_output(0, "%s unable to find address for %s", + orte_output(0, "%s unable to find address for %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(peer)); return ORTE_ERR_ADDRESSEE_UNKNOWN; @@ -338,7 +338,7 @@ orte_rml_oob_send_buffer_nb(orte_process_name_t* peer, OBJ_RETAIN(buffer); - OPAL_OUTPUT_VERBOSE((1, orte_rml_base_output, + ORTE_OUTPUT_VERBOSE((1, orte_rml_base_output, "rml_send_buffer_nb %s -> %s (router %s, tag %d, %d)", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(peer), diff --git a/orte/mca/rml/rml_types.h b/orte/mca/rml/rml_types.h index 8579771ccf..76c3a70434 100644 --- a/orte/mca/rml/rml_types.h +++ b/orte/mca/rml/rml_types.h @@ -100,6 +100,9 @@ BEGIN_C_DECLS /* daemon collectives */ #define ORTE_RML_TAG_DAEMON_COLLECTIVE 30 +/* output and show help */ +#define ORTE_RML_TAG_OUTPUT 31 + #define ORTE_RML_TAG_MAX 100 diff --git a/orte/mca/routed/base/routed_base_components.c b/orte/mca/routed/base/routed_base_components.c index 21e14ede25..fd0a3648c5 100644 --- a/orte/mca/routed/base/routed_base_components.c +++ b/orte/mca/routed/base/routed_base_components.c @@ -13,12 +13,15 @@ #include "orte_config.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "opal/mca/mca.h" #include "opal/mca/base/mca_base_component_repository.h" + +#include "orte/util/output.h" +#include "orte/mca/errmgr/errmgr.h" + #include "orte/mca/routed/routed.h" #include "orte/mca/routed/base/base.h" -#include "orte/mca/errmgr/errmgr.h" /* The following file was created by configure. It contains extern @@ -40,7 +43,7 @@ orte_routed_base_open(void) int ret; /* setup the output stream */ - orte_routed_base_output = opal_output_open(NULL); + orte_routed_base_output = orte_output_open(NULL, "ROUTED", "DEBUG", NULL); /* Initialize globals */ OBJ_CONSTRUCT(&orte_routed_base_components, opal_list_t); @@ -81,7 +84,7 @@ orte_routed_base_select(void) active_component = best_component; /* initialize the selected component */ - opal_output_verbose(10, orte_routed_base_output, + orte_output_verbose(10, orte_routed_base_output, "orte_routed_base_select: initializing selected component %s", best_component->base_version.mca_component_name); if (ORTE_SUCCESS != orte_routed.initialize()) { diff --git a/orte/mca/routed/base/routed_base_receive.c b/orte/mca/routed/base/routed_base_receive.c index b0f13434cb..6b3beb3ff7 100644 --- a/orte/mca/routed/base/routed_base_receive.c +++ b/orte/mca/routed/base/routed_base_receive.c @@ -37,7 +37,7 @@ #include #endif -#include "opal/util/output.h" +#include "orte/util/output.h" #include "opal/mca/mca.h" #include "opal/mca/base/mca_base_param.h" @@ -61,7 +61,7 @@ int orte_routed_base_comm_start(void) return ORTE_SUCCESS; } - OPAL_OUTPUT_VERBOSE((5, orte_routed_base_output, + ORTE_OUTPUT_VERBOSE((5, orte_routed_base_output, "%s routed:base: Receive: Start command recv", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME))); @@ -87,7 +87,7 @@ int orte_routed_base_comm_stop(void) return ORTE_SUCCESS; } - OPAL_OUTPUT_VERBOSE((5, orte_routed_base_output, + ORTE_OUTPUT_VERBOSE((5, orte_routed_base_output, "%s routed:base:receive stop comm", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME))); @@ -136,7 +136,7 @@ void orte_routed_base_recv(int status, orte_process_name_t* sender, { int rc; - OPAL_OUTPUT_VERBOSE((5, orte_routed_base_output, + ORTE_OUTPUT_VERBOSE((5, orte_routed_base_output, "%s routed:base:receive got message from %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(sender))); diff --git a/orte/mca/routed/binomial/routed_binomial.c b/orte/mca/routed/binomial/routed_binomial.c index 54b89fe0f6..1e5c24f91f 100644 --- a/orte/mca/routed/binomial/routed_binomial.c +++ b/orte/mca/routed/binomial/routed_binomial.c @@ -11,7 +11,7 @@ #include "orte_config.h" #include "orte/constants.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "opal/threads/condition.h" #include "opal/runtime/opal_progress.h" #include "opal/dss/dss.h" @@ -170,7 +170,7 @@ static int update_route(orte_process_name_t *target, return ORTE_ERR_BAD_PARAM; } - OPAL_OUTPUT_VERBOSE((1, orte_routed_base_output, + ORTE_OUTPUT_VERBOSE((1, orte_routed_base_output, "%s routed_binomial_update: %s --> %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(target), @@ -260,7 +260,7 @@ static orte_process_name_t get_route(orte_process_name_t *target) found: - OPAL_OUTPUT_VERBOSE((2, orte_routed_base_output, + ORTE_OUTPUT_VERBOSE((2, orte_routed_base_output, "%s routed_binomial_get(%s) --> %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(target), @@ -289,7 +289,7 @@ static int process_callback(orte_jobid_t job, opal_buffer_t *buffer) cnt = 1; while (ORTE_SUCCESS == (rc = opal_dss.unpack(buffer, &rml_uri, &cnt, OPAL_STRING))) { - OPAL_OUTPUT_VERBOSE((2, orte_routed_base_output, + ORTE_OUTPUT_VERBOSE((2, orte_routed_base_output, "%s routed_binomial:callback got uri %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), (NULL == rml_uri) ? "NULL" : rml_uri)); @@ -358,7 +358,7 @@ static int init_routes(orte_jobid_t job, opal_buffer_t *ndat) */ if (orte_process_info.daemon) { - OPAL_OUTPUT_VERBOSE((1, orte_routed_base_output, + ORTE_OUTPUT_VERBOSE((1, orte_routed_base_output, "%s routed_binomial: init routes for daemon job %s\n\thnp_uri %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_JOBID_PRINT(job), @@ -416,7 +416,7 @@ static int init_routes(orte_jobid_t job, opal_buffer_t *ndat) return rc; } - OPAL_OUTPUT_VERBOSE((2, orte_routed_base_output, + ORTE_OUTPUT_VERBOSE((2, orte_routed_base_output, "%s routed_binomial: completed init routes", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME))); @@ -426,7 +426,7 @@ static int init_routes(orte_jobid_t job, opal_buffer_t *ndat) if (orte_process_info.hnp) { - OPAL_OUTPUT_VERBOSE((1, orte_routed_base_output, + ORTE_OUTPUT_VERBOSE((1, orte_routed_base_output, "%s routed_binomial: init routes for HNP job %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_JOBID_PRINT(job))); @@ -476,7 +476,7 @@ static int init_routes(orte_jobid_t job, opal_buffer_t *ndat) if (NULL != ndat) { int rc; - OPAL_OUTPUT_VERBOSE((1, orte_routed_base_output, + ORTE_OUTPUT_VERBOSE((1, orte_routed_base_output, "%s routed_binomial: init routes w/non-NULL data", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME))); @@ -496,7 +496,7 @@ static int init_routes(orte_jobid_t job, opal_buffer_t *ndat) * case, we need to setup a few critical pieces of info */ - OPAL_OUTPUT_VERBOSE((1, orte_routed_base_output, + ORTE_OUTPUT_VERBOSE((1, orte_routed_base_output, "%s routed_binomial: init routes for proc job %s\n\thnp_uri %s\n\tdaemon uri %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_JOBID_PRINT(job), (NULL == orte_process_info.my_hnp_uri) ? "NULL" : orte_process_info.my_hnp_uri, @@ -506,13 +506,13 @@ static int init_routes(orte_jobid_t job, opal_buffer_t *ndat) /* in this module, we absolutely MUST have this information - if * we didn't get it, then error out */ - opal_output(0, "%s ERROR: Failed to identify the local daemon's URI", + orte_output(0, "%s ERROR: Failed to identify the local daemon's URI", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME)); - opal_output(0, "%s ERROR: This is a fatal condition when the binomial router", + orte_output(0, "%s ERROR: This is a fatal condition when the binomial router", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME)); - opal_output(0, "%s ERROR: has been selected - either select the unity router", + orte_output(0, "%s ERROR: has been selected - either select the unity router", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME)); - opal_output(0, "%s ERROR: or ensure that the local daemon info is provided", + orte_output(0, "%s ERROR: or ensure that the local daemon info is provided", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME)); return ORTE_ERR_FATAL; } @@ -584,7 +584,7 @@ static int route_lost(const orte_process_name_t *route) if (!orte_finalizing && NULL != lifeline && OPAL_EQUAL == orte_util_compare_name_fields(ORTE_NS_CMP_ALL, route, lifeline)) { - opal_output(0, "%s routed:binomial: Connection to lifeline %s lost", + orte_output(0, "%s routed:binomial: Connection to lifeline %s lost", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(lifeline)); return ORTE_ERR_FATAL; @@ -622,7 +622,7 @@ static int binomial_tree(int rank, int parent, int me, int num_procs) child = OBJ_NEW(orte_namelist_t); child->name.jobid = ORTE_PROC_MY_NAME->jobid; child->name.vpid = peer; - OPAL_OUTPUT_VERBOSE((3, orte_routed_base_output, + ORTE_OUTPUT_VERBOSE((3, orte_routed_base_output, "%s routed:binomial found child %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(&child->name))); @@ -631,7 +631,7 @@ static int binomial_tree(int rank, int parent, int me, int num_procs) num_children++; } } - OPAL_OUTPUT_VERBOSE((3, orte_routed_base_output, + ORTE_OUTPUT_VERBOSE((3, orte_routed_base_output, "%s routed:binomial found parent %d", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), parent)); diff --git a/orte/mca/routed/binomial/routed_binomial_component.c b/orte/mca/routed/binomial/routed_binomial_component.c index f936805f1e..a7478cc259 100644 --- a/orte/mca/routed/binomial/routed_binomial_component.c +++ b/orte/mca/routed/binomial/routed_binomial_component.c @@ -14,7 +14,7 @@ #include "orte/constants.h" #include "orte/types.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "opal/class/opal_hash_table.h" #include "opal/mca/base/base.h" #include "opal/mca/base/mca_base_param.h" diff --git a/orte/mca/routed/direct/routed_direct.c b/orte/mca/routed/direct/routed_direct.c index 85193092aa..bf617803af 100644 --- a/orte/mca/routed/direct/routed_direct.c +++ b/orte/mca/routed/direct/routed_direct.c @@ -11,7 +11,7 @@ #include "orte_config.h" #include "orte/constants.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "opal/class/opal_hash_table.h" #include "opal/mca/base/base.h" #include "opal/mca/base/mca_base_param.h" @@ -148,7 +148,7 @@ static int update_route(orte_process_name_t *target, goto direct; } - OPAL_OUTPUT_VERBOSE((1, orte_routed_base_output, + ORTE_OUTPUT_VERBOSE((1, orte_routed_base_output, "%s routed_direct_update: diff job family routing %s --> %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(target), @@ -170,7 +170,7 @@ static int update_route(orte_process_name_t *target, direct: /* if it came from our own job family or was direct, there is nothing to do */ - OPAL_OUTPUT_VERBOSE((1, orte_routed_base_output, + ORTE_OUTPUT_VERBOSE((1, orte_routed_base_output, "%s routed_direct_update: %s --> %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(target), @@ -207,7 +207,7 @@ static orte_process_name_t get_route(orte_process_name_t *target) ret = target; found: - OPAL_OUTPUT_VERBOSE((5, orte_routed_base_output, + ORTE_OUTPUT_VERBOSE((5, orte_routed_base_output, "%s routed_direct_get(%s) --> %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(target), @@ -236,7 +236,7 @@ static int process_callback(orte_jobid_t job, opal_buffer_t *buffer) cnt = 1; while (ORTE_SUCCESS == (rc = opal_dss.unpack(buffer, &rml_uri, &cnt, OPAL_STRING))) { - OPAL_OUTPUT_VERBOSE((2, orte_routed_base_output, + ORTE_OUTPUT_VERBOSE((2, orte_routed_base_output, "%s routed_direct:callback got uri %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), (NULL == rml_uri) ? "NULL" : rml_uri)); @@ -275,7 +275,7 @@ static int process_callback(orte_jobid_t job, opal_buffer_t *buffer) /* if all procs have reported, then send out the info to complete the exchange */ if (jdata->num_reported == jdata->num_procs) { - OPAL_OUTPUT_VERBOSE((1, orte_routed_base_output, + ORTE_OUTPUT_VERBOSE((1, orte_routed_base_output, "%s routed_direct:callback trigger fired on job %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_JOBID_PRINT(jdata->jobid))); @@ -321,7 +321,7 @@ static int init_routes(orte_jobid_t job, opal_buffer_t *ndata) if (orte_process_info.daemon ) { int rc; - OPAL_OUTPUT_VERBOSE((1, orte_routed_base_output, + ORTE_OUTPUT_VERBOSE((1, orte_routed_base_output, "%s routed_direct: init routes for daemon job %s\n\thnp_uri %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_JOBID_PRINT(job), (NULL == orte_process_info.my_hnp_uri) ? "NULL" : orte_process_info.my_hnp_uri)); @@ -418,7 +418,7 @@ static int init_routes(orte_jobid_t job, opal_buffer_t *ndata) orte_std_cntr_t cnt; orte_rml_cmd_flag_t command; - OPAL_OUTPUT_VERBOSE((1, orte_routed_base_output, + ORTE_OUTPUT_VERBOSE((1, orte_routed_base_output, "%s routed_direct: init routes w/non-NULL data", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME))); @@ -447,7 +447,7 @@ static int init_routes(orte_jobid_t job, opal_buffer_t *ndata) int rc; opal_buffer_t buf; - OPAL_OUTPUT_VERBOSE((1, orte_routed_base_output, + ORTE_OUTPUT_VERBOSE((1, orte_routed_base_output, "%s routed_direct: init routes for proc job %s\n\thnp_uri %s\n\tdaemon uri %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_JOBID_PRINT(job), (NULL == orte_process_info.my_hnp_uri) ? "NULL" : orte_process_info.my_hnp_uri, @@ -491,7 +491,7 @@ static int init_routes(orte_jobid_t job, opal_buffer_t *ndata) return ORTE_ERR_FATAL; } - OPAL_OUTPUT_VERBOSE((2, orte_routed_base_output, + ORTE_OUTPUT_VERBOSE((2, orte_routed_base_output, "%s routed_direct_init: set hnp contact info and name", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME))); @@ -517,7 +517,7 @@ static int init_routes(orte_jobid_t job, opal_buffer_t *ndata) * always "direct" */ - OPAL_OUTPUT_VERBOSE((2, orte_routed_base_output, + ORTE_OUTPUT_VERBOSE((2, orte_routed_base_output, "%s routed_direct_init: register sync", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME))); @@ -530,7 +530,7 @@ static int init_routes(orte_jobid_t job, opal_buffer_t *ndata) return rc; } - OPAL_OUTPUT_VERBOSE((2, orte_routed_base_output, + ORTE_OUTPUT_VERBOSE((2, orte_routed_base_output, "%s routed_direct_init: wait to recv contact info for peers", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME))); @@ -545,7 +545,7 @@ static int init_routes(orte_jobid_t job, opal_buffer_t *ndata) return rc; } - OPAL_OUTPUT_VERBOSE((2, orte_routed_base_output, + ORTE_OUTPUT_VERBOSE((2, orte_routed_base_output, "%s routed_direct_init: peer contact info recvd", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME))); @@ -572,7 +572,7 @@ static int route_lost(const orte_process_name_t *route) if (!orte_finalizing && NULL != lifeline && OPAL_EQUAL == orte_util_compare_name_fields(ORTE_NS_CMP_ALL, route, lifeline)) { - opal_output(0, "%s routed:direct: Connection to lifeline %s lost", + orte_output(0, "%s routed:direct: Connection to lifeline %s lost", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(lifeline)); return ORTE_ERR_FATAL; diff --git a/orte/mca/routed/linear/routed_linear.c b/orte/mca/routed/linear/routed_linear.c index 5b792f5c0c..5ce9a80a84 100644 --- a/orte/mca/routed/linear/routed_linear.c +++ b/orte/mca/routed/linear/routed_linear.c @@ -11,7 +11,7 @@ #include "orte_config.h" #include "orte/constants.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "opal/threads/condition.h" #include "opal/runtime/opal_progress.h" #include "opal/dss/dss.h" @@ -153,7 +153,7 @@ static int update_route(orte_process_name_t *target, return ORTE_ERR_BAD_PARAM; } - OPAL_OUTPUT_VERBOSE((1, orte_routed_base_output, + ORTE_OUTPUT_VERBOSE((1, orte_routed_base_output, "%s routed_linear_update: %s --> %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(target), @@ -243,7 +243,7 @@ static orte_process_name_t get_route(orte_process_name_t *target) found: - OPAL_OUTPUT_VERBOSE((2, orte_routed_base_output, + ORTE_OUTPUT_VERBOSE((2, orte_routed_base_output, "%s routed_linear_get(%s) --> %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(target), @@ -272,7 +272,7 @@ static int process_callback(orte_jobid_t job, opal_buffer_t *buffer) cnt = 1; while (ORTE_SUCCESS == (rc = opal_dss.unpack(buffer, &rml_uri, &cnt, OPAL_STRING))) { - OPAL_OUTPUT_VERBOSE((2, orte_routed_base_output, + ORTE_OUTPUT_VERBOSE((2, orte_routed_base_output, "%s routed_linear:callback got uri %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), (NULL == rml_uri) ? "NULL" : rml_uri)); @@ -341,7 +341,7 @@ static int init_routes(orte_jobid_t job, opal_buffer_t *ndat) */ if (orte_process_info.daemon) { - OPAL_OUTPUT_VERBOSE((1, orte_routed_base_output, + ORTE_OUTPUT_VERBOSE((1, orte_routed_base_output, "%s routed_linear: init routes for daemon job %s\n\thnp_uri %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_JOBID_PRINT(job), @@ -399,7 +399,7 @@ static int init_routes(orte_jobid_t job, opal_buffer_t *ndat) return rc; } - OPAL_OUTPUT_VERBOSE((2, orte_routed_base_output, + ORTE_OUTPUT_VERBOSE((2, orte_routed_base_output, "%s routed_linear: completed init routes", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME))); @@ -409,7 +409,7 @@ static int init_routes(orte_jobid_t job, opal_buffer_t *ndat) if (orte_process_info.hnp) { - OPAL_OUTPUT_VERBOSE((1, orte_routed_base_output, + ORTE_OUTPUT_VERBOSE((1, orte_routed_base_output, "%s routed_linear: init routes for HNP job %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_JOBID_PRINT(job))); @@ -459,7 +459,7 @@ static int init_routes(orte_jobid_t job, opal_buffer_t *ndat) if (NULL != ndat) { int rc; - OPAL_OUTPUT_VERBOSE((1, orte_routed_base_output, + ORTE_OUTPUT_VERBOSE((1, orte_routed_base_output, "%s routed_linear: init routes w/non-NULL data", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME))); @@ -479,7 +479,7 @@ static int init_routes(orte_jobid_t job, opal_buffer_t *ndat) * case, we need to setup a few critical pieces of info */ - OPAL_OUTPUT_VERBOSE((1, orte_routed_base_output, + ORTE_OUTPUT_VERBOSE((1, orte_routed_base_output, "%s routed_linear: init routes for proc job %s\n\thnp_uri %s\n\tdaemon uri %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_JOBID_PRINT(job), (NULL == orte_process_info.my_hnp_uri) ? "NULL" : orte_process_info.my_hnp_uri, @@ -489,13 +489,13 @@ static int init_routes(orte_jobid_t job, opal_buffer_t *ndat) /* in this module, we absolutely MUST have this information - if * we didn't get it, then error out */ - opal_output(0, "%s ERROR: Failed to identify the local daemon's URI", + orte_output(0, "%s ERROR: Failed to identify the local daemon's URI", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME)); - opal_output(0, "%s ERROR: This is a fatal condition when the linear router", + orte_output(0, "%s ERROR: This is a fatal condition when the linear router", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME)); - opal_output(0, "%s ERROR: has been selected - either select the unity router", + orte_output(0, "%s ERROR: has been selected - either select the unity router", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME)); - opal_output(0, "%s ERROR: or ensure that the local daemon info is provided", + orte_output(0, "%s ERROR: or ensure that the local daemon info is provided", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME)); return ORTE_ERR_FATAL; } @@ -567,7 +567,7 @@ static int route_lost(const orte_process_name_t *route) if (!orte_finalizing && NULL != lifeline && OPAL_EQUAL == orte_util_compare_name_fields(ORTE_NS_CMP_ALL, route, lifeline)) { - opal_output(0, "%s routed:linear: Connection to lifeline %s lost", + orte_output(0, "%s routed:linear: Connection to lifeline %s lost", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(lifeline)); return ORTE_ERR_FATAL; diff --git a/orte/mca/routed/linear/routed_linear_component.c b/orte/mca/routed/linear/routed_linear_component.c index e7426aafc2..f2dd508d67 100644 --- a/orte/mca/routed/linear/routed_linear_component.c +++ b/orte/mca/routed/linear/routed_linear_component.c @@ -14,7 +14,7 @@ #include "orte/constants.h" #include "orte/types.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "opal/class/opal_hash_table.h" #include "opal/mca/base/base.h" #include "opal/mca/base/mca_base_param.h" diff --git a/orte/mca/snapc/base/snapc_base_close.c b/orte/mca/snapc/base/snapc_base_close.c index 21ebbdf147..c08270e489 100644 --- a/orte/mca/snapc/base/snapc_base_close.c +++ b/orte/mca/snapc/base/snapc_base_close.c @@ -20,7 +20,7 @@ #include "opal/mca/mca.h" #include "opal/mca/base/base.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "opal/mca/base/mca_base_param.h" #include "orte/mca/snapc/snapc.h" diff --git a/orte/mca/snapc/base/snapc_base_fns.c b/orte/mca/snapc/base/snapc_base_fns.c index b48a44c486..40c12f7ebe 100644 --- a/orte/mca/snapc/base/snapc_base_fns.c +++ b/orte/mca/snapc/base/snapc_base_fns.c @@ -29,7 +29,7 @@ #include "opal/mca/mca.h" #include "opal/mca/base/base.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "opal/mca/base/mca_base_param.h" #include "opal/util/os_dirpath.h" #include "opal/util/basename.h" @@ -286,13 +286,13 @@ int orte_snapc_base_global_coord_ckpt_init_cmd(orte_process_name_t* peer, */ if (peer->jobid == ORTE_PROC_MY_HNP->jobid && peer->vpid == ORTE_PROC_MY_HNP->vpid ) { - OPAL_OUTPUT_VERBOSE((10, orte_snapc_base_output, + ORTE_OUTPUT_VERBOSE((10, orte_snapc_base_output, "%s) base:ckpt_init_cmd: Error: Do not send to self!\n", ORTE_SNAPC_COORD_NAME_PRINT(orte_snapc_coord_type))); return ORTE_SUCCESS; } - OPAL_OUTPUT_VERBOSE((10, orte_snapc_base_output, + ORTE_OUTPUT_VERBOSE((10, orte_snapc_base_output, "%s) base:ckpt_init_cmd: Receiving commands\n", ORTE_SNAPC_COORD_NAME_PRINT(orte_snapc_coord_type))); @@ -304,7 +304,7 @@ int orte_snapc_base_global_coord_ckpt_init_cmd(orte_process_name_t* peer, ********************/ count = 1; if ( ORTE_SUCCESS != (ret = opal_dss.unpack(buffer, term, &count, OPAL_BOOL)) ) { - opal_output(orte_snapc_base_output, + orte_output(orte_snapc_base_output, "%s) base:ckpt_init_cmd: Error: DSS Unpack (term) Failure (ret = %d) (LINE = %d)\n", ORTE_SNAPC_COORD_NAME_PRINT(orte_snapc_coord_type), ret, __LINE__); @@ -314,7 +314,7 @@ int orte_snapc_base_global_coord_ckpt_init_cmd(orte_process_name_t* peer, count = 1; if ( ORTE_SUCCESS != (ret = opal_dss.unpack(buffer, jobid, &count, ORTE_JOBID)) ) { - opal_output(orte_snapc_base_output, + orte_output(orte_snapc_base_output, "%s) base:ckpt_init_cmd: Error: DSS Unpack (jobid) Failure (ret = %d) (LINE = %d)\n", ORTE_SNAPC_COORD_NAME_PRINT(orte_snapc_coord_type), ret, __LINE__); @@ -322,7 +322,7 @@ int orte_snapc_base_global_coord_ckpt_init_cmd(orte_process_name_t* peer, goto cleanup; } - OPAL_OUTPUT_VERBOSE((10, orte_snapc_base_output, + ORTE_OUTPUT_VERBOSE((10, orte_snapc_base_output, "%s) base:ckpt_init_cmd: Received [%d, %s]\n", ORTE_SNAPC_COORD_NAME_PRINT(orte_snapc_coord_type), (int)*term, @@ -346,13 +346,13 @@ int orte_snapc_base_global_coord_ckpt_update_cmd(orte_process_name_t* peer, */ if (peer->jobid == ORTE_PROC_MY_HNP->jobid && peer->vpid == ORTE_PROC_MY_HNP->vpid ) { - OPAL_OUTPUT_VERBOSE((10, orte_snapc_base_output, + ORTE_OUTPUT_VERBOSE((10, orte_snapc_base_output, "%s) base:ckpt_update_cmd: Error: Do not send to self!\n", ORTE_SNAPC_COORD_NAME_PRINT(orte_snapc_coord_type))); return ORTE_SUCCESS; } - OPAL_OUTPUT_VERBOSE((10, orte_snapc_base_output, + ORTE_OUTPUT_VERBOSE((10, orte_snapc_base_output, "%s) base:ckpt_update_cmd: Sending update command <%s> \n", ORTE_SNAPC_COORD_NAME_PRINT(orte_snapc_coord_type), global_snapshot_handle, seq_num, ckpt_status)); @@ -374,7 +374,7 @@ int orte_snapc_base_global_coord_ckpt_update_cmd(orte_process_name_t* peer, } if (ORTE_SUCCESS != (ret = opal_dss.pack(loc_buffer, &ckpt_status, 1, OPAL_INT))) { - opal_output(orte_snapc_base_output, + orte_output(orte_snapc_base_output, "%s) base:ckpt_update_cmd: Error: DSS Pack (ckpt_status) Failure (ret = %d) (LINE = %d)\n", ORTE_SNAPC_COORD_NAME_PRINT(orte_snapc_coord_type), ret, __LINE__); @@ -385,7 +385,7 @@ int orte_snapc_base_global_coord_ckpt_update_cmd(orte_process_name_t* peer, if( ORTE_SNAPC_CKPT_STATE_FINISHED == ckpt_status || ORTE_SNAPC_CKPT_STATE_ERROR == ckpt_status ) { if (ORTE_SUCCESS != (ret = opal_dss.pack(loc_buffer, &global_snapshot_handle, 1, OPAL_STRING))) { - opal_output(orte_snapc_base_output, + orte_output(orte_snapc_base_output, "%s) base:ckpt_update_cmd: Error: DSS Pack (snapshot handle) Failure (ret = %d) (LINE = %d)\n", ORTE_SNAPC_COORD_NAME_PRINT(orte_snapc_coord_type), ret, __LINE__); @@ -393,7 +393,7 @@ int orte_snapc_base_global_coord_ckpt_update_cmd(orte_process_name_t* peer, goto cleanup; } if (ORTE_SUCCESS != (ret = opal_dss.pack(loc_buffer, &seq_num, 1, OPAL_INT))) { - opal_output(orte_snapc_base_output, + orte_output(orte_snapc_base_output, "%s) base:ckpt_update_cmd: Error: DSS Pack (seq number) Failure (ret = %d) (LINE = %d)\n", ORTE_SNAPC_COORD_NAME_PRINT(orte_snapc_coord_type), ret, __LINE__); @@ -403,7 +403,7 @@ int orte_snapc_base_global_coord_ckpt_update_cmd(orte_process_name_t* peer, } if (0 > (ret = orte_rml.send_buffer(peer, loc_buffer, ORTE_RML_TAG_CKPT, 0))) { - opal_output(orte_snapc_base_output, + orte_output(orte_snapc_base_output, "%s) base:ckpt_update_cmd: Error: Send (ckpt_status) Failure (ret = %d) (LINE = %d)\n", ORTE_SNAPC_COORD_NAME_PRINT(orte_snapc_coord_type), ret, __LINE__); @@ -490,7 +490,7 @@ int orte_snapc_base_init_global_snapshot_directory(char *uniq_global_snapshot_na meta_data_fname = orte_snapc_base_get_global_snapshot_metadata_file(uniq_global_snapshot_name); if (NULL == (meta_data = fopen(meta_data_fname, "a")) ) { - opal_output(orte_snapc_base_output, + orte_output(orte_snapc_base_output, "%s) base:init_global_snapshot_directory: Error: Unable to open the file (%s)\n", ORTE_SNAPC_COORD_NAME_PRINT(orte_snapc_coord_type), meta_data_fname); @@ -574,7 +574,7 @@ int orte_snapc_base_add_timestamp(char * global_snapshot_ref) meta_data_fname = orte_snapc_base_get_global_snapshot_metadata_file(global_snapshot_ref); if (NULL == (meta_data = fopen(meta_data_fname, "a")) ) { - opal_output(orte_snapc_base_output, + orte_output(orte_snapc_base_output, "%s) base:add_timestamp: Error: Unable to open the file (%s)\n", ORTE_SNAPC_COORD_NAME_PRINT(orte_snapc_coord_type), meta_data_fname); @@ -606,7 +606,7 @@ int orte_snapc_base_finalize_metadata(char * global_snapshot_ref) meta_data_fname = orte_snapc_base_get_global_snapshot_metadata_file(global_snapshot_ref); if (NULL == (meta_data = fopen(meta_data_fname, "a")) ) { - opal_output(orte_snapc_base_output, + orte_output(orte_snapc_base_output, "%s) base:add_timestamp: Error: Unable to open the file (%s)\n", ORTE_SNAPC_COORD_NAME_PRINT(orte_snapc_coord_type), meta_data_fname); @@ -642,7 +642,7 @@ int orte_snapc_base_add_vpid_metadata( orte_process_name_t *proc, meta_data_fname = orte_snapc_base_get_global_snapshot_metadata_file(global_snapshot_ref); if (NULL == (meta_data = fopen(meta_data_fname, "a")) ) { - opal_output(orte_snapc_base_output, + orte_output(orte_snapc_base_output, "%s) base:add_metadata: Error: Unable to open the file (%s)\n", ORTE_SNAPC_COORD_NAME_PRINT(orte_snapc_coord_type), meta_data_fname); diff --git a/orte/mca/snapc/base/snapc_base_open.c b/orte/mca/snapc/base/snapc_base_open.c index 12ff3288a8..b469baa21c 100644 --- a/orte/mca/snapc/base/snapc_base_open.c +++ b/orte/mca/snapc/base/snapc_base_open.c @@ -22,12 +22,13 @@ #include "opal/mca/mca.h" #include "opal/mca/base/base.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "opal/mca/base/mca_base_param.h" #include "opal/util/opal_environ.h" #include "orte/mca/snapc/snapc.h" #include "orte/mca/snapc/base/base.h" +#include "orte/util/output.h" #include "orte/mca/snapc/base/static-components.h" @@ -63,25 +64,10 @@ int orte_snapc_base_open(void) int value = 0; char * str_value = NULL; - OPAL_OUTPUT_VERBOSE((10, orte_snapc_base_output, + ORTE_OUTPUT_VERBOSE((10, orte_snapc_base_output, "snapc:base: open()")); - /* Debugging/Verbose output */ - mca_base_param_reg_int_name("snapc", - "base_verbose", - "Verbosity level of the SNAPC framework", - false, false, - 0, &value); - if(0 != value) { - orte_snapc_base_output = opal_output_open(NULL); - } else { - orte_snapc_base_output = -1; - } - opal_output_set_verbosity(orte_snapc_base_output, value); - - OPAL_OUTPUT_VERBOSE((20, orte_snapc_base_output, - "snapc:base: open: verbose = %d", - value)); + orte_snapc_base_output = orte_output_open(NULL, "SNAPC", "DEBUG", NULL); /* Global Snapshot directory */ mca_base_param_reg_string_name("snapc", @@ -91,7 +77,7 @@ int orte_snapc_base_open(void) opal_home_directory(), &orte_snapc_base_global_snapshot_dir); - OPAL_OUTPUT_VERBOSE((20, orte_snapc_base_output, + ORTE_OUTPUT_VERBOSE((20, orte_snapc_base_output, "snapc:base: open: base_global_snapshot_dir = %s", orte_snapc_base_global_snapshot_dir)); @@ -110,7 +96,7 @@ int orte_snapc_base_open(void) 1, &value); orte_snapc_base_store_in_place = OPAL_INT_TO_BOOL(value); - OPAL_OUTPUT_VERBOSE((20, orte_snapc_base_output, + ORTE_OUTPUT_VERBOSE((20, orte_snapc_base_output, "snapc:base: open: base_store_in_place = %d", orte_snapc_base_store_in_place)); @@ -127,7 +113,7 @@ int orte_snapc_base_open(void) &value); orte_snapc_base_store_only_one_seq = OPAL_INT_TO_BOOL(value); - OPAL_OUTPUT_VERBOSE((20, orte_snapc_base_output, + ORTE_OUTPUT_VERBOSE((20, orte_snapc_base_output, "snapc:base: open: base_only_one_seq = %d", orte_snapc_base_store_only_one_seq)); @@ -142,7 +128,7 @@ int orte_snapc_base_open(void) &value); orte_snapc_base_establish_global_snapshot_dir = OPAL_INT_TO_BOOL(value); - OPAL_OUTPUT_VERBOSE((20, orte_snapc_base_output, + ORTE_OUTPUT_VERBOSE((20, orte_snapc_base_output, "snapc:base: open: base_establish_global_snapshot_dir = %d", orte_snapc_base_establish_global_snapshot_dir)); @@ -157,7 +143,7 @@ int orte_snapc_base_open(void) NULL, &orte_snapc_base_global_snapshot_ref); - OPAL_OUTPUT_VERBOSE((20, orte_snapc_base_output, + ORTE_OUTPUT_VERBOSE((20, orte_snapc_base_output, "snapc:base: open: base_global_snapshot_ref = %s", orte_snapc_base_global_snapshot_ref)); diff --git a/orte/mca/snapc/base/snapc_base_select.c b/orte/mca/snapc/base/snapc_base_select.c index 3bfa8500fb..8e5f4eacb8 100644 --- a/orte/mca/snapc/base/snapc_base_select.c +++ b/orte/mca/snapc/base/snapc_base_select.c @@ -20,7 +20,7 @@ #include "opal/mca/mca.h" #include "opal/mca/base/base.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "opal/mca/base/mca_base_param.h" #include "orte/mca/snapc/snapc.h" @@ -53,7 +53,7 @@ static orte_snapc_base_component_t none_component = { /* Verbosity level */ 0, - /* opal_output handler */ + /* orte_output handler */ -1, /* Default priority */ 1 @@ -84,7 +84,7 @@ int orte_snapc_base_select(bool seed, bool app) false, false, strdup("none"), &include_list); if(NULL != include_list && 0 == strncmp(include_list, "none", strlen("none")) ){ - opal_output_verbose(10, orte_snapc_base_output, + orte_output_verbose(10, orte_snapc_base_output, "snapc:select: Using %s component", include_list); best_component = &none_component; diff --git a/orte/mca/snapc/full/snapc_full_app.c b/orte/mca/snapc/full/snapc_full_app.c index b7399f8f15..12cbda6b23 100644 --- a/orte/mca/snapc/full/snapc_full_app.c +++ b/orte/mca/snapc/full/snapc_full_app.c @@ -35,9 +35,6 @@ #endif #include "opal/runtime/opal_cr.h" -#include "opal/util/output.h" -#include "opal/util/output.h" -#include "opal/util/show_help.h" #include "opal/util/argv.h" #include "opal/util/opal_environ.h" #include "opal/mca/mca.h" @@ -46,6 +43,7 @@ #include "opal/mca/crs/crs.h" #include "opal/mca/crs/base/base.h" +#include "orte/util/output.h" #include "orte/util/name_fns.h" #include "orte/mca/rml/rml.h" #include "orte/mca/snapc/snapc.h" @@ -78,7 +76,7 @@ int app_coord_init() { opal_cr_notify_callback_fn_t prev_notify_func; char *tmp_pid = NULL; - OPAL_OUTPUT_VERBOSE((20, mca_snapc_full_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((20, mca_snapc_full_component.super.output_handle, "App) Initalized for Application %s\n", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME))); @@ -98,14 +96,14 @@ int app_coord_init() { * to handle the checkpoint */ if( SIG_ERR == signal(opal_cr_entry_point_signal, snapc_full_app_signal_handler) ) { - opal_output(mca_snapc_full_component.super.output_handle, + orte_output(mca_snapc_full_component.super.output_handle, "App) init: Error: Failed to register signal %d\n", opal_cr_entry_point_signal); exit_status = OPAL_ERROR; goto cleanup; } - OPAL_OUTPUT_VERBOSE((15, mca_snapc_full_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((15, mca_snapc_full_component.super.output_handle, "app) Named Pipes (%s) (%s), Signal (%d)", app_comm_pipe_r, app_comm_pipe_w, opal_cr_entry_point_signal)); @@ -146,7 +144,7 @@ int app_coord_finalize() { static void snapc_full_app_signal_handler (int signo) { if( opal_cr_entry_point_signal != signo ) { - OPAL_OUTPUT_VERBOSE((1, mca_snapc_full_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((1, mca_snapc_full_component.super.output_handle, "App) signal_handler: Received unknown signal %d", signo)); /* Not our signal */ @@ -157,7 +155,7 @@ static void snapc_full_app_signal_handler (int signo) */ opal_cr_checkpoint_request = OPAL_CR_STATUS_REQUESTED; - OPAL_OUTPUT_VERBOSE((10, mca_snapc_full_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((10, mca_snapc_full_component.super.output_handle, "App) signal_handler: Receive Checkpoint Request.")); } @@ -178,7 +176,7 @@ int snapc_full_app_notify_response(opal_cr_ckpt_cmd_state_t resp) /* * Open communication channels */ - OPAL_OUTPUT_VERBOSE((10, mca_snapc_full_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((10, mca_snapc_full_component.super.output_handle, "App) notify_response: Open Communication Channels.")); if (ORTE_SUCCESS != (ret = snapc_full_app_notify_reopen_files())) { exit_status = ret; @@ -188,7 +186,7 @@ int snapc_full_app_notify_response(opal_cr_ckpt_cmd_state_t resp) /* * Initial Handshake */ - OPAL_OUTPUT_VERBOSE((10, mca_snapc_full_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((10, mca_snapc_full_component.super.output_handle, "App) notify_response: Initial Handshake.")); if( ORTE_SUCCESS != (ret = snapc_full_app_ckpt_handshake_start(&app_term, resp) ) ) { exit_status = ret; @@ -199,10 +197,10 @@ int snapc_full_app_notify_response(opal_cr_ckpt_cmd_state_t resp) * Begin checkpoint * - Init the checkpoint metadata file */ - OPAL_OUTPUT_VERBOSE((10, mca_snapc_full_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((10, mca_snapc_full_component.super.output_handle, "App) notify_response: Start checkpoint...")); if( OPAL_SUCCESS != (ret = opal_crs_base_init_snapshot_directory(local_snapshot) ) ) { - opal_output(0, "App) Error: Unable to initalize the snapshot directory!\n"); + orte_output(0, "App) Error: Unable to initalize the snapshot directory!\n"); exit_status = ret; goto ckpt_cleanup; } @@ -213,14 +211,14 @@ int snapc_full_app_notify_response(opal_cr_ckpt_cmd_state_t resp) app_pid = getpid(); ret = opal_cr_inc_core(app_pid, local_snapshot, app_term, &cr_state); if( OPAL_EXISTS == ret ) { - OPAL_OUTPUT_VERBOSE((5, mca_snapc_full_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((5, mca_snapc_full_component.super.output_handle, "App) notify_response: Stalling the checkpoint progress until state is stable again (PID = %d)\n", getpid())); opal_cr_currently_stalled = true; return exit_status; } else if(ORTE_SUCCESS != ret) { - opal_output(mca_snapc_full_component.super.output_handle, + orte_output(mca_snapc_full_component.super.output_handle, "App) notify_response: Error: checkpoint notification failed. %d\n", ret); goto ckpt_cleanup; } @@ -229,7 +227,7 @@ int snapc_full_app_notify_response(opal_cr_ckpt_cmd_state_t resp) opal_cr_stall_check = false; if(OPAL_CRS_RESTART == cr_state) { - OPAL_OUTPUT_VERBOSE((10, mca_snapc_full_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((10, mca_snapc_full_component.super.output_handle, "App) notify_response: Restarting...(%d)\n", getpid())); @@ -244,7 +242,7 @@ int snapc_full_app_notify_response(opal_cr_ckpt_cmd_state_t resp) ; /* Don't need to do anything here */ } else { - OPAL_OUTPUT_VERBOSE((5, mca_snapc_full_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((5, mca_snapc_full_component.super.output_handle, "App) notify_response: Unknown cr_state(%d) [%d]", cr_state, getpid())); } @@ -252,13 +250,13 @@ int snapc_full_app_notify_response(opal_cr_ckpt_cmd_state_t resp) /* * Final Handshake */ - OPAL_OUTPUT_VERBOSE((10, mca_snapc_full_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((10, mca_snapc_full_component.super.output_handle, "App) notify_response: Waiting for final handshake.")); if( ORTE_SUCCESS != (ret = snapc_full_app_ckpt_handshake_end(cr_state ) ) ) { exit_status = ret; goto ckpt_cleanup; } - OPAL_OUTPUT_VERBOSE((10, mca_snapc_full_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((10, mca_snapc_full_component.super.output_handle, "App) notify_response: Final Handshake complete.")); ckpt_cleanup: @@ -268,7 +266,7 @@ int snapc_full_app_notify_response(opal_cr_ckpt_cmd_state_t resp) remove(app_comm_pipe_w); if(app_term) { - OPAL_OUTPUT_VERBOSE((10, mca_snapc_full_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((10, mca_snapc_full_component.super.output_handle, "App) notify_response: User has asked to terminate the application")); exit(ORTE_SUCCESS); } @@ -295,12 +293,12 @@ static int snapc_full_app_notify_reopen_files(void) */ if( (ret = mkfifo(app_comm_pipe_r, 0660)) < 0) { if(EEXIST == ret || -1 == ret ) { - OPAL_OUTPUT_VERBOSE((10, mca_snapc_full_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((10, mca_snapc_full_component.super.output_handle, "App) notify_reopen_files: mkfifo failed because file (%s) already exists, attempting to use this pipe. (%d)", app_comm_pipe_r, ret)); } else { - opal_output(mca_snapc_full_component.super.output_handle, + orte_output(mca_snapc_full_component.super.output_handle, "App) notify_reopen_files: Error: mkfifo failed to make named pipe (%s). (%d)\n", app_comm_pipe_r, ret); return ORTE_ERROR; @@ -309,7 +307,7 @@ static int snapc_full_app_notify_reopen_files(void) app_comm_pipe_r_fd = open(app_comm_pipe_r, O_RDWR); if(app_comm_pipe_r_fd < 0) { - opal_output(mca_snapc_full_component.super.output_handle, + orte_output(mca_snapc_full_component.super.output_handle, "App) init: Error: open failed to open the named pipe (%s). %d\n", app_comm_pipe_r, app_comm_pipe_r_fd); return ORTE_ERROR; @@ -320,12 +318,12 @@ static int snapc_full_app_notify_reopen_files(void) */ if( (ret = mkfifo(app_comm_pipe_w, 0660)) < 0) { if(EEXIST == ret || -1 == ret ) { - OPAL_OUTPUT_VERBOSE((10, mca_snapc_full_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((10, mca_snapc_full_component.super.output_handle, "App) notify_reopen_files: mkfifo failed because file (%s) already exists, attempting to use this pipe. (%d)", app_comm_pipe_w, ret)); } else { - opal_output(mca_snapc_full_component.super.output_handle, + orte_output(mca_snapc_full_component.super.output_handle, "App) notify_reopen_files: Error: mkfifo failed to make named pipe (%s). (%d)\n", app_comm_pipe_w, ret); return ORTE_ERROR; @@ -334,7 +332,7 @@ static int snapc_full_app_notify_reopen_files(void) app_comm_pipe_w_fd = open(app_comm_pipe_w, O_WRONLY); if(app_comm_pipe_w_fd < 0) { - opal_output(mca_snapc_full_component.super.output_handle, + orte_output(mca_snapc_full_component.super.output_handle, "App) notify_reopen_files: Error: open failed to open the named pipe (%s). (%d)\n", app_comm_pipe_w, app_comm_pipe_w_fd); return ORTE_ERROR; @@ -356,7 +354,7 @@ static int snapc_full_app_ckpt_handshake_start(int *app_term, opal_cr_ckpt_cmd_s * Get the initial handshake command: Term argument */ if( sizeof(int) != (ret = read(app_comm_pipe_r_fd, app_term, sizeof(int))) ) { - opal_output(mca_snapc_full_component.super.output_handle, + orte_output(mca_snapc_full_component.super.output_handle, "App) notify_response: Error: Unable to read the term from named pipe (%s). %d\n", app_comm_pipe_r, ret); goto cleanup; @@ -364,7 +362,7 @@ static int snapc_full_app_ckpt_handshake_start(int *app_term, opal_cr_ckpt_cmd_s tmp_resp = (int)resp; if( sizeof(int) != (ret = write(app_comm_pipe_w_fd, &tmp_resp, sizeof(int)) ) ) { - opal_output(mca_snapc_full_component.super.output_handle, + orte_output(mca_snapc_full_component.super.output_handle, "App) notify_response: %d: Error: Unable to write to pipe (%s) ret = %d [Line %d]\n", tmp_resp, app_comm_pipe_w, ret, __LINE__); goto cleanup; @@ -374,7 +372,7 @@ static int snapc_full_app_ckpt_handshake_start(int *app_term, opal_cr_ckpt_cmd_s * Respond that the checkpoint is currently in progress */ if( OPAL_CHECKPOINT_CMD_IN_PROGRESS == resp ) { - OPAL_OUTPUT_VERBOSE((10, mca_snapc_full_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((10, mca_snapc_full_component.super.output_handle, "App) notify_response: Checkpoint in progress, cannot start (%d)", getpid())); goto cleanup; @@ -383,7 +381,7 @@ static int snapc_full_app_ckpt_handshake_start(int *app_term, opal_cr_ckpt_cmd_s * Respond that the application is unable to be checkpointed */ else if( OPAL_CHECKPOINT_CMD_NULL == resp ) { - OPAL_OUTPUT_VERBOSE((10, mca_snapc_full_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((10, mca_snapc_full_component.super.output_handle, "App) notify_response: Non-checkpointable application, cannot start (%d)", getpid())); goto cleanup; @@ -393,7 +391,7 @@ static int snapc_full_app_ckpt_handshake_start(int *app_term, opal_cr_ckpt_cmd_s * not able to be checkpointed */ else if( OPAL_CHECKPOINT_CMD_ERROR == resp ) { - OPAL_OUTPUT_VERBOSE((10, mca_snapc_full_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((10, mca_snapc_full_component.super.output_handle, "App) notify_response: Error generated, cannot start (%d)", getpid())); goto cleanup; @@ -402,7 +400,7 @@ static int snapc_full_app_ckpt_handshake_start(int *app_term, opal_cr_ckpt_cmd_s /* * Respond signalng that we wish to respond to this request */ - OPAL_OUTPUT_VERBOSE((10, mca_snapc_full_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((10, mca_snapc_full_component.super.output_handle, "App) notify_response: Starting checkpoint request (%d)", getpid())); @@ -410,7 +408,7 @@ static int snapc_full_app_ckpt_handshake_start(int *app_term, opal_cr_ckpt_cmd_s * Get Snapshot Handle argument */ if( sizeof(int) != (ret = read(app_comm_pipe_r_fd, &len, sizeof(int))) ) { - opal_output(mca_snapc_full_component.super.output_handle, + orte_output(mca_snapc_full_component.super.output_handle, "App) notify_response: Error: Unable to read the snapshot_handle len from named pipe (%s). %d\n", app_comm_pipe_r, ret); goto cleanup; @@ -419,7 +417,7 @@ static int snapc_full_app_ckpt_handshake_start(int *app_term, opal_cr_ckpt_cmd_s tmp_size = sizeof(char) * len; tmp_str = (char *) malloc(sizeof(char) * len); if( tmp_size != (ret = read(app_comm_pipe_r_fd, tmp_str, (sizeof(char) * len))) ) { - opal_output(mca_snapc_full_component.super.output_handle, + orte_output(mca_snapc_full_component.super.output_handle, "App) notify_response: Error: Unable to read the snapshot_handle from named pipe (%s). %d\n", app_comm_pipe_r, ret); goto cleanup; @@ -452,7 +450,7 @@ static int snapc_full_app_ckpt_handshake_start(int *app_term, opal_cr_ckpt_cmd_s * Get Snapshot location argument */ if( sizeof(int) != (ret = read(app_comm_pipe_r_fd, &len, sizeof(int))) ) { - opal_output(mca_snapc_full_component.super.output_handle, + orte_output(mca_snapc_full_component.super.output_handle, "App) notify_response: Error: Unable to read the snapshot_location len from named pipe (%s). %d\n", app_comm_pipe_r, ret); goto cleanup; @@ -461,7 +459,7 @@ static int snapc_full_app_ckpt_handshake_start(int *app_term, opal_cr_ckpt_cmd_s tmp_str = (char *) malloc(sizeof(char) * len); tmp_size = sizeof(char) * len; if( tmp_size != (ret = read(app_comm_pipe_r_fd, tmp_str, (sizeof(char) * len))) ) { - opal_output(mca_snapc_full_component.super.output_handle, + orte_output(mca_snapc_full_component.super.output_handle, "App) notify_response: Error: Unable to read the snapshot_location from named pipe (%s). %d\n", app_comm_pipe_r, ret); goto cleanup; @@ -502,7 +500,7 @@ static int snapc_full_app_ckpt_handshake_end(int cr_state) * Return the final checkpoint state to the local coordinator */ if( sizeof(int) != (ret = write(app_comm_pipe_w_fd, &cr_state, sizeof(int))) ) { - opal_output(mca_snapc_full_component.super.output_handle, + orte_output(mca_snapc_full_component.super.output_handle, "App) notify_response: Error: Unable to write cr_state to named pipe (%s). %d\n", app_comm_pipe_w, ret); goto cleanup; @@ -512,7 +510,7 @@ static int snapc_full_app_ckpt_handshake_end(int cr_state) * Wait for the local coordinator to release us */ if( sizeof(int) != (ret = read(app_comm_pipe_r_fd, &last_cmd, sizeof(int))) ) { - opal_output(mca_snapc_full_component.super.output_handle, + orte_output(mca_snapc_full_component.super.output_handle, "App) notify_response: Error: Unable to read the term from named pipe (%s). %d\n", app_comm_pipe_r, ret); goto cleanup; diff --git a/orte/mca/snapc/full/snapc_full_component.c b/orte/mca/snapc/full/snapc_full_component.c index 9c93dc16a8..16eb0e4bb8 100644 --- a/orte/mca/snapc/full/snapc_full_component.c +++ b/orte/mca/snapc/full/snapc_full_component.c @@ -17,6 +17,8 @@ #include "orte_config.h" #include "orte/util/name_fns.h" +#include "orte/util/output.h" + #include "orte/mca/snapc/snapc.h" #include "orte/mca/snapc/base/base.h" #include "snapc_full.h" @@ -67,7 +69,7 @@ orte_snapc_full_component_t mca_snapc_full_component = { /* Verbosity level */ 0, - /* opal_output handler */ + /* orte_output handler */ -1, /* Default priority */ 20 @@ -99,8 +101,8 @@ static int snapc_full_open(void) * otherwise take our parents level and output channel */ if ( 0 != mca_snapc_full_component.super.verbose) { - mca_snapc_full_component.super.output_handle = opal_output_open(NULL); - opal_output_set_verbosity(mca_snapc_full_component.super.output_handle, + mca_snapc_full_component.super.output_handle = orte_output_open(NULL, "SNAPC", "FULL", "DEBUG", NULL); + orte_output_set_verbosity(mca_snapc_full_component.super.output_handle, mca_snapc_full_component.super.verbose); } else { mca_snapc_full_component.super.output_handle = orte_snapc_base_output; @@ -117,15 +119,15 @@ static int snapc_full_open(void) /* * Debug Output */ - opal_output_verbose(10, mca_snapc_full_component.super.output_handle, + orte_output_verbose(10, mca_snapc_full_component.super.output_handle, "snapc:full: open()"); - opal_output_verbose(20, mca_snapc_full_component.super.output_handle, + orte_output_verbose(20, mca_snapc_full_component.super.output_handle, "snapc:full: open: priority = %d", mca_snapc_full_component.super.priority); - opal_output_verbose(20, mca_snapc_full_component.super.output_handle, + orte_output_verbose(20, mca_snapc_full_component.super.output_handle, "snapc:full: open: verbosity = %d", mca_snapc_full_component.super.verbose); - opal_output_verbose(20, mca_snapc_full_component.super.output_handle, + orte_output_verbose(20, mca_snapc_full_component.super.output_handle, "snapc:full: open: skip_filem = %s", (orte_snapc_full_skip_filem == true ? "True" : "False")); @@ -134,7 +136,7 @@ static int snapc_full_open(void) static int snapc_full_close(void) { - opal_output_verbose(10, mca_snapc_full_component.super.output_handle, + orte_output_verbose(10, mca_snapc_full_component.super.output_handle, "snapc:full: close()"); return ORTE_SUCCESS; diff --git a/orte/mca/snapc/full/snapc_full_global.c b/orte/mca/snapc/full/snapc_full_global.c index 8ce117f8ec..59a2e8738d 100644 --- a/orte/mca/snapc/full/snapc_full_global.c +++ b/orte/mca/snapc/full/snapc_full_global.c @@ -22,8 +22,6 @@ #include #endif /* HAVE_UNISTD_H */ -#include "opal/util/output.h" -#include "opal/util/show_help.h" #include "opal/util/argv.h" #include "opal/util/opal_environ.h" #include "opal/util/basename.h" @@ -33,6 +31,7 @@ #include "opal/mca/crs/crs.h" #include "opal/mca/crs/base/base.h" +#include "orte/util/output.h" #include "orte/util/name_fns.h" #include "opal/dss/dss.h" #include "orte/mca/rml/rml.h" @@ -158,7 +157,7 @@ int global_coord_setup_job(orte_jobid_t jobid) { } else if ( jobid == cur_job_id ) { /* Local Coordinator pass -- Will always happen after Global Coordinator Pass */ - OPAL_OUTPUT_VERBOSE((10, mca_snapc_full_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((10, mca_snapc_full_component.super.output_handle, "Global) [%d] Setup job %s again as the local coordinator for %s\n", getpid(), ORTE_JOBID_PRINT(jobid), ORTE_JOBID_PRINT(cur_job_id))); @@ -171,7 +170,7 @@ int global_coord_setup_job(orte_jobid_t jobid) { * We do not currently support the ability to checkpoint more than one * jobid */ - opal_output(mca_snapc_full_component.super.output_handle, + orte_output(mca_snapc_full_component.super.output_handle, "global [%d]) Setup job (%d) Failed. Already setup job (%d)\n", getpid(), jobid, cur_job_id); return ORTE_ERROR; } @@ -239,7 +238,7 @@ int global_coord_setup_job(orte_jobid_t jobid) { global_snapshot.reference_name = strdup(global_snapshot_handle); global_snapshot.local_location = opal_dirname(orte_snapc_base_get_global_snapshot_directory(global_snapshot.reference_name)); - OPAL_OUTPUT_VERBOSE((10, mca_snapc_full_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((10, mca_snapc_full_component.super.output_handle, "Global) Pre-establish the global snapshot directory\n")); /* Creates the directory (with metadata files): @@ -257,7 +256,7 @@ int global_coord_setup_job(orte_jobid_t jobid) { global_dir = NULL; } - OPAL_OUTPUT_VERBOSE((10, mca_snapc_full_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((10, mca_snapc_full_component.super.output_handle, "Global) [%d] Setup job %s with vpid [%d, %d]\n", getpid(), ORTE_JOBID_PRINT(jobid), vpid_start, vpid_range)); @@ -300,7 +299,7 @@ static int snapc_full_global_start_listener(void) return ORTE_SUCCESS; } - OPAL_OUTPUT_VERBOSE((5, mca_snapc_full_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((5, mca_snapc_full_component.super.output_handle, "Global) Receive: Start command recv")); /* @@ -331,7 +330,7 @@ static int snapc_full_global_stop_listener(void) return ORTE_SUCCESS; } - OPAL_OUTPUT_VERBOSE((5, mca_snapc_full_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((5, mca_snapc_full_component.super.output_handle, "Global) Receive stop command recv")); if (ORTE_SUCCESS != (rc = orte_rml.recv_cancel(ORTE_NAME_WILDCARD, @@ -356,7 +355,7 @@ static int snapc_full_global_start_cmdline_listener(void) return ORTE_SUCCESS; } - OPAL_OUTPUT_VERBOSE((5, mca_snapc_full_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((5, mca_snapc_full_component.super.output_handle, "Global) Receive (Command line): Start command recv")); /* @@ -387,7 +386,7 @@ static int snapc_full_global_stop_cmdline_listener(void) return ORTE_SUCCESS; } - OPAL_OUTPUT_VERBOSE((5, mca_snapc_full_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((5, mca_snapc_full_component.super.output_handle, "Global) Receive (Command Line) stop command")); if (ORTE_SUCCESS != (rc = orte_rml.recv_cancel(ORTE_NAME_WILDCARD, @@ -413,7 +412,7 @@ void snapc_full_global_cmd_recv(int status, orte_std_cntr_t count; int rc; - OPAL_OUTPUT_VERBOSE((5, mca_snapc_full_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((5, mca_snapc_full_component.super.output_handle, "Global) Receive a command message from %s.", ORTE_NAME_PRINT(sender))); @@ -421,7 +420,7 @@ void snapc_full_global_cmd_recv(int status, * If this is a command line checkpoint request, handle directly */ if( ORTE_RML_TAG_CKPT == tag ) { - OPAL_OUTPUT_VERBOSE((10, mca_snapc_full_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((10, mca_snapc_full_component.super.output_handle, "Global) Command Line: Start a checkpoint operation")); snapc_cmdline_recv_issued = false; /* Not a persistent RML message */ @@ -440,28 +439,28 @@ void snapc_full_global_cmd_recv(int status, switch (command) { case ORTE_SNAPC_FULL_UPDATE_JOB_STATE_CMD: - OPAL_OUTPUT_VERBOSE((10, mca_snapc_full_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((10, mca_snapc_full_component.super.output_handle, "Global) Command: Update Job state command")); snapc_full_process_job_update_cmd(sender, buffer); break; case ORTE_SNAPC_FULL_UPDATE_PROC_STATE_CMD: - OPAL_OUTPUT_VERBOSE((10, mca_snapc_full_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((10, mca_snapc_full_component.super.output_handle, "Global) Command: Update Proc state command")); snapc_full_process_proc_update_cmd(sender, buffer); break; case ORTE_SNAPC_FULL_VPID_ASSOC_CMD: - OPAL_OUTPUT_VERBOSE((10, mca_snapc_full_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((10, mca_snapc_full_component.super.output_handle, "Global) Command: Update process/orted associations")); snapc_full_process_vpid_assoc_cmd(sender, buffer); break; case ORTE_SNAPC_FULL_ESTABLISH_DIR_CMD: - OPAL_OUTPUT_VERBOSE((10, mca_snapc_full_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((10, mca_snapc_full_component.super.output_handle, "Global) Command: Establish checkpoint directory")); snapc_full_process_establish_dir_cmd(sender, buffer); @@ -487,7 +486,7 @@ static void snapc_full_process_job_update_cmd(orte_process_name_t* sender, */ if( sender->jobid == ORTE_PROC_MY_NAME->jobid && sender->vpid == ORTE_PROC_MY_NAME->vpid ) { - OPAL_OUTPUT_VERBOSE((10, mca_snapc_full_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((10, mca_snapc_full_component.super.output_handle, "Global) Command: Reflect the job update command")); return; } @@ -544,7 +543,7 @@ int global_coord_job_state_update(orte_jobid_t jobid, opal_list_item_t* item = NULL; bool term_job = false; - OPAL_OUTPUT_VERBOSE((15, mca_snapc_full_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((15, mca_snapc_full_component.super.output_handle, "Global) Job update command: jobid %s -> state %d\n", ORTE_JOBID_PRINT(jobid), (int)job_ckpt_state)); @@ -581,7 +580,7 @@ int global_coord_job_state_update(orte_jobid_t jobid, goto cleanup; } #else - opal_output(mca_snapc_full_component.super.output_handle, + orte_output(mca_snapc_full_component.super.output_handle, "ERROR: Internal Checkpoint request not implemented."); #endif } @@ -721,16 +720,16 @@ int global_coord_vpid_state_update(orte_process_name_t proc_name, orte_snapc_full_global_snapshot_t *vpid_snapshot = NULL; opal_list_item_t* item = NULL; - OPAL_OUTPUT_VERBOSE((20, mca_snapc_full_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((20, mca_snapc_full_component.super.output_handle, "Global) Process %s: Changed to state to:\n", ORTE_NAME_PRINT(&proc_name))); - OPAL_OUTPUT_VERBOSE((20, mca_snapc_full_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((20, mca_snapc_full_component.super.output_handle, "Global) State: %d\n", (int)proc_ckpt_state)); - OPAL_OUTPUT_VERBOSE((20, mca_snapc_full_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((20, mca_snapc_full_component.super.output_handle, "Global) Snapshot Ref: [%s]\n", *proc_ckpt_ref)); - OPAL_OUTPUT_VERBOSE((20, mca_snapc_full_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((20, mca_snapc_full_component.super.output_handle, "Global) Remote Location: [%s]\n", *proc_ckpt_loc)); @@ -805,7 +804,7 @@ static void snapc_full_process_vpid_assoc_cmd(orte_process_name_t* sender, count = 1; if (ORTE_SUCCESS != (ret = opal_dss.unpack(buffer, &num_vpids, &count, OPAL_SIZE))) { - opal_output(mca_snapc_full_component.super.output_handle, + orte_output(mca_snapc_full_component.super.output_handle, "Global) vpid_assoc: Failed to unpack num_vpids from peer %s\n", ORTE_NAME_PRINT(sender)); goto cleanup; @@ -814,7 +813,7 @@ static void snapc_full_process_vpid_assoc_cmd(orte_process_name_t* sender, for(i = 0; i < num_vpids; ++i) { count = 1; if (ORTE_SUCCESS != (ret = opal_dss.unpack(buffer, &tmp_proc_name, &count, ORTE_NAME))) { - opal_output(mca_snapc_full_component.super.output_handle, + orte_output(mca_snapc_full_component.super.output_handle, "Global) vpid_assoc: Failed to unpack process name from peer %s\n", ORTE_NAME_PRINT(sender)); goto cleanup; @@ -910,7 +909,7 @@ static void snapc_full_process_cmdline_request_cmd(orte_process_name_t* sender, * orte_checkpoint has requested that a checkpoint be taken */ if (ORTE_SNAPC_GLOBAL_INIT_CMD == command) { - OPAL_OUTPUT_VERBOSE((10, mca_snapc_full_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((10, mca_snapc_full_component.super.output_handle, "Global) Command line requested a checkpoint (command %d)\n", command)); /******************** @@ -944,7 +943,7 @@ static void snapc_full_process_cmdline_request_cmd(orte_process_name_t* sender, } else if (ORTE_SNAPC_GLOBAL_TERM_CMD == command) { - OPAL_OUTPUT_VERBOSE((10, mca_snapc_full_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((10, mca_snapc_full_component.super.output_handle, "Global) Command line requested to terminate connection (command %d)\n", command)); /* Something must have happened so we are forced to terminate */ @@ -954,7 +953,7 @@ static void snapc_full_process_cmdline_request_cmd(orte_process_name_t* sender, * Unknown command */ else { - OPAL_OUTPUT_VERBOSE((10, mca_snapc_full_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((10, mca_snapc_full_component.super.output_handle, "Global) Command line sent an unknown command (command %d)\n", command)); goto cleanup; @@ -1035,7 +1034,7 @@ static int orte_snapc_full_global_set_job_ckpt_info( orte_jobid_t jobid, goto cleanup; } - OPAL_OUTPUT_VERBOSE((15, mca_snapc_full_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((15, mca_snapc_full_component.super.output_handle, "Global) Notifying all Local Coordinators of job %s state change to %d\n", ORTE_JOBID_PRINT(jobid), (int)ckpt_state)); @@ -1048,7 +1047,7 @@ static int orte_snapc_full_global_set_job_ckpt_info( orte_jobid_t jobid, /* * Process the job update - Global Coordinator */ - OPAL_OUTPUT_VERBOSE((15, mca_snapc_full_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((15, mca_snapc_full_component.super.output_handle, "Global) Act locally on job %s state change to %d\n", ORTE_JOBID_PRINT(jobid), (int)ckpt_state)); if( ORTE_SUCCESS != (ret = global_coord_job_state_update(jobid, ckpt_state, &ckpt_snapshot_ref, &ckpt_snapshot_loc) ) ) { @@ -1109,7 +1108,7 @@ static int snapc_full_global_checkpoint(orte_jobid_t jobid, { int ret, exit_status = ORTE_SUCCESS; - OPAL_OUTPUT_VERBOSE((10, mca_snapc_full_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((10, mca_snapc_full_component.super.output_handle, "Global) Checkpoint of job %s has been requested\n", ORTE_JOBID_PRINT(jobid))); @@ -1143,14 +1142,14 @@ static int snapc_full_global_checkpoint(orte_jobid_t jobid, goto cleanup; } - OPAL_OUTPUT_VERBOSE((20, mca_snapc_full_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((20, mca_snapc_full_component.super.output_handle, "Global) Using the checkpoint directory (%s)\n", *global_snapshot_handle)); /********************** * Notify the Local Snapshot Coordinators of the checkpoint request **********************/ - OPAL_OUTPUT_VERBOSE((15, mca_snapc_full_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((15, mca_snapc_full_component.super.output_handle, "Global) Notifying the Local Coordinators\n")); if( ORTE_SUCCESS != (ret = snapc_full_global_notify_checkpoint(*global_snapshot_handle, @@ -1321,15 +1320,15 @@ static int snapc_full_global_gather_all_files(void) { orte_snapc_full_global_snapshot_t *vpid_snapshot; vpid_snapshot = (orte_snapc_full_global_snapshot_t*)item; - OPAL_OUTPUT_VERBOSE((20, mca_snapc_full_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((20, mca_snapc_full_component.super.output_handle, "Global) Updating Metadata - Files stored in place, no transfer required:\n")); - OPAL_OUTPUT_VERBOSE((20, mca_snapc_full_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((20, mca_snapc_full_component.super.output_handle, "Global) State: %d\n", (int)vpid_snapshot->super.state)); - OPAL_OUTPUT_VERBOSE((20, mca_snapc_full_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((20, mca_snapc_full_component.super.output_handle, "Global) Remote Location: [%s]\n", vpid_snapshot->super.crs_snapshot_super.remote_location)); - OPAL_OUTPUT_VERBOSE((20, mca_snapc_full_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((20, mca_snapc_full_component.super.output_handle, "Global) Local Location: [%s]\n", vpid_snapshot->super.crs_snapshot_super.local_location)); @@ -1365,15 +1364,15 @@ static int snapc_full_global_gather_all_files(void) { orte_snapc_full_global_snapshot_t *vpid_snapshot; vpid_snapshot = (orte_snapc_full_global_snapshot_t*)item; - OPAL_OUTPUT_VERBOSE((20, mca_snapc_full_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((20, mca_snapc_full_component.super.output_handle, "Global) Getting remote directory:\n")); - OPAL_OUTPUT_VERBOSE((20, mca_snapc_full_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((20, mca_snapc_full_component.super.output_handle, "Global) Status: (%d)\n", (int)vpid_snapshot->super.state)); - OPAL_OUTPUT_VERBOSE((20, mca_snapc_full_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((20, mca_snapc_full_component.super.output_handle, "Global) Remote Location: (%s)\n", vpid_snapshot->super.crs_snapshot_super.remote_location)); - OPAL_OUTPUT_VERBOSE((20, mca_snapc_full_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((20, mca_snapc_full_component.super.output_handle, "Global) Local Location: (%s)\n", vpid_snapshot->super.crs_snapshot_super.local_location)); @@ -1426,7 +1425,7 @@ static int snapc_full_global_gather_all_files(void) { /* * Wait for all the transfers to complete */ - OPAL_OUTPUT_VERBOSE((20, mca_snapc_full_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((20, mca_snapc_full_component.super.output_handle, "Global) Getting remote directory: Waiting...\n")); if(ORTE_SUCCESS != (ret = orte_filem.wait_all(&all_filem_requests) ) ) { exit_status = ret; @@ -1450,7 +1449,7 @@ static int snapc_full_global_gather_all_files(void) { /* * Update all of the metadata */ - OPAL_OUTPUT_VERBOSE((20, mca_snapc_full_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((20, mca_snapc_full_component.super.output_handle, "Global) Getting remote directory: Updating Metadata...\n")); for(item = opal_list_get_first(&global_snapshot.snapshots); item != opal_list_get_end(&global_snapshot.snapshots); @@ -1470,7 +1469,7 @@ static int snapc_full_global_gather_all_files(void) { /* * Wait for all the removes to complete */ - OPAL_OUTPUT_VERBOSE((20, mca_snapc_full_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((20, mca_snapc_full_component.super.output_handle, "Global) Waiting for removes to complete...\n")); if(ORTE_SUCCESS != (ret = orte_filem.wait_all(&all_filem_requests) ) ) { exit_status = ret; diff --git a/orte/mca/snapc/full/snapc_full_local.c b/orte/mca/snapc/full/snapc_full_local.c index ffc9e2bc00..63c7394761 100644 --- a/orte/mca/snapc/full/snapc_full_local.c +++ b/orte/mca/snapc/full/snapc_full_local.c @@ -40,8 +40,6 @@ #include "opal/runtime/opal_progress.h" #include "opal/runtime/opal_cr.h" -#include "opal/util/output.h" -#include "opal/util/show_help.h" #include "opal/util/argv.h" #include "opal/util/opal_environ.h" #include "opal/util/os_dirpath.h" @@ -52,6 +50,7 @@ #include "opal/mca/crs/crs.h" #include "opal/mca/crs/base/base.h" +#include "orte/util/output.h" #include "orte/util/name_fns.h" #include "orte/runtime/orte_wait.h" #include "orte/util/proc_info.h" @@ -138,7 +137,7 @@ int local_coord_setup_job(orte_jobid_t jobid) snapc_local_jobid = jobid; OBJ_CONSTRUCT(&snapc_local_vpids, opal_list_t); - OPAL_OUTPUT_VERBOSE((10, mca_snapc_full_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((10, mca_snapc_full_component.super.output_handle, "Local) Monitor local jobid %s\n", ORTE_JOBID_PRINT(snapc_local_jobid))); @@ -178,7 +177,7 @@ int local_coord_setup_job(orte_jobid_t jobid) } - OPAL_OUTPUT_VERBOSE((10, mca_snapc_full_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((10, mca_snapc_full_component.super.output_handle, "Local) Finished setting up job\n")); cleanup: @@ -250,7 +249,7 @@ static int snapc_full_local_start_listener(void) return ORTE_SUCCESS; } - OPAL_OUTPUT_VERBOSE((5, mca_snapc_full_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((5, mca_snapc_full_component.super.output_handle, "Local) Receive: Start command recv")); /* @@ -287,7 +286,7 @@ static int snapc_full_local_stop_listener(void) return ORTE_SUCCESS; } - OPAL_OUTPUT_VERBOSE((5, mca_snapc_full_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((5, mca_snapc_full_component.super.output_handle, "Local) Receive stop command recv")); if (ORTE_SUCCESS != (rc = orte_rml.recv_cancel(ORTE_NAME_WILDCARD, @@ -312,7 +311,7 @@ static int snapc_full_local_start_proc_listener(void) return ORTE_SUCCESS; } - OPAL_OUTPUT_VERBOSE((5, mca_snapc_full_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((5, mca_snapc_full_component.super.output_handle, "Local) Receive (Command line): Start command recv")); /* @@ -343,7 +342,7 @@ static int snapc_full_local_stop_proc_listener(void) return ORTE_SUCCESS; } - OPAL_OUTPUT_VERBOSE((5, mca_snapc_full_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((5, mca_snapc_full_component.super.output_handle, "Local) Receive (Command Line) stop command")); if (ORTE_SUCCESS != (rc = orte_rml.recv_cancel(ORTE_NAME_WILDCARD, @@ -369,14 +368,14 @@ void snapc_full_local_cmd_recv(int status, orte_std_cntr_t count; int rc; - OPAL_OUTPUT_VERBOSE((5, mca_snapc_full_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((5, mca_snapc_full_component.super.output_handle, "Local) Receive a command message.")); /* * This is the local process contacting us with its updated pid information */ if( ORTE_RML_TAG_SNAPC == tag ) { - OPAL_OUTPUT_VERBOSE((10, mca_snapc_full_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((10, mca_snapc_full_component.super.output_handle, "Local) Application: Update pid operation")); snapc_full_local_process_app_update_cmd(sender, buffer); return; @@ -393,20 +392,20 @@ void snapc_full_local_cmd_recv(int status, switch (command) { case ORTE_SNAPC_FULL_UPDATE_JOB_STATE_CMD: - OPAL_OUTPUT_VERBOSE((10, mca_snapc_full_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((10, mca_snapc_full_component.super.output_handle, "Local) Command: Update Job state command")); snapc_full_local_process_job_update_cmd(sender, buffer); break; case ORTE_SNAPC_FULL_UPDATE_PROC_STATE_CMD: - OPAL_OUTPUT_VERBOSE((10, mca_snapc_full_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((10, mca_snapc_full_component.super.output_handle, "Local) Command: Update Job state command")); /* Nothing to do */ break; case ORTE_SNAPC_FULL_VPID_ASSOC_CMD: - OPAL_OUTPUT_VERBOSE((10, mca_snapc_full_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((10, mca_snapc_full_component.super.output_handle, "Local) Command: Update process/orted associations")); /* Nothing to do */ @@ -478,13 +477,13 @@ int local_coord_job_state_update(orte_jobid_t jobid, orte_snapc_full_local_snapshot_t *vpid_snapshot; opal_list_item_t* item = NULL; - OPAL_OUTPUT_VERBOSE((20, mca_snapc_full_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((20, mca_snapc_full_component.super.output_handle, "Local) Job State: %d\n", (int)job_ckpt_state)); - OPAL_OUTPUT_VERBOSE((20, mca_snapc_full_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((20, mca_snapc_full_component.super.output_handle, "Local) Snapshot Ref: (%s)\n", *job_ckpt_ref)); - OPAL_OUTPUT_VERBOSE((20, mca_snapc_full_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((20, mca_snapc_full_component.super.output_handle, "Local) Remote Location: (%s)\n", *job_ckpt_loc)); @@ -585,7 +584,7 @@ int local_coord_job_state_update(orte_jobid_t jobid, ORTE_SNAPC_CKPT_STATE_FINISHED == job_ckpt_state ) { if( cur_job_ckpt_state == ORTE_SNAPC_CKPT_STATE_FILE_XFER ) { - OPAL_OUTPUT_VERBOSE((20, mca_snapc_full_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((20, mca_snapc_full_component.super.output_handle, "Local) Already released processes on file transfer. Mark job as finished\n")); cur_job_ckpt_state = job_ckpt_state; exit_status = ORTE_SUCCESS; @@ -602,12 +601,12 @@ int local_coord_job_state_update(orte_jobid_t jobid, item = opal_list_get_next(item) ) { vpid_snapshot = (orte_snapc_full_local_snapshot_t*)item; - OPAL_OUTPUT_VERBOSE((15, mca_snapc_full_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((15, mca_snapc_full_component.super.output_handle, "Local) Job Ckpt finished tell process %s\n", ORTE_NAME_PRINT(&vpid_snapshot->super.process_name))); if( ORTE_SUCCESS != (ret = snapc_full_local_end_ckpt_handshake(vpid_snapshot) ) ) { - opal_output(mca_snapc_full_component.super.output_handle, + orte_output(mca_snapc_full_component.super.output_handle, "Local) Error: Unable to finish the handshake with peer %s. %d\n", ORTE_NAME_PRINT(&vpid_snapshot->super.process_name), ret); exit_status = OPAL_ERROR; @@ -645,7 +644,7 @@ static void snapc_full_local_process_app_update_cmd(orte_process_name_t* sender, } if( ORTE_SNAPC_LOCAL_UPDATE_CMD != command ) { - OPAL_OUTPUT_VERBOSE((10, mca_snapc_full_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((10, mca_snapc_full_component.super.output_handle, "Local) Warning: Expected an application command (%d) but received (%d)\n", ORTE_SNAPC_LOCAL_UPDATE_CMD, command)); return; @@ -763,11 +762,11 @@ static int snapc_full_establish_dir(void) * Global Coordinator: Operate locally */ if( ORTE_SNAPC_GLOBAL_COORD_TYPE == (orte_snapc_coord_type & ORTE_SNAPC_GLOBAL_COORD_TYPE)) { - opal_output(0, "Error: Not supported!\n"); + orte_output(0, "Error: Not supported!\n"); return ORTE_SUCCESS; } - OPAL_OUTPUT_VERBOSE((10, mca_snapc_full_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((10, mca_snapc_full_component.super.output_handle, "Local) Contact the HNP for global snapshot directory information to establish\n")); /* Notify HNP of request for information */ @@ -788,7 +787,7 @@ static int snapc_full_establish_dir(void) OBJ_DESTRUCT(&buffer); /* Wait for the HNP to release us */ - OPAL_OUTPUT_VERBOSE((10, mca_snapc_full_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((10, mca_snapc_full_component.super.output_handle, "Local) Wait for response to global snapshot directory information request\n")); OBJ_CONSTRUCT(&buffer, opal_buffer_t); @@ -831,7 +830,7 @@ static int snapc_full_establish_dir(void) orte_snapc_base_global_snapshot_loc = strdup(ckpt_snapshot_loc); } - OPAL_OUTPUT_VERBOSE((10, mca_snapc_full_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((10, mca_snapc_full_component.super.output_handle, "Local) The global snapshot directory has been established at [%s]\n", orte_snapc_base_global_snapshot_loc)); @@ -972,16 +971,16 @@ static int orte_snapc_full_local_set_vpid_ckpt_info( orte_process_name_t proc, return ORTE_SUCCESS; } - OPAL_OUTPUT_VERBOSE((20, mca_snapc_full_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((20, mca_snapc_full_component.super.output_handle, "Local) Process %s: Changed state to:\n", ORTE_NAME_PRINT(&proc))); - OPAL_OUTPUT_VERBOSE((20, mca_snapc_full_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((20, mca_snapc_full_component.super.output_handle, "Local) State: %d\n", (int)ckpt_state)); - OPAL_OUTPUT_VERBOSE((20, mca_snapc_full_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((20, mca_snapc_full_component.super.output_handle, "Local) Snapshot Ref: [%s]\n", ckpt_snapshot_ref)); - OPAL_OUTPUT_VERBOSE((20, mca_snapc_full_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((20, mca_snapc_full_component.super.output_handle, "Local) Location: [%s]\n", ckpt_snapshot_loc)); @@ -1083,7 +1082,7 @@ static int snapc_full_local_start_checkpoint_all(size_t ckpt_state) goto cleanup; } - OPAL_OUTPUT_VERBOSE((20, mca_snapc_full_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((20, mca_snapc_full_component.super.output_handle, "Local) Using directory (%s)\n", vpid_snapshot->super.crs_snapshot_super.local_location)); @@ -1091,7 +1090,7 @@ static int snapc_full_local_start_checkpoint_all(size_t ckpt_state) if( vpid_snapshot->super.process_pid == 0 ) { ret = snapc_full_local_get_vpids(); if( ORTE_SUCCESS != ret || vpid_snapshot->super.process_pid == 0 ) { - opal_output( mca_snapc_full_component.super.output_handle, + orte_output( mca_snapc_full_component.super.output_handle, "local) Cannot checkpoint an invalid pid (%d)\n", vpid_snapshot->super.process_pid); exit_status = ORTE_ERROR; @@ -1122,7 +1121,7 @@ static int snapc_full_local_start_checkpoint_all(size_t ckpt_state) asprintf(&(vpid_snapshot->comm_pipe_r), "%s/%s.%s", opal_cr_pipe_dir, OPAL_CR_NAMED_PROG_W, tmp_pid); } - OPAL_OUTPUT_VERBOSE((20, mca_snapc_full_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((20, mca_snapc_full_component.super.output_handle, "Local) Signal process (%d) with signal %d\n", (int) vpid_snapshot->super.process_pid, opal_cr_entry_point_signal)); @@ -1131,7 +1130,7 @@ static int snapc_full_local_start_checkpoint_all(size_t ckpt_state) * Signal the application */ if( 0 != (ret = kill(vpid_snapshot->super.process_pid, opal_cr_entry_point_signal) ) ) { - opal_output(mca_snapc_full_component.super.output_handle, + orte_output(mca_snapc_full_component.super.output_handle, "local) Error: Failed to signal process %d with signal %d. %d\n", (int) vpid_snapshot->super.process_pid, opal_cr_entry_point_signal, @@ -1150,7 +1149,7 @@ static int snapc_full_local_start_checkpoint_all(size_t ckpt_state) vpid_snapshot = (orte_snapc_full_local_snapshot_t*)item; if( ORTE_SUCCESS != (ret = snapc_full_local_start_ckpt_open_comm(vpid_snapshot) ) ) { - opal_output(mca_snapc_full_component.super.output_handle, + orte_output(mca_snapc_full_component.super.output_handle, "local) Error: Unable to initiate the handshake with peer %s. %d\n", ORTE_NAME_PRINT(&vpid_snapshot->super.process_name), ret); exit_status = OPAL_ERROR; @@ -1178,7 +1177,7 @@ static int snapc_full_local_start_checkpoint_all(size_t ckpt_state) vpid_snapshot = (orte_snapc_full_local_snapshot_t*)item; if( ORTE_SUCCESS != (ret = snapc_full_local_start_ckpt_handshake_term(vpid_snapshot, ckpt_n_term) ) ) { - opal_output(mca_snapc_full_component.super.output_handle, + orte_output(mca_snapc_full_component.super.output_handle, "local) Error: Unable to initiate the handshake with peer %s. %d\n", ORTE_NAME_PRINT(&vpid_snapshot->super.process_name), ret); exit_status = OPAL_ERROR; @@ -1195,7 +1194,7 @@ static int snapc_full_local_start_checkpoint_all(size_t ckpt_state) vpid_snapshot = (orte_snapc_full_local_snapshot_t*)item; if( ORTE_SUCCESS != (ret = snapc_full_local_start_ckpt_handshake(vpid_snapshot) ) ) { - opal_output(mca_snapc_full_component.super.output_handle, + orte_output(mca_snapc_full_component.super.output_handle, "local) Error: Unable to initiate the handshake with peer %s. %d\n", ORTE_NAME_PRINT(&vpid_snapshot->super.process_name), ret); exit_status = OPAL_ERROR; @@ -1227,7 +1226,7 @@ static int snapc_full_local_start_ckpt_open_comm(orte_snapc_full_local_snapshot_ /* * Wait for the named pipes to be created */ - OPAL_OUTPUT_VERBOSE((10, mca_snapc_full_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((10, mca_snapc_full_component.super.output_handle, "Local) Waiting for process %s's pipes (%s) (%s)\n", ORTE_NAME_PRINT(&vpid_snapshot->super.process_name), vpid_snapshot->comm_pipe_w, @@ -1239,7 +1238,7 @@ static int snapc_full_local_start_ckpt_open_comm(orte_snapc_full_local_snapshot_ if( 0 > (ret = access(vpid_snapshot->comm_pipe_r, F_OK) )) { /* File doesn't exist yet, keep waiting */ if( s_time >= max_wait_time - 5 ) { - OPAL_OUTPUT_VERBOSE((15, mca_snapc_full_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((15, mca_snapc_full_component.super.output_handle, "Local) File does not exist yet: <%s> rtn = %d (waited %d/%d usec)\n", vpid_snapshot->comm_pipe_r, ret, s_time, max_wait_time)); } @@ -1250,7 +1249,7 @@ static int snapc_full_local_start_ckpt_open_comm(orte_snapc_full_local_snapshot_ else if( 0 > (ret = access(vpid_snapshot->comm_pipe_w, F_OK) )) { /* File doesn't exist yet, keep waiting */ if( s_time >= max_wait_time - 5 ) { - OPAL_OUTPUT_VERBOSE((15, mca_snapc_full_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((15, mca_snapc_full_component.super.output_handle, "Local) File does not exist yet: <%s> rtn = %d (waited %d/%d usec)\n", vpid_snapshot->comm_pipe_w, ret, s_time, max_wait_time)); } @@ -1271,7 +1270,7 @@ static int snapc_full_local_start_ckpt_open_comm(orte_snapc_full_local_snapshot_ * - Isn't checkpointable * In either case there is nothing we can do. */ - opal_show_help("help-opal-checkpoint.txt", "pid_does_not_exist", true, + orte_show_help("help-opal-checkpoint.txt", "pid_does_not_exist", true, vpid_snapshot->super.process_pid, vpid_snapshot->comm_pipe_r, vpid_snapshot->comm_pipe_w); @@ -1291,7 +1290,7 @@ static int snapc_full_local_start_ckpt_open_comm(orte_snapc_full_local_snapshot_ */ vpid_snapshot->comm_pipe_w_fd = open(vpid_snapshot->comm_pipe_w, O_WRONLY); if(vpid_snapshot->comm_pipe_w_fd < 0) { - opal_output(mca_snapc_full_component.super.output_handle, + orte_output(mca_snapc_full_component.super.output_handle, "local) Error: Unable to open name pipe (%s). %d\n", vpid_snapshot->comm_pipe_w, vpid_snapshot->comm_pipe_w_fd); exit_status = OPAL_ERROR; @@ -1300,7 +1299,7 @@ static int snapc_full_local_start_ckpt_open_comm(orte_snapc_full_local_snapshot_ vpid_snapshot->comm_pipe_r_fd = open(vpid_snapshot->comm_pipe_r, O_RDWR); if(vpid_snapshot->comm_pipe_r_fd < 0) { - opal_output(mca_snapc_full_component.super.output_handle, + orte_output(mca_snapc_full_component.super.output_handle, "local) Error: Unable to open name pipe (%s). %d\n", vpid_snapshot->comm_pipe_r, vpid_snapshot->comm_pipe_r_fd); exit_status = OPAL_ERROR; @@ -1322,13 +1321,13 @@ static int snapc_full_local_start_ckpt_handshake_term(orte_snapc_full_local_snap term_rep = (int)term; if( term ) { - OPAL_OUTPUT_VERBOSE((10, mca_snapc_full_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((10, mca_snapc_full_component.super.output_handle, "Local) Tell app to TERMINATE after completion of checkpoint. [%s (%d)]\n", (term ? "True" : "False"), term_rep)); } if( sizeof(int) != (ret = write(vpid_snapshot->comm_pipe_w_fd, &term_rep, sizeof(int))) ) { - opal_output(mca_snapc_full_component.super.output_handle, + orte_output(mca_snapc_full_component.super.output_handle, "local) Error: Unable to write term (%d) to named pipe (%s), %d\n", term, vpid_snapshot->comm_pipe_w, ret); exit_status = OPAL_ERROR; @@ -1350,7 +1349,7 @@ static int snapc_full_local_start_ckpt_handshake(orte_snapc_full_local_snapshot_ * Wait for the appliation to respond */ if( sizeof(int) != (ret = read(vpid_snapshot->comm_pipe_r_fd, &value, sizeof(int))) ) { - opal_output(mca_snapc_full_component.super.output_handle, + orte_output(mca_snapc_full_component.super.output_handle, "local) Error: Unable to read length from named pipe (%s). %d\n", vpid_snapshot->comm_pipe_r, ret); exit_status = OPAL_ERROR; @@ -1359,7 +1358,7 @@ static int snapc_full_local_start_ckpt_handshake(orte_snapc_full_local_snapshot_ /* Check the response to make sure we can checkpoint this process */ if( OPAL_CHECKPOINT_CMD_IN_PROGRESS == value ) { - opal_show_help("help-opal-checkpoint.txt", + orte_show_help("help-opal-checkpoint.txt", "ckpt:in_progress", true, vpid_snapshot->super.process_pid); @@ -1367,7 +1366,7 @@ static int snapc_full_local_start_ckpt_handshake(orte_snapc_full_local_snapshot_ goto cleanup; } else if( OPAL_CHECKPOINT_CMD_NULL == value ) { - opal_show_help("help-opal-checkpoint.txt", + orte_show_help("help-opal-checkpoint.txt", "ckpt:req_null", true, vpid_snapshot->super.process_pid); @@ -1375,7 +1374,7 @@ static int snapc_full_local_start_ckpt_handshake(orte_snapc_full_local_snapshot_ goto cleanup; } else if ( OPAL_CHECKPOINT_CMD_ERROR == value ) { - opal_show_help("help-opal-checkpoint.txt", + orte_show_help("help-opal-checkpoint.txt", "ckpt:req_error", true, vpid_snapshot->super.process_pid); @@ -1396,7 +1395,7 @@ static int snapc_full_local_start_ckpt_handshake(orte_snapc_full_local_snapshot_ */ len = strlen(vpid_snapshot->super.crs_snapshot_super.reference_name) + 1; if( sizeof(int) != (ret = write(vpid_snapshot->comm_pipe_w_fd, &len, sizeof(int))) ) { - opal_output(mca_snapc_full_component.super.output_handle, + orte_output(mca_snapc_full_component.super.output_handle, "local) Error: Unable to write snapshot name len (%d) to named pipe (%s). %d\n", len, vpid_snapshot->comm_pipe_w, ret); exit_status = OPAL_ERROR; @@ -1405,7 +1404,7 @@ static int snapc_full_local_start_ckpt_handshake(orte_snapc_full_local_snapshot_ tmp_size = sizeof(char) * len; if( tmp_size != (ret = write(vpid_snapshot->comm_pipe_w_fd, (vpid_snapshot->super.crs_snapshot_super.reference_name), (sizeof(char) * len))) ) { - opal_output(mca_snapc_full_component.super.output_handle, + orte_output(mca_snapc_full_component.super.output_handle, "local) Error: Unable to write snapshot name (%s) to named pipe (%s). %d\n", vpid_snapshot->super.crs_snapshot_super.reference_name, vpid_snapshot->comm_pipe_w, ret); exit_status = OPAL_ERROR; @@ -1419,7 +1418,7 @@ static int snapc_full_local_start_ckpt_handshake(orte_snapc_full_local_snapshot_ local_dir = opal_dirname(local_dir); len = strlen(local_dir) + 1; if( sizeof(int) != (ret = write(vpid_snapshot->comm_pipe_w_fd, &len, sizeof(int))) ) { - opal_output(mca_snapc_full_component.super.output_handle, + orte_output(mca_snapc_full_component.super.output_handle, "local) Error: Unable to write snapshot location len (%d) to named pipe (%s). %d\n", len, vpid_snapshot->comm_pipe_w, ret); exit_status = OPAL_ERROR; @@ -1428,7 +1427,7 @@ static int snapc_full_local_start_ckpt_handshake(orte_snapc_full_local_snapshot_ tmp_size = sizeof(char) * len; if( tmp_size != (ret = write(vpid_snapshot->comm_pipe_w_fd, (local_dir), (sizeof(char) * len))) ) { - opal_output(mca_snapc_full_component.super.output_handle, + orte_output(mca_snapc_full_component.super.output_handle, "local) Error: Unable to write snapshot location (%s) to named pipe (%s). %d\n", local_dir, vpid_snapshot->comm_pipe_w, ret); exit_status = OPAL_ERROR; @@ -1466,7 +1465,7 @@ static int snapc_full_local_end_ckpt_handshake(orte_snapc_full_local_snapshot_t * Finish the handshake. */ if( sizeof(int) != (ret = write(vpid_snapshot->comm_pipe_w_fd, &last_cmd, sizeof(int))) ) { - opal_output(mca_snapc_full_component.super.output_handle, + orte_output(mca_snapc_full_component.super.output_handle, "local) Error: Unable to release process %s (%d)\n", ORTE_NAME_PRINT(&vpid_snapshot->super.process_name), ret); exit_status = OPAL_ERROR; @@ -1494,7 +1493,7 @@ static void snapc_full_local_comm_read_event(int fd, short flags, void *arg) vpid_snapshot = (orte_snapc_full_local_snapshot_t *)arg; - OPAL_OUTPUT_VERBOSE((10, mca_snapc_full_component.super.output_handle, + ORTE_OUTPUT_VERBOSE((10, mca_snapc_full_component.super.output_handle, "Local) Read Event: Process %s done...\n", ORTE_NAME_PRINT(&vpid_snapshot->super.process_name))); @@ -1502,7 +1501,7 @@ static void snapc_full_local_comm_read_event(int fd, short flags, void *arg) * Get the final state of the checkpoint from the checkpointing process */ if( sizeof(int) != (ret = read(vpid_snapshot->comm_pipe_r_fd, &ckpt_state, sizeof(int))) ) { - opal_output(mca_snapc_full_component.super.output_handle, + orte_output(mca_snapc_full_component.super.output_handle, "local) Error: Unable to read state from named pipe (%s). %d\n", vpid_snapshot->comm_pipe_r, ret); exit_status = OPAL_ERROR; diff --git a/orte/mca/snapc/full/snapc_full_module.c b/orte/mca/snapc/full/snapc_full_module.c index ea764bd3af..54892a5f73 100644 --- a/orte/mca/snapc/full/snapc_full_module.c +++ b/orte/mca/snapc/full/snapc_full_module.c @@ -25,14 +25,12 @@ #include "opal/mca/mca.h" #include "opal/mca/base/base.h" -#include "opal/util/output.h" #include "opal/mca/base/mca_base_param.h" -#include "opal/util/output.h" -#include "opal/util/show_help.h" #include "opal/util/argv.h" #include "opal/util/opal_environ.h" +#include "orte/util/output.h" #include "orte/mca/snapc/snapc.h" #include "orte/mca/snapc/base/base.h" @@ -127,7 +125,7 @@ void orte_snapc_full_local_destruct( orte_snapc_full_local_snapshot_t *obj) { */ int orte_snapc_full_component_query(mca_base_module_t **module, int *priority) { - opal_output_verbose(10, mca_snapc_full_component.super.output_handle, + orte_output_verbose(10, mca_snapc_full_component.super.output_handle, "snapc:full: component_query()"); *priority = mca_snapc_full_component.super.priority; @@ -140,14 +138,14 @@ int orte_snapc_full_module_init(bool seed, bool app) { int ret, exit_status = ORTE_SUCCESS; - opal_output_verbose(10, mca_snapc_full_component.super.output_handle, + orte_output_verbose(10, mca_snapc_full_component.super.output_handle, "snapc:full: module_init(%d, %d)", seed, app); /* * Global Snapshot Coordinator */ if(seed) { - opal_output_verbose(5, mca_snapc_full_component.super.output_handle, + orte_output_verbose(5, mca_snapc_full_component.super.output_handle, "snapc:full: module_init: Global Snapshot Coordinator"); orte_snapc_coord_type |= ORTE_SNAPC_GLOBAL_COORD_TYPE; @@ -167,7 +165,7 @@ int orte_snapc_full_module_init(bool seed, bool app) * JJH or from the HNP inside the application. * JJH so for this component we assume that there exists a local coordinator */ - opal_output_verbose(5, mca_snapc_full_component.super.output_handle, + orte_output_verbose(5, mca_snapc_full_component.super.output_handle, "snapc:full: module_init: Local Snapshot Coordinator"); orte_snapc_coord_type |= ORTE_SNAPC_LOCAL_COORD_TYPE; @@ -181,7 +179,7 @@ int orte_snapc_full_module_init(bool seed, bool app) * Application Snapshot Coordinator */ else if(app) { - opal_output_verbose(5, mca_snapc_full_component.super.output_handle, + orte_output_verbose(5, mca_snapc_full_component.super.output_handle, "snapc:full: module_init: Application Snapshot Coordinator"); orte_snapc_coord_type |= ORTE_SNAPC_APP_COORD_TYPE; @@ -195,7 +193,7 @@ int orte_snapc_full_module_init(bool seed, bool app) /* * Logically this should not happen */ - opal_output_verbose(5, mca_snapc_full_component.super.output_handle, + orte_output_verbose(5, mca_snapc_full_component.super.output_handle, "snapc:full: module_init: Unknown Snapshot Coordinator"); orte_snapc_coord_type = ORTE_SNAPC_UNASSIGN_TYPE; @@ -210,7 +208,7 @@ int orte_snapc_full_module_init(bool seed, bool app) int orte_snapc_full_module_finalize(void) { - opal_output_verbose(10, mca_snapc_full_component.super.output_handle, + orte_output_verbose(10, mca_snapc_full_component.super.output_handle, "snapc:full: module_finalize()"); switch(orte_snapc_coord_type) diff --git a/orte/mca/snapc/snapc.h b/orte/mca/snapc/snapc.h index b35291ce88..aa02b1416b 100644 --- a/orte/mca/snapc/snapc.h +++ b/orte/mca/snapc/snapc.h @@ -76,7 +76,7 @@ #include "orte/constants.h" #include "orte/types.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "opal/mca/mca.h" #include "opal/mca/base/base.h" #include "opal/mca/crs/crs.h" @@ -214,7 +214,7 @@ struct orte_snapc_base_component_1_0_0_t { /** Verbosity Level */ int verbose; - /** Output Handle for opal_output */ + /** Output Handle for orte_output */ int output_handle; /** Default Priority */ int priority; diff --git a/orte/orted/orted_comm.c b/orte/orted/orted_comm.c index cd3ccf6761..bcb8852e75 100644 --- a/orte/orted/orted_comm.c +++ b/orte/orted/orted_comm.c @@ -48,9 +48,7 @@ #include "opal/util/daemon_init.h" #include "opal/util/opal_environ.h" #include "opal/util/os_path.h" -#include "opal/util/output.h" #include "opal/util/printf.h" -#include "opal/util/show_help.h" #include "opal/util/trace.h" #include "opal/util/argv.h" #include "opal/runtime/opal.h" @@ -59,6 +57,7 @@ #include "opal/dss/dss.h" +#include "orte/util/output.h" #include "orte/util/proc_info.h" #include "orte/util/session_dir.h" #include "orte/util/name_fns.h" @@ -107,7 +106,7 @@ static void send_relay(int fd, short event, void *data) orte_namelist_t *nm; int ret; - OPAL_OUTPUT_VERBOSE((1, orte_debug_output, + ORTE_OUTPUT_VERBOSE((1, orte_debug_output, "%s orte:daemon:send_relay", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME))); @@ -118,7 +117,7 @@ static void send_relay(int fd, short event, void *data) /* if list is empty, nothing for us to do */ if (opal_list_is_empty(&recips)) { - OPAL_OUTPUT_VERBOSE((1, orte_debug_output, + ORTE_OUTPUT_VERBOSE((1, orte_debug_output, "%s orte:daemon:send_relay - recipient list is empty!", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME))); goto CLEANUP; @@ -137,7 +136,7 @@ static void send_relay(int fd, short event, void *data) orte_jobid_t job; orte_rml_tag_t msg_tag; int32_t n; - OPAL_OUTPUT_VERBOSE((1, orte_debug_output, + ORTE_OUTPUT_VERBOSE((1, orte_debug_output, "%s orte:daemon:send_relay sending directly to job %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_JOBID_PRINT(nm->name.jobid))); @@ -222,7 +221,7 @@ static void send_relay(int fd, short event, void *data) } target.vpid = i; - OPAL_OUTPUT_VERBOSE((1, orte_debug_output, + ORTE_OUTPUT_VERBOSE((1, orte_debug_output, "%s orte:daemon:send_relay sending relay msg to %s tag %d", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(&target), tag)); @@ -236,7 +235,7 @@ static void send_relay(int fd, short event, void *data) while (NULL != (item = opal_list_remove_first(&recips))) { nm = (orte_namelist_t*)item; - OPAL_OUTPUT_VERBOSE((1, orte_debug_output, + ORTE_OUTPUT_VERBOSE((1, orte_debug_output, "%s orte:daemon:send_relay sending relay msg to %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(&nm->name))); @@ -261,7 +260,7 @@ void orte_daemon_recv(int status, orte_process_name_t* sender, opal_buffer_t *buffer, orte_rml_tag_t tag, void* cbdata) { - OPAL_OUTPUT_VERBOSE((1, orte_debug_output, + ORTE_OUTPUT_VERBOSE((1, orte_debug_output, "%s orted_recv_cmd: received message from %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(sender))); @@ -277,7 +276,7 @@ void orte_daemon_recv(int status, orte_process_name_t* sender, */ ORTE_MESSAGE_EVENT(sender, buffer, tag, orte_daemon_cmd_processor); - OPAL_OUTPUT_VERBOSE((1, orte_debug_output, + ORTE_OUTPUT_VERBOSE((1, orte_debug_output, "%s orted_recv_cmd: reissued recv", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME))); } @@ -294,7 +293,7 @@ void orte_daemon_cmd_processor(int fd, short event, void *data) orte_std_cntr_t n; orte_daemon_cmd_flag_t command; - OPAL_OUTPUT_VERBOSE((1, orte_debug_output, + ORTE_OUTPUT_VERBOSE((1, orte_debug_output, "%s orte:daemon:cmd:processor called by %s for tag %ld", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(sender), @@ -308,7 +307,7 @@ void orte_daemon_cmd_processor(int fd, short event, void *data) if (ORTE_SUCCESS != (ret = opal_dss.unpack(buffer, &command, &n, ORTE_DAEMON_CMD))) { ORTE_ERROR_LOG(ret); #if OMPI_ENABLE_DEBUG - opal_output(0, "%s got message buffer from file %s line %d\n", + orte_output(0, "%s got message buffer from file %s line %d\n", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), mev->file, mev->line); #endif goto CLEANUP; @@ -345,12 +344,12 @@ void orte_daemon_cmd_processor(int fd, short event, void *data) /* process the command */ if (ORTE_SUCCESS != (ret = process_commands(sender, buffer, tag))) { - OPAL_OUTPUT_VERBOSE((1, orte_debug_output, + ORTE_OUTPUT_VERBOSE((1, orte_debug_output, "%s orte:daemon:cmd:processor failed on error %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_ERROR_NAME(ret))); } - OPAL_OUTPUT_VERBOSE((1, orte_debug_output, + ORTE_OUTPUT_VERBOSE((1, orte_debug_output, "%s orte:daemon:cmd:processor: processing commands completed", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME))); @@ -409,7 +408,7 @@ static int process_commands(orte_process_name_t* sender, /**** SIGNAL_LOCAL_PROCS ****/ case ORTE_DAEMON_SIGNAL_LOCAL_PROCS: if (orte_debug_daemons_flag) { - opal_output(0, "%s orted_cmd: received signal_local_procs", + orte_output(0, "%s orted_cmd: received signal_local_procs", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME)); } /* unpack the jobid */ @@ -435,12 +434,12 @@ static int process_commands(orte_process_name_t* sender, /**** ADD_LOCAL_PROCS ****/ case ORTE_DAEMON_ADD_LOCAL_PROCS: if (orte_debug_daemons_flag) { - opal_output(0, "%s orted_cmd: received add_local_procs", + orte_output(0, "%s orted_cmd: received add_local_procs", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME)); } /* launch the processes */ if (ORTE_SUCCESS != (ret = orte_odls.launch_local_procs(buffer))) { - OPAL_OUTPUT_VERBOSE((1, orte_debug_output, + ORTE_OUTPUT_VERBOSE((1, orte_debug_output, "%s orted:comm:add_procs failed to launch on error %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_ERROR_NAME(ret))); } @@ -449,7 +448,7 @@ static int process_commands(orte_process_name_t* sender, /**** TREE_SPAWN ****/ case ORTE_DAEMON_TREE_SPAWN: if (orte_debug_daemons_flag) { - opal_output(0, "%s orted_cmd: received tree_spawn", + orte_output(0, "%s orted_cmd: received tree_spawn", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME)); } /* if the PLM supports remote spawn, pass it all along */ @@ -458,14 +457,14 @@ static int process_commands(orte_process_name_t* sender, ORTE_ERROR_LOG(ret); } } else { - opal_output(0, "%s remote spawn is NULL!", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME)); + orte_output(0, "%s remote spawn is NULL!", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME)); } break; /**** DELIVER A MESSAGE TO THE LOCAL PROCS ****/ case ORTE_DAEMON_MESSAGE_LOCAL_PROCS: if (orte_debug_daemons_flag) { - opal_output(0, "%s orted_cmd: received message_local_procs", + orte_output(0, "%s orted_cmd: received message_local_procs", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME)); } @@ -483,7 +482,7 @@ static int process_commands(orte_process_name_t* sender, goto CLEANUP; } - OPAL_OUTPUT_VERBOSE((1, orte_debug_output, + ORTE_OUTPUT_VERBOSE((1, orte_debug_output, "%s orted:comm:message_local_procs delivering message to job %s tag %d", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_JOBID_PRINT(job), (int)target_tag)); @@ -547,7 +546,7 @@ static int process_commands(orte_process_name_t* sender, /**** COLLECTIVE DATA COMMAND ****/ case ORTE_DAEMON_COLL_CMD: if (orte_debug_daemons_flag) { - opal_output(0, "%s orted_cmd: received collective data cmd", + orte_output(0, "%s orted_cmd: received collective data cmd", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME)); } if (ORTE_SUCCESS != (ret = orte_odls.collect_data(sender, buffer))) { @@ -568,7 +567,7 @@ static int process_commands(orte_process_name_t* sender, * the same as a "hard kill" command */ if (orte_debug_daemons_flag) { - opal_output(0, "%s orted_cmd: received exit", + orte_output(0, "%s orted_cmd: received exit", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME)); } /* trigger our appropriate exit procedure @@ -582,7 +581,7 @@ static int process_commands(orte_process_name_t* sender, /**** HALT VM COMMAND ****/ case ORTE_DAEMON_HALT_VM_CMD: if (orte_debug_daemons_flag) { - opal_output(0, "%s orted_cmd: received halt vm", + orte_output(0, "%s orted_cmd: received halt vm", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME)); } /* trigger our appropriate exit procedure @@ -596,7 +595,7 @@ static int process_commands(orte_process_name_t* sender, /**** SPAWN JOB COMMAND ****/ case ORTE_DAEMON_SPAWN_JOB_CMD: if (orte_debug_daemons_flag) { - opal_output(0, "%s orted_cmd: received spawn job", + orte_output(0, "%s orted_cmd: received spawn job", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME)); } answer = OBJ_NEW(opal_buffer_t); @@ -636,7 +635,7 @@ static int process_commands(orte_process_name_t* sender, /**** CONTACT QUERY COMMAND ****/ case ORTE_DAEMON_CONTACT_QUERY_CMD: if (orte_debug_daemons_flag) { - opal_output(0, "%s orted_cmd: received contact query", + orte_output(0, "%s orted_cmd: received contact query", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME)); } /* send back contact info */ @@ -666,7 +665,7 @@ static int process_commands(orte_process_name_t* sender, /**** REPORT_JOB_INFO_CMD COMMAND ****/ case ORTE_DAEMON_REPORT_JOB_INFO_CMD: if (orte_debug_daemons_flag) { - opal_output(0, "%s orted_cmd: received job info query", + orte_output(0, "%s orted_cmd: received job info query", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME)); } /* if we are not the HNP, we can do nothing - report @@ -742,7 +741,7 @@ static int process_commands(orte_process_name_t* sender, /**** REPORT_NODE_INFO_CMD COMMAND ****/ case ORTE_DAEMON_REPORT_NODE_INFO_CMD: if (orte_debug_daemons_flag) { - opal_output(0, "%s orted_cmd: received node info query", + orte_output(0, "%s orted_cmd: received node info query", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME)); } /* if we are not the HNP, we can do nothing - report @@ -825,7 +824,7 @@ static int process_commands(orte_process_name_t* sender, /**** REPORT_PROC_INFO_CMD COMMAND ****/ case ORTE_DAEMON_REPORT_PROC_INFO_CMD: if (orte_debug_daemons_flag) { - opal_output(0, "%s orted_cmd: received proc info query", + orte_output(0, "%s orted_cmd: received proc info query", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME)); } /* if we are not the HNP, we can do nothing - report @@ -918,7 +917,7 @@ SEND_ANSWER: /**** ATTACH_STDIO COMMAND ****/ case ORTE_DAEMON_ATTACH_STDOUT_CMD: if (orte_debug_daemons_flag) { - opal_output(0, "%s orted_cmd: received attach stdio cmd", + orte_output(0, "%s orted_cmd: received attach stdio cmd", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME)); } #if 0 @@ -1021,7 +1020,7 @@ SEND_ANSWER: /**** SYNC FROM LOCAL PROC ****/ case ORTE_DAEMON_SYNC_BY_PROC: if (orte_debug_daemons_flag) { - opal_output(0, "%s orted_recv: received sync from local proc %s", + orte_output(0, "%s orted_recv: received sync from local proc %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(sender)); } @@ -1033,7 +1032,7 @@ SEND_ANSWER: case ORTE_DAEMON_SYNC_WANT_NIDMAP: if (orte_debug_daemons_flag) { - opal_output(0, "%s orted_recv: received sync+nidmap from local proc %s", + orte_output(0, "%s orted_recv: received sync+nidmap from local proc %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(sender)); } diff --git a/orte/orted/orted_main.c b/orte/orted/orted_main.c index 202deaf305..2755fde6bf 100644 --- a/orte/orted/orted_main.c +++ b/orte/orted/orted_main.c @@ -46,9 +46,7 @@ #include "opal/util/cmd_line.h" #include "opal/util/opal_environ.h" #include "opal/util/os_path.h" -#include "opal/util/output.h" #include "opal/util/printf.h" -#include "opal/util/show_help.h" #include "opal/util/trace.h" #include "opal/util/argv.h" #include "opal/runtime/opal.h" @@ -56,6 +54,7 @@ #include "opal/util/daemon_init.h" #include "opal/dss/dss.h" +#include "orte/util/output.h" #include "orte/util/proc_info.h" #include "orte/util/session_dir.h" #include "orte/util/name_fns.h" @@ -98,6 +97,7 @@ static void shutdown_callback(int fd, short flags, void *arg); static void signal_callback(int fd, short event, void *arg); static struct { + bool debug; bool help; bool set_sid; bool hnp; @@ -131,7 +131,7 @@ opal_cmd_line_init_t orte_cmd_line_opts[] = { "Daemonize the orted into the background" }, { "orte", "debug", "daemons", '\0', NULL, "debug-daemons", 0, - NULL, OPAL_CMD_LINE_TYPE_BOOL, + &orted_globals.debug, OPAL_CMD_LINE_TYPE_BOOL, "Enable debugging of OpenRTE daemons" }, { "orte", "debug", "daemons_file", '\0', NULL, "debug-daemons-file", 0, @@ -197,7 +197,7 @@ int orte_daemon(int argc, char *argv[]) argc, argv))) { char *args = NULL; args = opal_cmd_line_get_usage_msg(cmd_line); - opal_show_help("help-orted.txt", "orted:usage", false, + orte_show_help("help-orted.txt", "orted:usage", false, argv[0], args); free(args); return ret; @@ -229,15 +229,11 @@ int orte_daemon(int argc, char *argv[]) /* save the environment for use when launching application processes */ orte_launch_environ = opal_argv_copy(environ); - /* register and process the orte params */ - if (ORTE_SUCCESS != (ret = orte_register_params())) { - return ret; - } /* if orte_daemon_debug is set, let someone know we are alive right * away just in case we have a problem along the way */ - if (orte_debug_daemons_flag) { + if (orted_globals.debug) { gethostname(hostname, 100); fprintf(stderr, "Daemon was launched on %s - beginning to initialize\n", hostname); } @@ -246,7 +242,7 @@ int orte_daemon(int argc, char *argv[]) if (orted_globals.help) { char *args = NULL; args = opal_cmd_line_get_usage_msg(cmd_line); - opal_show_help("help-orted.txt", "orted:usage", false, + orte_show_help("help-orted.txt", "orted:usage", false, argv[0], args); free(args); return 1; @@ -287,15 +283,6 @@ int orte_daemon(int argc, char *argv[]) #endif tmp_env_var = NULL; /* Silence compiler warning */ - /* detach from controlling terminal - * otherwise, remain attached so output can get to us - */ - if(!orte_debug_flag && - !orte_debug_daemons_flag && - orted_globals.daemonize) { - opal_daemon_init(NULL); - } - /* Set the flag telling OpenRTE that I am NOT a * singleton, but am "infrastructure" - prevents setting * up incorrect infrastructure that only a singleton would @@ -306,6 +293,15 @@ int orte_daemon(int argc, char *argv[]) return ret; } + /* detach from controlling terminal + * otherwise, remain attached so output can get to us + */ + if(!orte_debug_flag && + !orte_debug_daemons_flag && + orted_globals.daemonize) { + opal_daemon_init(NULL); + } + /* insert our contact info into our process_info struct so we * have it for later use and set the local daemon field to our name */ @@ -553,7 +549,7 @@ int orte_daemon(int argc, char *argv[]) } if (orte_debug_daemons_flag) { - opal_output(0, "%s orted: up and running - waiting for commands!", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME)); + orte_output(0, "%s orted: up and running - waiting for commands!", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME)); } /* wait to hear we are done */ @@ -586,7 +582,7 @@ static void shutdown_callback(int fd, short flags, void *arg) } if (orte_debug_daemons_flag) { - opal_output(0, "%s orted: finalizing", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME)); + orte_output(0, "%s orted: finalizing", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME)); } /* cleanup */ diff --git a/orte/runtime/orte_cr.c b/orte/runtime/orte_cr.c index f95eef4c9b..036b1f53ee 100644 --- a/orte/runtime/orte_cr.c +++ b/orte/runtime/orte_cr.c @@ -41,7 +41,7 @@ #include /* for mkfifo */ #endif /* HAVE_SYS_STAT_H */ -#include "opal/util/output.h" +#include "orte/util/output.h" #include "opal/util/opal_environ.h" #include "opal/event/event.h" #include "opal/mca/crs/crs.h" @@ -54,6 +54,7 @@ #include "orte/util/session_dir.h" #include "orte/util/name_fns.h" #include "orte/runtime/orte_globals.h" +#include "orte/util/output.h" #include "orte/mca/plm/plm.h" #include "orte/mca/plm/base/base.h" @@ -115,14 +116,20 @@ int orte_cr_init(void) false, false, 0, &val); + + /*** RHC: This is going to crash-and-burn when the output conversion is + * completed as orte_output will have no idea what opal_cr_output stream means, + * or even worse, will have assigned it to someone else! + */ + if(0 != val) { - orte_cr_output = opal_output_open(NULL); - opal_output_set_verbosity(orte_cr_output, val); + orte_cr_output = orte_output_open(NULL, "ORTE", "CR", "DEBUG", NULL); + orte_output_set_verbosity(orte_cr_output, val); } else { orte_cr_output = opal_cr_output; } - opal_output_verbose(10, orte_cr_output, + orte_output_verbose(10, orte_cr_output, "orte_cr: init: orte_cr_init()\n"); /* Init ORTE Entry Point Function */ @@ -144,7 +151,7 @@ int orte_cr_init(void) */ int orte_cr_finalize(void) { - opal_output_verbose(10, orte_cr_output, + orte_output_verbose(10, orte_cr_output, "orte_cr: finalize: orte_cr_finalize()"); orte_cr_entry_point_finalize(); @@ -164,7 +171,7 @@ int orte_cr_coord(int state) { int ret, exit_status = ORTE_SUCCESS; - opal_output_verbose(10, orte_cr_output, + orte_output_verbose(10, orte_cr_output, "orte_cr: coord: orte_cr_coord(%s)", opal_crs_base_state_str((opal_crs_state_type_t)state)); @@ -240,7 +247,7 @@ static int orte_cr_coord_pre_ckpt(void) { /* * All the checkpoint heavey lifting in here... */ - opal_output_verbose(10, orte_cr_output, + orte_output_verbose(10, orte_cr_output, "orte_cr: coord_pre_ckpt: orte_cr_coord_pre_ckpt()"); /* @@ -263,7 +270,7 @@ static int orte_cr_coord_pre_restart(void) { * Can not really do much until OPAL is up and running, * so defer action until the post_restart function. */ - opal_output_verbose(10, orte_cr_output, + orte_output_verbose(10, orte_cr_output, "orte_cr: coord_pre_restart: orte_cr_coord_pre_restart()"); return ORTE_SUCCESS; @@ -274,7 +281,7 @@ static int orte_cr_coord_pre_continue(void) { * Can not really do much until OPAL is up and running, * so defer action until the post_continue function. */ - opal_output_verbose(10, orte_cr_output, + orte_output_verbose(10, orte_cr_output, "orte_cr: coord_pre_continue: orte_cr_coord_pre_continue()"); return ORTE_SUCCESS; @@ -288,7 +295,7 @@ static int orte_cr_coord_post_ckpt(void) { * Now that OPAL is shutdown, we really can't do much * so assume pre_ckpt took care of everything. */ - opal_output_verbose(10, orte_cr_output, + orte_output_verbose(10, orte_cr_output, "orte_cr: coord_post_ckpt: orte_cr_coord_post_ckpt()"); return ORTE_SUCCESS; @@ -297,7 +304,7 @@ static int orte_cr_coord_post_ckpt(void) { static int orte_cr_coord_post_restart(void) { int ret, exit_status = ORTE_SUCCESS; - opal_output_verbose(10, orte_cr_output, + orte_output_verbose(10, orte_cr_output, "orte_cr: coord_post_restart: orte_cr_coord_post_restart()"); /* @@ -339,7 +346,7 @@ static int orte_cr_coord_post_restart(void) { static int orte_cr_coord_post_continue(void) { int ret, exit_status = ORTE_SUCCESS; - opal_output_verbose(10, orte_cr_output, + orte_output_verbose(10, orte_cr_output, "orte_cr: coord_post_continue: orte_cr_coord_post_continue()\n"); /* diff --git a/orte/runtime/orte_data_server.c b/orte/runtime/orte_data_server.c index c1f3bb4c74..23642618d4 100644 --- a/orte/runtime/orte_data_server.c +++ b/orte/runtime/orte_data_server.c @@ -179,7 +179,7 @@ static void process_message(int fd, short event, void *evdat) goto SEND_ERROR; } - OPAL_OUTPUT_VERBOSE((1, orte_debug_output, + ORTE_OUTPUT_VERBOSE((1, orte_debug_output, "%s data server: publishing service %s port %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), service_name, port_name)); @@ -190,7 +190,7 @@ static void process_message(int fd, short event, void *evdat) if (NULL != lookup(service_name)) { /* already exists - return ORTE_EXISTS error code */ - OPAL_OUTPUT_VERBOSE((1, orte_debug_output, + ORTE_OUTPUT_VERBOSE((1, orte_debug_output, "%s data server: publishing service %s port %s already exists", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), service_name, port_name)); @@ -219,7 +219,7 @@ static void process_message(int fd, short event, void *evdat) /* store the data */ data->index = opal_pointer_array_add(orte_data_server_store, data); - OPAL_OUTPUT_VERBOSE((1, orte_debug_output, + ORTE_OUTPUT_VERBOSE((1, orte_debug_output, "%s data server: successfully published service %s port %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), service_name, port_name)); @@ -243,7 +243,7 @@ static void process_message(int fd, short event, void *evdat) goto SEND_ERROR; } - OPAL_OUTPUT_VERBOSE((1, orte_debug_output, + ORTE_OUTPUT_VERBOSE((1, orte_debug_output, "%s data server: lookup on service %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), service_name)); @@ -251,7 +251,7 @@ static void process_message(int fd, short event, void *evdat) /* locate this record in the data store */ if (NULL == (data = lookup(service_name))) { - OPAL_OUTPUT_VERBOSE((1, orte_debug_output, + ORTE_OUTPUT_VERBOSE((1, orte_debug_output, "%s data server: service %s not found", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), service_name)); @@ -267,7 +267,7 @@ static void process_message(int fd, short event, void *evdat) goto SEND_ANSWER; } - OPAL_OUTPUT_VERBOSE((1, orte_debug_output, + ORTE_OUTPUT_VERBOSE((1, orte_debug_output, "%s data server: successful lookup on service %s port %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), service_name, data->port)); @@ -302,7 +302,7 @@ static void process_message(int fd, short event, void *evdat) goto SEND_ERROR; } - OPAL_OUTPUT_VERBOSE((1, orte_debug_output, + ORTE_OUTPUT_VERBOSE((1, orte_debug_output, "%s data server: unpublish on service %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), service_name)); @@ -310,7 +310,7 @@ static void process_message(int fd, short event, void *evdat) /* locate this record in the data store */ if (NULL == (data = lookup(service_name))) { - OPAL_OUTPUT_VERBOSE((1, orte_debug_output, + ORTE_OUTPUT_VERBOSE((1, orte_debug_output, "%s data server: service %s not found", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), service_name)); @@ -330,7 +330,7 @@ static void process_message(int fd, short event, void *evdat) if (OPAL_EQUAL != orte_util_compare_name_fields(ORTE_NS_CMP_ALL, &data->owner, sender)) { - OPAL_OUTPUT_VERBOSE((1, orte_debug_output, + ORTE_OUTPUT_VERBOSE((1, orte_debug_output, "%s data server: service %s not owned by sender %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), service_name, ORTE_NAME_PRINT(sender))); @@ -350,7 +350,7 @@ static void process_message(int fd, short event, void *evdat) opal_pointer_array_set_item(orte_data_server_store, data->index, NULL); OBJ_RELEASE(data); - OPAL_OUTPUT_VERBOSE((1, orte_debug_output, + ORTE_OUTPUT_VERBOSE((1, orte_debug_output, "%s data server: service %s unpublished", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), service_name)); @@ -393,7 +393,7 @@ void orte_data_server(int status, orte_process_name_t* sender, { int rc; - OPAL_OUTPUT_VERBOSE((1, orte_debug_output, + ORTE_OUTPUT_VERBOSE((1, orte_debug_output, "%s data server got message from %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(sender))); diff --git a/orte/runtime/orte_finalize.c b/orte/runtime/orte_finalize.c index df96bbcda9..60d13cea17 100644 --- a/orte/runtime/orte_finalize.c +++ b/orte/runtime/orte_finalize.c @@ -28,6 +28,7 @@ #include "orte/runtime/orte_globals.h" #include "orte/runtime/runtime.h" #include "orte/runtime/orte_locks.h" +#include "orte/util/output.h" /** * Leave ORTE. @@ -51,6 +52,9 @@ int orte_finalize(void) /* set the flag indicating we are finalizing */ orte_finalizing = true; + /* close the orte_output system */ + orte_output_finalize(); + /* call the finalize function for this environment */ orte_ess.finalize(); diff --git a/orte/runtime/orte_globals.c b/orte/runtime/orte_globals.c index a511159cfb..ff8620d814 100644 --- a/orte/runtime/orte_globals.c +++ b/orte/runtime/orte_globals.c @@ -29,9 +29,10 @@ #include "opal/threads/mutex.h" #include "opal/threads/condition.h" #include "opal/class/opal_pointer_array.h" - #include "opal/dss/dss.h" + #include "orte/mca/errmgr/errmgr.h" +#include "orte/util/output.h" #include "orte/runtime/runtime.h" #include "orte/runtime/orte_globals.h" @@ -93,7 +94,7 @@ int orte_register_params(void) } /* set default output */ - orte_debug_output = -1; + orte_debug_output = orte_output_open(NULL, "ORTE", "DEBUG", NULL); mca_base_param_reg_int_name("orte", "debug", "Top-level ORTE debug switch (default verbosity: 1)", @@ -122,11 +123,10 @@ int orte_register_params(void) /* open up the verbose output for ORTE debugging */ if (orte_debug_flag || 0 < orte_debug_verbosity || (orte_debug_daemons_flag && (orte_process_info.daemon || orte_process_info.hnp))) { - orte_debug_output = opal_output_open(NULL); if (0 < orte_debug_verbosity) { - opal_output_set_verbosity(orte_debug_output, orte_debug_verbosity); + orte_output_set_verbosity(orte_debug_output, orte_debug_verbosity); } else { - opal_output_set_verbosity(orte_debug_output, 1); + orte_output_set_verbosity(orte_debug_output, 1); } } diff --git a/orte/runtime/orte_init.c b/orte/runtime/orte_init.c index 262bacdf02..53dae47686 100644 --- a/orte/runtime/orte_init.c +++ b/orte/runtime/orte_init.c @@ -32,10 +32,9 @@ #endif #include "opal/util/error.h" -#include "opal/util/output.h" -#include "opal/util/show_help.h" #include "opal/runtime/opal.h" +#include "orte/util/output.h" #include "orte/mca/ess/base/base.h" #include "orte/mca/ess/ess.h" #include "orte/mca/errmgr/errmgr.h" @@ -71,6 +70,13 @@ int orte_init(char flags) return ret; } + /* setup the orte_output system */ + if (ORTE_SUCCESS != (ret = orte_output_init())) { + ORTE_ERROR_LOG(ret); + error = "orte_output_init"; + goto error; + } + /* register handler for errnum -> string conversion */ opal_error_register("ORTE", ORTE_ERR_BASE, ORTE_ERR_MAX, orte_err2str); @@ -124,7 +130,6 @@ int orte_init(char flags) goto error; } - /* open the ESS and select the correct module for this environment */ if (ORTE_SUCCESS != (ret = orte_ess_base_open())) { ORTE_ERROR_LOG(ret); @@ -149,7 +154,7 @@ int orte_init(char flags) return ORTE_SUCCESS; error: - opal_show_help("help-orte-runtime", + orte_show_help("help-orte-runtime", "orte_init:startup:internal-failure", true, error, ORTE_ERROR_NAME(ret), ret); diff --git a/orte/runtime/orte_wait.c b/orte/runtime/orte_wait.c index 4bbb849ef7..fd2df3b9c9 100644 --- a/orte/runtime/orte_wait.c +++ b/orte/runtime/orte_wait.c @@ -46,7 +46,7 @@ #endif #include "opal/dss/dss_types.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "opal/class/opal_object.h" #include "opal/class/opal_list.h" #include "opal/event/event.h" @@ -937,7 +937,7 @@ orte_wait_cb(pid_t wpid, orte_wait_fn_t callback, void *data) FormatMessage( FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, NULL, errcode, 0, (LPTSTR)&localbuf, 1024, NULL ); - opal_output( 0, "Failed to initialize the process callback for pid %lu error %s\n", + orte_output( 0, "Failed to initialize the process callback for pid %lu error %s\n", (unsigned long)(handle->pid), localbuf ); LocalFree( localbuf ); } diff --git a/orte/runtime/orte_wait.h b/orte/runtime/orte_wait.h index 922ffc540c..432d6452ae 100644 --- a/orte/runtime/orte_wait.h +++ b/orte/runtime/orte_wait.h @@ -36,7 +36,7 @@ #include "opal/dss/dss.h" #include "opal/class/opal_list.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "opal/event/event.h" #include "opal/runtime/opal_progress.h" @@ -112,7 +112,7 @@ ORTE_DECLSPEC int orte_wait_event(opal_event_t **event, int *trig, */ #define ORTE_PROGRESSED_WAIT(failed, counter, limit) \ do { \ - OPAL_OUTPUT_VERBOSE((1, orte_debug_output, \ + ORTE_OUTPUT_VERBOSE((1, orte_debug_output, \ "progressed_wait: %s %d", \ __FILE__, __LINE__)); \ while (!(failed) && (counter) < (limit)) { \ @@ -166,7 +166,7 @@ ORTE_DECLSPEC OBJ_CLASS_DECLARATION(orte_message_event_t); orte_message_event_t *mev; \ struct timeval now; \ opal_event_t *tmp; \ - OPAL_OUTPUT_VERBOSE((1, orte_debug_output, \ + ORTE_OUTPUT_VERBOSE((1, orte_debug_output, \ "defining message event: %s %d", \ __FILE__, __LINE__)); \ tmp = (opal_event_t*)malloc(sizeof(opal_event_t)); \ @@ -189,7 +189,7 @@ ORTE_DECLSPEC OBJ_CLASS_DECLARATION(orte_message_event_t); orte_message_event_t *mev; \ struct timeval now; \ opal_event_t *tmp; \ - OPAL_OUTPUT_VERBOSE((1, orte_debug_output, \ + ORTE_OUTPUT_VERBOSE((1, orte_debug_output, \ "defining message event: %s %d", \ __FILE__, __LINE__)); \ tmp = (opal_event_t*)malloc(sizeof(opal_event_t)); \ @@ -238,7 +238,7 @@ ORTE_DECLSPEC OBJ_CLASS_DECLARATION(orte_message_event_t); now.tv_sec = (float)((int)(now.tv_usec/1000000.0)); \ now.tv_usec = now.tv_usec - 1000000.0*now.tv_sec; \ } \ - OPAL_OUTPUT_VERBOSE((1, orte_debug_output, \ + ORTE_OUTPUT_VERBOSE((1, orte_debug_output, \ "defining timeout: %ld sec %ld usec", \ (long)now.tv_sec, (long)now.tv_usec)); \ opal_evtimer_add(tmp, &now); \ @@ -259,7 +259,7 @@ ORTE_DECLSPEC OBJ_CLASS_DECLARATION(orte_message_event_t); opal_evtimer_set(tmp, (cbfunc), tmp); \ now.tv_sec = (time); \ now.tv_usec = 0; \ - OPAL_OUTPUT_VERBOSE((1, orte_debug_output, \ + ORTE_OUTPUT_VERBOSE((1, orte_debug_output, \ "defining timer event: %ld sec", \ (long)now.tv_sec)); \ opal_evtimer_add(tmp, &now); \ diff --git a/orte/runtime/orte_wakeup.c b/orte/runtime/orte_wakeup.c index a7d0ceb916..9d8f52857c 100644 --- a/orte/runtime/orte_wakeup.c +++ b/orte/runtime/orte_wakeup.c @@ -24,7 +24,7 @@ #include #endif -#include "opal/util/output.h" +#include "orte/util/output.h" #include "opal/threads/condition.h" #include "opal/runtime/opal_progress.h" diff --git a/orte/runtime/orte_wakeup.h b/orte/runtime/orte_wakeup.h index 6e4fa964fa..742d36aa95 100644 --- a/orte/runtime/orte_wakeup.h +++ b/orte/runtime/orte_wakeup.h @@ -27,7 +27,7 @@ #include "orte_config.h" #include "orte/types.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "orte/runtime/orte_globals.h" #include "orte/util/name_fns.h" @@ -55,7 +55,7 @@ BEGIN_C_DECLS #define ORTE_UPDATE_EXIT_STATUS(newstatus) \ do { \ if (0 == orte_exit_status && 0 != newstatus) { \ - OPAL_OUTPUT_VERBOSE((1, orte_debug_output, \ + ORTE_OUTPUT_VERBOSE((1, orte_debug_output, \ "%s:%s(%d) updating exit status to %d", \ ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), \ __FILE__, __LINE__, newstatus)); \ diff --git a/orte/test/mpi/Makefile b/orte/test/mpi/Makefile index 7b5b9553eb..b13cb44daa 100644 --- a/orte/test/mpi/Makefile +++ b/orte/test/mpi/Makefile @@ -1,9 +1,18 @@ -PROGS = mpi_no_op mpi_barrier hello hello_nodename abort multi_abort simple_spawn concurrent_spawn spawn_multiple mpi_spin delayed_abort loop_spawn loop_child bad_exit pubsub hello_barrier segv accept connect +PROGS = mpi_no_op mpi_barrier hello hello_nodename abort multi_abort simple_spawn concurrent_spawn spawn_multiple mpi_spin delayed_abort loop_spawn loop_child bad_exit pubsub hello_barrier segv accept connect hello_output hello_show_help all: $(PROGS) +# These guys need additional -I flags + +hello_output: hello_output.c + $(CC) $(CFLAGS) $(CFLAGS_INTERNAL) $^ -o $@ + +hello_show_help: hello_show_help.c + $(CC) $(CFLAGS) $(CFLAGS_INTERNAL) $^ -o $@ + CC = mpicc CFLAGS = -g +CFLAGS_INTERNAL = -I../../.. -I../../../orte/include -I../../../opal/include CXX = mpic++ CXXFLAGS = -g F77 = mpif77 diff --git a/orte/test/mpi/hello_output.c b/orte/test/mpi/hello_output.c new file mode 100644 index 0000000000..afd5271f84 --- /dev/null +++ b/orte/test/mpi/hello_output.c @@ -0,0 +1,29 @@ +/* -*- C -*- + * + * $HEADER$ + * + * The most basic of MPI applications + */ + +#include +#include "mpi.h" + +#include "orte/util/output.h" + +int main(int argc, char* argv[]) +{ + int rank, size; + int stream; + + MPI_Init(&argc, &argv); + MPI_Comm_rank(MPI_COMM_WORLD, &rank); + MPI_Comm_size(MPI_COMM_WORLD, &size); + + stream = orte_output_open(NULL, "HELLO", "OUTPUT", NULL); + orte_output(stream, "(stream) Hello, World, I am %d of %d\n", rank, size); + + printf("(printf) Hello, World, I am %d of %d\n", rank, size); + + MPI_Finalize(); + return 0; +} diff --git a/orte/test/mpi/hello_show_help.c b/orte/test/mpi/hello_show_help.c new file mode 100644 index 0000000000..69ecf57a3c --- /dev/null +++ b/orte/test/mpi/hello_show_help.c @@ -0,0 +1,49 @@ +/* -*- C -*- + * + * $HEADER$ + * + * The most basic of MPI applications + */ + +#include +#include "mpi.h" + +#include "orte/util/output.h" + +int main(int argc, char* argv[]) +{ + int rank, size; + int stream; + + MPI_Init(&argc, &argv); + MPI_Comm_rank(MPI_COMM_WORLD, &rank); + MPI_Comm_size(MPI_COMM_WORLD, &size); + + if (0 == rank) { + orte_output(0, "============================================================================"); + orte_output(0, "This test ensures that the aggregation functionality of the orte_show_help\nsystem is working properly. It outputs a bogus warning about orte_init(),\nand contains sleep statements to ensure that the timer is firiing properly\nin the HNP and aggregates messages properly. The total sleep time is\n(3 * num_procs). You should see:\n\n - aggregation messages from the HNP every five seconds or so\n - a total of (2 * num_procs) messages"); + orte_output(0, "============================================================================"); + } + MPI_Barrier(MPI_COMM_WORLD); + + orte_show_help("help-orte-runtime.txt", + "orte_init:startup:internal-failure", true, + "Nothing", "ORTE_EVERYTHING_IS_PEACHY", "42"); + sleep(rank * 3); + + orte_show_help("help-orte-runtime.txt", + "orte_init:startup:internal-failure", true, + "Duplicate orte_show_help detection", + "ORTE_SHOW_HELP_DUPLICATE_FAILED", "99999"); + + MPI_Barrier(MPI_COMM_WORLD); + + if (0 == rank) { + orte_output(0, "============================================================================"); + orte_output(0, "The test is now complete. Please verify that the HNP output all the required\nmessages (you may see 1 or 2 more messages from the HNP after this message)."); + orte_output(0, "============================================================================"); + } + MPI_Finalize(); + + return 0; +} diff --git a/orte/tools/orte-checkpoint/orte-checkpoint.c b/orte/tools/orte-checkpoint/orte-checkpoint.c index 568050ec7b..f0106d0649 100644 --- a/orte/tools/orte-checkpoint/orte-checkpoint.c +++ b/orte/tools/orte-checkpoint/orte-checkpoint.c @@ -54,9 +54,7 @@ #include "opal/util/cmd_line.h" #include "opal/util/argv.h" -#include "opal/util/show_help.h" #include "opal/util/opal_environ.h" -#include "opal/util/output.h" #include "opal/util/os_path.h" #include "opal/util/os_dirpath.h" #include "opal/mca/base/base.h" @@ -71,6 +69,7 @@ #include "orte/util/hnp_contact.h" #include "orte/runtime/orte_globals.h" #include "orte/util/name_fns.h" +#include "orte/util/output.h" #include "orte/mca/rml/rml.h" #include "orte/mca/errmgr/errmgr.h" #include "opal/dss/dss.h" @@ -199,30 +198,30 @@ main(int argc, char *argv[]) * Checkpoint the requested PID *******************************/ if( orte_checkpoint_globals.verbose ) { - opal_output_verbose(10, orte_checkpoint_globals.output, + orte_output_verbose(10, orte_checkpoint_globals.output, "orte_checkpoint: Checkpointing..."); if (0 < orte_checkpoint_globals.pid) { - opal_output_verbose(10, orte_checkpoint_globals.output, + orte_output_verbose(10, orte_checkpoint_globals.output, "\t PID %d", orte_checkpoint_globals.pid); } else if (ORTE_JOBID_INVALID != orte_checkpoint_globals.req_hnp){ - opal_output_verbose(10, orte_checkpoint_globals.output, + orte_output_verbose(10, orte_checkpoint_globals.output, "\t Mpirun (%s)", ORTE_JOBID_PRINT(orte_checkpoint_globals.req_hnp)); } - opal_output_verbose(10, orte_checkpoint_globals.output, + orte_output_verbose(10, orte_checkpoint_globals.output, "\t Connected to Mpirun %s", ORTE_NAME_PRINT(&orterun_hnp->name)); if(orte_checkpoint_globals.term) { - opal_output_verbose(10, orte_checkpoint_globals.output, + orte_output_verbose(10, orte_checkpoint_globals.output, "\t Terminating after checkpoint\n"); } } if(ORTE_SUCCESS != (ret = notify_process_for_checkpoint( orte_checkpoint_globals.term)) ) { - opal_show_help("help-orte-checkpoint.txt", "ckpt_failure", true, + orte_show_help("help-orte-checkpoint.txt", "ckpt_failure", true, orte_checkpoint_globals.pid, ret); exit_status = ret; goto cleanup; @@ -239,7 +238,7 @@ main(int argc, char *argv[]) } if( ORTE_SNAPC_CKPT_STATE_ERROR == orte_checkpoint_globals.ckpt_status ) { - opal_show_help("help-orte-checkpoint.txt", "ckpt_failure", true, + orte_show_help("help-orte-checkpoint.txt", "ckpt_failure", true, orte_checkpoint_globals.pid, ORTE_ERROR); exit_status = ORTE_ERROR; goto cleanup; @@ -322,7 +321,7 @@ static int parse_args(int argc, char *argv[]) { { char *args = NULL; args = opal_cmd_line_get_usage_msg(&cmd_line); - opal_show_help("help-orte-checkpoint.txt", "usage-no-cr", + orte_show_help("help-orte-checkpoint.txt", "usage-no-cr", true, args); free(args); exit_status = ORTE_ERROR; @@ -335,7 +334,7 @@ static int parse_args(int argc, char *argv[]) { (0 >= argc && ORTE_JOBID_INVALID == orte_checkpoint_globals.req_hnp)) { char *args = NULL; args = opal_cmd_line_get_usage_msg(&cmd_line); - opal_show_help("help-orte-checkpoint.txt", "usage", true, + orte_show_help("help-orte-checkpoint.txt", "usage", true, args); free(args); exit_status = ORTE_ERROR; @@ -354,7 +353,7 @@ static int parse_args(int argc, char *argv[]) { orte_checkpoint_globals.pid = atoi(argv[0]); if ( 0 >= orte_checkpoint_globals.pid ) { - opal_show_help("help-orte-checkpoint.txt", "invalid_pid", true, + orte_show_help("help-orte-checkpoint.txt", "invalid_pid", true, orte_checkpoint_globals.pid); exit_status = ORTE_ERROR; goto cleanup; @@ -365,7 +364,7 @@ static int parse_args(int argc, char *argv[]) { */ if(orte_checkpoint_globals.nowait) { orte_checkpoint_globals.nowait = false; - opal_show_help("help-orte-checkpoint.txt", "not_impl", + orte_show_help("help-orte-checkpoint.txt", "not_impl", true, "Disconnected checkpoint"); } @@ -441,10 +440,10 @@ static int ckpt_init(int argc, char *argv[]) { * Setup OPAL Output handle from the verbose argument */ if( orte_checkpoint_globals.verbose ) { - orte_checkpoint_globals.output = opal_output_open(NULL); - opal_output_set_verbosity(orte_checkpoint_globals.output, 10); + orte_checkpoint_globals.output = orte_output_open(NULL, "ORTE", "CHECKPOINT", "DEBUG", NULL); + orte_output_set_verbosity(orte_checkpoint_globals.output, 10); } else { - orte_checkpoint_globals.output = 0; /* Default=STDOUT */ + orte_checkpoint_globals.output = 0; /* Default=STDERR */ } /* Disable the checkpoint notification routine for this @@ -549,7 +548,7 @@ static void hnp_receiver(int status, orte_std_cntr_t count; int rc; - opal_output_verbose(5, orte_checkpoint_globals.output, + orte_output_verbose(5, orte_checkpoint_globals.output, "orte_checkpoint: hnp_receiver: Receive a command message."); /* @@ -563,7 +562,7 @@ static void hnp_receiver(int status, switch (command) { case ORTE_SNAPC_GLOBAL_UPDATE_CMD: - opal_output_verbose(10, orte_checkpoint_globals.output, + orte_output_verbose(10, orte_checkpoint_globals.output, "orte_checkpoint: hnp_receiver: Status Update."); process_ckpt_update_cmd(sender, buffer); @@ -616,7 +615,7 @@ static void process_ckpt_update_cmd(orte_process_name_t* sender, * If the job is not able to be checkpointed, then return */ if( ORTE_SNAPC_CKPT_STATE_NO_CKPT == orte_checkpoint_globals.ckpt_status) { - opal_show_help("help-orte-checkpoint.txt", "non-ckptable", + orte_show_help("help-orte-checkpoint.txt", "non-ckptable", true, orte_checkpoint_globals.pid); exit_status = ORTE_ERROR; @@ -648,7 +647,7 @@ notify_process_for_checkpoint(int term) goto cleanup; } - opal_output_verbose(10, orte_checkpoint_globals.output, + orte_output_verbose(10, orte_checkpoint_globals.output, "orte_checkpoint: notify_hnp: Contact Head Node Process PID %d\n", orte_checkpoint_globals.pid); @@ -679,7 +678,7 @@ notify_process_for_checkpoint(int term) goto cleanup; } - opal_output_verbose(10, orte_checkpoint_globals.output, + orte_output_verbose(10, orte_checkpoint_globals.output, "orte_checkpoint: notify_hnp: Requested a checkpoint of jobid %s\n", ORTE_JOBID_PRINT(jobid)); @@ -690,7 +689,7 @@ notify_process_for_checkpoint(int term) } if( ORTE_SUCCESS != exit_status ) { - opal_show_help("help-orte-checkpoint.txt", "unable_to_connect", true, + orte_show_help("help-orte-checkpoint.txt", "unable_to_connect", true, orte_checkpoint_globals.pid); } @@ -705,7 +704,7 @@ static int pretty_print_status(void) { state_str = orte_snapc_ckpt_state_str(orte_checkpoint_globals.ckpt_status); - opal_output(orte_checkpoint_globals.output, + orte_output(orte_checkpoint_globals.output, "%*s - Global Snapshot Reference: %s\n", 25, state_str, global_snapshot_handle); if( NULL != state_str) { diff --git a/orte/tools/orte-clean/orte-clean.c b/orte/tools/orte-clean/orte-clean.c index b02f5fcace..6539d1e66d 100644 --- a/orte/tools/orte-clean/orte-clean.c +++ b/orte/tools/orte-clean/orte-clean.c @@ -55,13 +55,12 @@ #include "opal/util/cmd_line.h" #include "opal/util/argv.h" -#include "opal/util/show_help.h" -#include "opal/util/output.h" #include "opal/util/opal_environ.h" #include "opal/util/os_dirpath.h" #include "opal/mca/base/base.h" #include "opal/mca/base/mca_base_param.h" +#include "orte/util/output.h" #include "orte/util/proc_info.h" #include "opal/util/os_path.h" #include "orte/util/session_dir.h" @@ -190,7 +189,7 @@ static int parse_args(int argc, char *argv[]) { orte_clean_globals.help) { char *args = NULL; args = opal_cmd_line_get_usage_msg(&cmd_line); - opal_show_help("help-orte-clean.txt", "usage", true, + orte_show_help("help-orte-clean.txt", "usage", true, args); free(args); return ORTE_ERROR; diff --git a/orte/tools/orte-ps/orte-ps.c b/orte/tools/orte-ps/orte-ps.c index 3eb8d343db..a8d6b6bdde 100644 --- a/orte/tools/orte-ps/orte-ps.c +++ b/orte/tools/orte-ps/orte-ps.c @@ -55,8 +55,6 @@ #include "opal/util/cmd_line.h" #include "opal/util/argv.h" -#include "opal/util/show_help.h" -#include "opal/util/output.h" #include "opal/util/opal_environ.h" #include "opal/util/os_path.h" #include "opal/mca/base/base.h" @@ -73,6 +71,7 @@ #include "orte/util/session_dir.h" #include "orte/util/hnp_contact.h" #include "orte/util/name_fns.h" +#include "orte/util/output.h" #include "orte/mca/errmgr/errmgr.h" #include "orte/util/comm/comm.h" #include "orte/mca/ras/ras_types.h" @@ -231,7 +230,7 @@ main(int argc, char *argv[]) /* * Get the directory listing */ - opal_output_verbose(10, orte_ps_globals.output, + orte_output_verbose(10, orte_ps_globals.output, "orte_ps: Acquiring list of HNPs...\n"); if (ORTE_SUCCESS != (ret = orte_list_local_hnps(&hnp_list) ) ) { @@ -249,7 +248,7 @@ main(int argc, char *argv[]) /* * Gather the information */ - opal_output_verbose(10, orte_ps_globals.output, + orte_output_verbose(10, orte_ps_globals.output, "orte_ps: Gathering Information for HNP: %s:%d\n", ORTE_NAME_PRINT(&(hnpinfo.hnp->name)), hnpinfo.hnp->pid); @@ -304,7 +303,7 @@ static int parse_args(int argc, char *argv[]) { orte_ps_globals.help) { char *args = NULL; args = opal_cmd_line_get_usage_msg(&cmd_line); - opal_show_help("help-orte-ps.txt", "usage", true, + orte_show_help("help-orte-ps.txt", "usage", true, args); free(args); return ORTE_ERROR; @@ -315,7 +314,7 @@ static int parse_args(int argc, char *argv[]) { */ if( 0 <= orte_ps_globals.vpid) { if( 0 > orte_ps_globals.jobid) { - opal_show_help("help-orte-ps.txt", "vpid-usage", true, + orte_show_help("help-orte-ps.txt", "vpid-usage", true, orte_ps_globals.vpid); return ORTE_ERROR; } @@ -348,10 +347,10 @@ static int orte_ps_init(int argc, char *argv[]) { * Setup OPAL Output handle from the verbose argument */ if( orte_ps_globals.verbose ) { - orte_ps_globals.output = opal_output_open(NULL); - opal_output_set_verbosity(orte_ps_globals.output, 10); + orte_ps_globals.output = orte_output_open(NULL, "ORTE", "PS", "DEBUG", NULL); + orte_output_set_verbosity(orte_ps_globals.output, 10); } else { - orte_ps_globals.output = 0; /* Default=STDOUT */ + orte_ps_globals.output = 0; /* Default=STDERR */ } #if OPAL_ENABLE_FT == 1 diff --git a/orte/tools/orte-restart/orte-restart.c b/orte/tools/orte-restart/orte-restart.c index d4e266270a..21563fc9e8 100644 --- a/orte/tools/orte-restart/orte-restart.c +++ b/orte/tools/orte-restart/orte-restart.c @@ -52,8 +52,6 @@ #include "opal/runtime/opal_cr.h" #include "opal/util/cmd_line.h" #include "opal/util/argv.h" -#include "opal/util/show_help.h" -#include "opal/util/output.h" #include "opal/util/opal_environ.h" #include "opal/util/os_path.h" #include "opal/util/basename.h" @@ -68,6 +66,7 @@ #include "orte/mca/snapc/base/base.h" #include "orte/mca/filem/filem.h" #include "orte/mca/filem/base/base.h" +#include "orte/util/output.h" /****************** * Local Functions @@ -172,7 +171,7 @@ main(int argc, char *argv[]) * Check for existence of the file */ if( ORTE_SUCCESS != (ret = check_file(snapshot)) ) { - opal_show_help("help-orte-restart.txt", "invalid_filename", true, + orte_show_help("help-orte-restart.txt", "invalid_filename", true, orte_restart_globals.filename); exit_status = ret; goto cleanup; @@ -190,27 +189,27 @@ main(int argc, char *argv[]) * Restart in this process [mpirun/orterun] ******************************/ if( orte_restart_globals.verbose ) { - opal_output_verbose(10, orte_restart_globals.output, + orte_output_verbose(10, orte_restart_globals.output, "Restarting from file (%s)", orte_restart_globals.filename); if( orte_restart_globals.forked ) { - opal_output_verbose(10, orte_restart_globals.output, + orte_output_verbose(10, orte_restart_globals.output, "\t Forking off a child"); } else { - opal_output_verbose(10, orte_restart_globals.output, + orte_output_verbose(10, orte_restart_globals.output, "\t Exec in self"); } } if( ORTE_SUCCESS != (ret = spawn_children(snapshot, &child_pid)) ) { - opal_show_help("help-orte-restart.txt", "restart_cmd_failure", true, + orte_show_help("help-orte-restart.txt", "restart_cmd_failure", true, orte_restart_globals.filename, ret); exit_status = ret; goto cleanup; } - opal_output_verbose(10, orte_restart_globals.output, + orte_output_verbose(10, orte_restart_globals.output, "orte_restart: Restarted Child with PID = %d\n", child_pid); /*************** @@ -252,10 +251,10 @@ static int initialize(int argc, char *argv[]) { * Setup OPAL Output handle from the verbose argument */ if( orte_restart_globals.verbose ) { - orte_restart_globals.output = opal_output_open(NULL); - opal_output_set_verbosity(orte_restart_globals.output, 10); + orte_restart_globals.output = orte_output_open(NULL, "ORTE", "RESTART", "DEBUG", NULL); + orte_output_set_verbosity(orte_restart_globals.output, 10); } else { - orte_restart_globals.output = 0; /* Default=STDOUT */ + orte_restart_globals.output = 0; /* Default=STDERR */ } /* Disable the checkpoint notification routine for this @@ -362,7 +361,7 @@ static int parse_args(int argc, char *argv[]) { char *args = NULL; args = opal_cmd_line_get_usage_msg(&cmd_line); - opal_show_help("help-orte-restart.txt", "usage-no-cr", + orte_show_help("help-orte-restart.txt", "usage-no-cr", true, args); free(args); return ORTE_ERROR; @@ -374,7 +373,7 @@ static int parse_args(int argc, char *argv[]) 1 >= argc) { char *args = NULL; args = opal_cmd_line_get_usage_msg(&cmd_line); - opal_show_help("help-orte-restart.txt", "usage", true, + orte_show_help("help-orte-restart.txt", "usage", true, args); free(args); return ORTE_ERROR; @@ -385,7 +384,7 @@ static int parse_args(int argc, char *argv[]) if ( 1 > argc ) { char *args = NULL; args = opal_cmd_line_get_usage_msg(&cmd_line); - opal_show_help("help-orte-restart.txt", "usage", true, + orte_show_help("help-orte-restart.txt", "usage", true, args); free(args); return ORTE_ERROR; @@ -394,7 +393,7 @@ static int parse_args(int argc, char *argv[]) orte_restart_globals.filename = strdup(argv[0]); if ( NULL == orte_restart_globals.filename || 0 >= strlen(orte_restart_globals.filename) ) { - opal_show_help("help-orte-restart.txt", "invalid_filename", true, + orte_show_help("help-orte-restart.txt", "invalid_filename", true, orte_restart_globals.filename); return ORTE_ERROR; } @@ -413,7 +412,7 @@ static int check_file(orte_snapc_base_global_snapshot_t *snapshot) { int ret, exit_status = ORTE_SUCCESS; - opal_output_verbose(10, orte_restart_globals.output, + orte_output_verbose(10, orte_restart_globals.output, "Checking for the existence of (%s)\n", snapshot->local_location); @@ -546,7 +545,7 @@ static int spawn_children(orte_snapc_base_global_snapshot_t *snapshot, pid_t *ch /* Child Process */ status = execvp(strdup(argv[0]), argv); if( 0 > status) { - opal_output(orte_restart_globals.output, + orte_output(orte_restart_globals.output, "orte_restart: execv failed with status = %d\n", status); } @@ -558,7 +557,7 @@ static int spawn_children(orte_snapc_base_global_snapshot_t *snapshot, pid_t *ch ; } else { - opal_output(orte_restart_globals.output, + orte_output(orte_restart_globals.output, "orte_restart: fork failed: This should never happen!"); /* Fork failed :( */ exit_status = *child_pid; diff --git a/orte/tools/orterun/orterun.c b/orte/tools/orterun/orterun.c index e9c9b6a593..cac32ed7df 100644 --- a/orte/tools/orterun/orterun.c +++ b/orte/tools/orterun/orterun.c @@ -54,8 +54,7 @@ #include "opal/util/cmd_line.h" #include "opal/util/opal_environ.h" #include "opal/util/opal_getcwd.h" -#include "opal/util/output.h" -#include "opal/util/show_help.h" +#include "orte/util/output.h" #include "opal/util/trace.h" #include "opal/sys/atomic.h" #if OPAL_ENABLE_FT == 1 @@ -371,7 +370,7 @@ int orterun(int argc, char *argv[]) if (0 == jdata->num_apps) { /* This should never happen -- this case should be caught in create_app(), but let's just double check... */ - opal_show_help("help-orterun.txt", "orterun:nothing-to-do", + orte_show_help("help-orterun.txt", "orterun:nothing-to-do", true, orterun_basename); exit(ORTE_ERROR_DEFAULT_EXIT_CODE); } @@ -433,7 +432,7 @@ int orterun(int argc, char *argv[]) } opal_setenv("PATH", newenv, true, &orte_launch_environ); if (orte_debug_flag) { - opal_output(0, "%s: reset PATH: %s", orterun_basename, newenv); + orte_output(0, "%s: reset PATH: %s", orterun_basename, newenv); } free(newenv); free(bin_base); @@ -449,7 +448,7 @@ int orterun(int argc, char *argv[]) } opal_setenv("LD_LIBRARY_PATH", newenv, true, &orte_launch_environ); if (orte_debug_flag) { - opal_output(0, "%s: reset LD_LIBRARY_PATH: %s", + orte_output(0, "%s: reset LD_LIBRARY_PATH: %s", orterun_basename, newenv); } free(newenv); @@ -479,7 +478,7 @@ int orterun(int argc, char *argv[]) /* pre-condition any network transports that require it */ if (ORTE_SUCCESS != (rc = orte_pre_condition_transports(jdata))) { ORTE_ERROR_LOG(rc); - opal_show_help("help-orterun.txt", "orterun:precondition", false, + orte_show_help("help-orterun.txt", "orterun:precondition", false, orterun_basename, NULL, NULL, rc); return rc; } @@ -538,7 +537,7 @@ int orterun(int argc, char *argv[]) * can cause either of us to exit since we share that code */ if (ORTE_SUCCESS != (rc = orte_wait_event(&orterun_event, &orte_exit, job_completed))) { - opal_show_help("help-orterun.txt", "orterun:event-def-failed", true, + orte_show_help("help-orterun.txt", "orterun:event-def-failed", true, orterun_basename, ORTE_ERROR_NAME(rc)); ORTE_UPDATE_EXIT_STATUS(ORTE_ERROR_DEFAULT_EXIT_CODE); goto DONE; @@ -606,7 +605,7 @@ static void job_completed(int trigpipe, short event, void *arg) * okay to finalize and exit, we are done with them. */ if (ORTE_SUCCESS != (rc = orte_wait_event(&orteds_exit_event, &orteds_exit, terminated))) { - opal_show_help("help-orterun.txt", "orterun:event-def-failed", true, + orte_show_help("help-orterun.txt", "orterun:event-def-failed", true, orterun_basename, ORTE_ERROR_NAME(rc)); goto DONE; } @@ -675,7 +674,7 @@ static void terminated(int trigpipe, short event, void *arg) /* nothing more we can do - tell user something really messed * up and exit */ - opal_show_help("help-orterun.txt", "orterun:no-orted-object-exit", + orte_show_help("help-orterun.txt", "orterun:no-orted-object-exit", true, orterun_basename); } @@ -687,7 +686,7 @@ static void terminated(int trigpipe, short event, void *arg) * print a warning that the user may still have some manual * cleanup to do. */ - opal_show_help("help-orterun.txt", "orterun:unclean-exit", + orte_show_help("help-orterun.txt", "orterun:unclean-exit", true, orterun_basename); procs = (orte_proc_t**)daemons->procs->addr; for (i=1; i < daemons->num_procs; i++) @@ -772,72 +771,72 @@ static void dump_aborted_procs(void) } if (ORTE_JOB_STATE_FAILED_TO_START == job->state) { if (NULL == proc) { - opal_show_help("help-orterun.txt", "orterun:proc-failed-to-start-no-status-no-node", true, + orte_show_help("help-orterun.txt", "orterun:proc-failed-to-start-no-status-no-node", true, orterun_basename); return; } if (ORTE_ERR_SYS_LIMITS_PIPES == proc->exit_code) { - opal_show_help("help-orterun.txt", "orterun:sys-limit-pipe", true, + orte_show_help("help-orterun.txt", "orterun:sys-limit-pipe", true, orterun_basename, proc->node->name, (unsigned long)proc->name.vpid); } else if (ORTE_ERR_PIPE_SETUP_FAILURE == proc->exit_code) { - opal_show_help("help-orterun.txt", "orterun:pipe-setup-failure", true, + orte_show_help("help-orterun.txt", "orterun:pipe-setup-failure", true, orterun_basename, proc->node->name, (unsigned long)proc->name.vpid); } else if (ORTE_ERR_SYS_LIMITS_CHILDREN == proc->exit_code) { - opal_show_help("help-orterun.txt", "orterun:sys-limit-children", true, + orte_show_help("help-orterun.txt", "orterun:sys-limit-children", true, orterun_basename, proc->node->name, (unsigned long)proc->name.vpid); } else if (ORTE_ERR_FAILED_GET_TERM_ATTRS == proc->exit_code) { - opal_show_help("help-orterun.txt", "orterun:failed-term-attrs", true, + orte_show_help("help-orterun.txt", "orterun:failed-term-attrs", true, orterun_basename, proc->node->name, (unsigned long)proc->name.vpid); } else if (ORTE_ERR_WDIR_NOT_FOUND == proc->exit_code) { - opal_show_help("help-orterun.txt", "orterun:wdir-not-found", true, + orte_show_help("help-orterun.txt", "orterun:wdir-not-found", true, orterun_basename, apps[proc->app_idx]->cwd, proc->node->name, (unsigned long)proc->name.vpid); } else if (ORTE_ERR_EXE_NOT_FOUND == proc->exit_code) { - opal_show_help("help-orterun.txt", "orterun:exe-not-found", true, + orte_show_help("help-orterun.txt", "orterun:exe-not-found", true, orterun_basename, apps[proc->app_idx]->app, proc->node->name, (unsigned long)proc->name.vpid); } else if (ORTE_ERR_EXE_NOT_ACCESSIBLE == proc->exit_code) { - opal_show_help("help-orterun.txt", "orterun:exe-not-accessible", true, + orte_show_help("help-orterun.txt", "orterun:exe-not-accessible", true, orterun_basename, apps[proc->app_idx]->app, proc->node->name, (unsigned long)proc->name.vpid); } else if (ORTE_ERR_PIPE_READ_FAILURE == proc->exit_code) { - opal_show_help("help-orterun.txt", "orterun:pipe-read-failure", true, + orte_show_help("help-orterun.txt", "orterun:pipe-read-failure", true, orterun_basename, proc->node->name, (unsigned long)proc->name.vpid); } else if (0 != proc->exit_code) { - opal_show_help("help-orterun.txt", "orterun:proc-failed-to-start", true, + orte_show_help("help-orterun.txt", "orterun:proc-failed-to-start", true, orterun_basename, ORTE_ERROR_NAME(proc->exit_code), proc->node->name, (unsigned long)proc->name.vpid); } else { - opal_show_help("help-orterun.txt", "orterun:proc-failed-to-start-no-status", true, + orte_show_help("help-orterun.txt", "orterun:proc-failed-to-start-no-status", true, orterun_basename, proc->node->name); } } else if (ORTE_JOB_STATE_ABORTED == job->state) { if (NULL == proc) { - opal_show_help("help-orterun.txt", "orterun:proc-aborted-unknown", true, + orte_show_help("help-orterun.txt", "orterun:proc-aborted-unknown", true, orterun_basename); } else { - opal_show_help("help-orterun.txt", "orterun:proc-ordered-abort", true, + orte_show_help("help-orterun.txt", "orterun:proc-ordered-abort", true, orterun_basename, (unsigned long)proc->name.vpid, (unsigned long)proc->pid, proc->node->name, orterun_basename); } } else if (ORTE_JOB_STATE_ABORTED_BY_SIG == job->state) { /* aborted by signal */ if (NULL == proc) { - opal_show_help("help-orterun.txt", "orterun:proc-aborted-signal-unknown", true, + orte_show_help("help-orterun.txt", "orterun:proc-aborted-signal-unknown", true, orterun_basename); } else { #ifdef HAVE_STRSIGNAL if (NULL != strsignal(WTERMSIG(proc->exit_code))) { - opal_show_help("help-orterun.txt", "orterun:proc-aborted-strsignal", true, + orte_show_help("help-orterun.txt", "orterun:proc-aborted-strsignal", true, orterun_basename, (unsigned long)proc->name.vpid, (unsigned long)proc->pid, proc->node->name, WTERMSIG(proc->exit_code), strsignal(WTERMSIG(proc->exit_code))); } else { #endif - opal_show_help("help-orterun.txt", "orterun:proc-aborted", true, + orte_show_help("help-orterun.txt", "orterun:proc-aborted", true, orterun_basename, (unsigned long)proc->name.vpid, (unsigned long)proc->pid, proc->node->name, WTERMSIG(proc->exit_code)); #ifdef HAVE_STRSIGNAL @@ -846,10 +845,10 @@ static void dump_aborted_procs(void) } } else if (ORTE_JOB_STATE_ABORTED_WO_SYNC == job->state) { /* proc exited w/o finalize */ if (NULL == proc) { - opal_show_help("help-orterun.txt", "orterun:proc-exit-no-sync-unknown", true, + orte_show_help("help-orterun.txt", "orterun:proc-exit-no-sync-unknown", true, orterun_basename, orterun_basename); } else { - opal_show_help("help-orterun.txt", "orterun:proc-exit-no-sync", true, + orte_show_help("help-orterun.txt", "orterun:proc-exit-no-sync", true, orterun_basename, (unsigned long)proc->name.vpid, (unsigned long)proc->pid, proc->node->name, orterun_basename); } @@ -861,7 +860,7 @@ static void dump_aborted_procs(void) /* if we got here, then we couldn't find the job that aborted - * report that fact and give up */ - opal_show_help("help-orterun.txt", "orterun:proc-aborted-unknown", true, orterun_basename); + orte_show_help("help-orterun.txt", "orterun:proc-aborted-unknown", true, orterun_basename); } static void timeout_callback(int fd, short ign, void *arg) @@ -1047,7 +1046,7 @@ static int parse_globals(int argc, char* argv[], opal_cmd_line_t *cmd_line) } else { project_name = "OpenRTE"; } - opal_show_help("help-orterun.txt", "orterun:version", false, + orte_show_help("help-orterun.txt", "orterun:version", false, orterun_basename, project_name, OPAL_VERSION, PACKAGE_BUGREPORT); /* if we were the only argument, exit */ @@ -1064,7 +1063,7 @@ static int parse_globals(int argc, char* argv[], opal_cmd_line_t *cmd_line) project_name = "OpenRTE"; } args = opal_cmd_line_get_usage_msg(cmd_line); - opal_show_help("help-orterun.txt", "orterun:usage", false, + orte_show_help("help-orterun.txt", "orterun:usage", false, orterun_basename, project_name, OPAL_VERSION, orterun_basename, args, PACKAGE_BUGREPORT); @@ -1135,7 +1134,7 @@ static int parse_locals(int argc, char* argv[]) filename = strchr(orterun_globals.ompi_server, ':'); if (NULL == filename) { /* filename is not correctly formatted */ - opal_show_help("help-orterun.txt", "orterun:ompi-server-filename-bad", true, + orte_show_help("help-orterun.txt", "orterun:ompi-server-filename-bad", true, orterun_basename, orterun_globals.ompi_server); exit(1); } @@ -1143,7 +1142,7 @@ static int parse_locals(int argc, char* argv[]) if (0 >= strlen(filename)) { /* they forgot to give us the name! */ - opal_show_help("help-orterun.txt", "orterun:ompi-server-filename-missing", true, + orte_show_help("help-orterun.txt", "orterun:ompi-server-filename-missing", true, orterun_basename, orterun_globals.ompi_server); exit(1); } @@ -1151,14 +1150,14 @@ static int parse_locals(int argc, char* argv[]) /* open the file and extract the uri */ fp = fopen(filename, "r"); if (NULL == fp) { /* can't find or read file! */ - opal_show_help("help-orterun.txt", "orterun:ompi-server-filename-access", true, + orte_show_help("help-orterun.txt", "orterun:ompi-server-filename-access", true, orterun_basename, orterun_globals.ompi_server); exit(1); } if (NULL == fgets(input, 1024, fp)) { /* something malformed about file */ fclose(fp); - opal_show_help("help-orterun.txt", "orterun:ompi-server-file-bad", true, + orte_show_help("help-orterun.txt", "orterun:ompi-server-file-bad", true, orterun_basename, orterun_globals.ompi_server, orterun_basename); exit(1); @@ -1382,7 +1381,7 @@ static int create_app(int argc, char* argv[], orte_app_context_t **app_ptr, /* See if we have anything left */ if (0 == count) { - opal_show_help("help-orterun.txt", "orterun:executable-not-specified", + orte_show_help("help-orterun.txt", "orterun:executable-not-specified", true, orterun_basename, orterun_basename); rc = ORTE_ERR_NOT_FOUND; goto cleanup; @@ -1453,7 +1452,7 @@ static int create_app(int argc, char* argv[], orte_app_context_t **app_ptr, free(value2); } } else { - opal_output(0, "Warning: could not find environment variable \"%s\"\n", param); + orte_output(0, "Warning: could not find environment variable \"%s\"\n", param); } } } @@ -1474,7 +1473,7 @@ static int create_app(int argc, char* argv[], orte_app_context_t **app_ptr, app->user_specified_cwd = true; } else { if (OPAL_SUCCESS != (rc = opal_getcwd(cwd, sizeof(cwd)))) { - opal_show_help("help-orterun.txt", "orterun:init-failure", + orte_show_help("help-orterun.txt", "orterun:init-failure", true, "get the cwd", rc); goto cleanup; } @@ -1532,7 +1531,7 @@ static int create_app(int argc, char* argv[], orte_app_context_t **app_ptr, param[param_len-1] = '\0'; param_len--; if (0 == param_len) { - opal_show_help("help-orterun.txt", "orterun:empty-prefix", + orte_show_help("help-orterun.txt", "orterun:empty-prefix", true, orterun_basename, orterun_basename); return ORTE_ERR_FATAL; } @@ -1548,7 +1547,7 @@ static int create_app(int argc, char* argv[], orte_app_context_t **app_ptr, */ if (0 < (j = opal_cmd_line_get_ninsts(&cmd_line, "hostfile"))) { if(1 < j) { - opal_show_help("help-orterun.txt", "orterun:multiple-hostfiles", + orte_show_help("help-orterun.txt", "orterun:multiple-hostfiles", true, orterun_basename, NULL); return ORTE_ERR_FATAL; } else { @@ -1558,7 +1557,7 @@ static int create_app(int argc, char* argv[], orte_app_context_t **app_ptr, } if (0 < (j = opal_cmd_line_get_ninsts(&cmd_line, "machinefile"))) { if(1 < j || NULL != app->hostfile) { - opal_show_help("help-orterun.txt", "orterun:multiple-hostfiles", + orte_show_help("help-orterun.txt", "orterun:multiple-hostfiles", true, orterun_basename, NULL); return ORTE_ERR_FATAL; } else { @@ -1599,7 +1598,7 @@ static int create_app(int argc, char* argv[], orte_app_context_t **app_ptr, * the user may fail to specify num_procs for the first app, but * then give us another application. */ - opal_show_help("help-orterun.txt", "orterun:multi-apps-and-zero-np", + orte_show_help("help-orterun.txt", "orterun:multi-apps-and-zero-np", true, orterun_basename, NULL); return ORTE_ERR_FATAL; } @@ -1625,7 +1624,7 @@ static int create_app(int argc, char* argv[], orte_app_context_t **app_ptr, app->app = strdup(app->argv[0]); if (NULL == app->app) { - opal_show_help("help-orterun.txt", "orterun:call-failed", + orte_show_help("help-orterun.txt", "orterun:call-failed", true, orterun_basename, "library", "strdup returned NULL", errno); rc = ORTE_ERR_NOT_FOUND; goto cleanup; @@ -1673,7 +1672,7 @@ static int parse_appfile(char *filename, char ***env) fp = fopen(filename, "r"); if (NULL == fp) { - opal_show_help("help-orterun.txt", "orterun:appfile-not-found", true, + orte_show_help("help-orterun.txt", "orterun:appfile-not-found", true, filename); return ORTE_ERR_NOT_FOUND; } diff --git a/orte/tools/orterun/totalview.c b/orte/tools/orterun/totalview.c index b7bad82ee0..bc3445d2c3 100644 --- a/orte/tools/orterun/totalview.c +++ b/orte/tools/orterun/totalview.c @@ -54,9 +54,8 @@ #include #include "opal/util/opal_environ.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "opal/util/argv.h" -#include "opal/util/show_help.h" #include "opal/util/path.h" #include "opal/util/os_path.h" #include "opal/class/opal_list.h" @@ -278,7 +277,7 @@ static int process(char *orig_line, char *basename, opal_cmd_line_t *cmd_line, -np value if the user did not specify -np on the command line. */ if (used_num_procs && 0 == orterun_globals.num_procs) { - opal_show_help("help-orterun.txt", "debugger requires -np", + orte_show_help("help-orterun.txt", "debugger requires -np", true, (*new_argv)[0], argv[0], user_argv, (*new_argv)[0]); /* Fall through to free / fail, below */ @@ -286,7 +285,7 @@ static int process(char *orig_line, char *basename, opal_cmd_line_t *cmd_line, /* Some debuggers do not support launching MPMD */ else if (single_app && NULL != strchr(tmp, ':')) { - opal_show_help("help-orterun.txt", + orte_show_help("help-orterun.txt", "debugger only accepts single app", true, (*new_argv)[0], (*new_argv)[0]); /* Fall through to free / fail, below */ @@ -296,7 +295,7 @@ static int process(char *orig_line, char *basename, opal_cmd_line_t *cmd_line, must have an executable to run (e.g., cannot use mpirun's app context file feature). */ else if (fail_needed_executable) { - opal_show_help("help-orterun.txt", + orte_show_help("help-orterun.txt", "debugger requires executable", true, (*new_argv)[0], argv[0], (*new_argv)[0], argv[0], (*new_argv)[0]); @@ -333,14 +332,14 @@ void orte_run_debugger(char *basename, opal_cmd_line_t *cmd_line, id = mca_base_param_find("orte", NULL, "base_user_debugger"); if (id < 0) { - opal_show_help("help-orterun.txt", "debugger-mca-param-not-found", + orte_show_help("help-orterun.txt", "debugger-mca-param-not-found", true); exit(1); } value = NULL; mca_base_param_lookup_string(id, &value); if (NULL == value) { - opal_show_help("help-orterun.txt", "debugger-orte_base_user_debugger-empty", + orte_show_help("help-orterun.txt", "debugger-orte_base_user_debugger-empty", true); exit(1); } @@ -359,7 +358,7 @@ void orte_run_debugger(char *basename, opal_cmd_line_t *cmd_line, /* If we didn't find one, abort */ if (NULL == lines[i]) { - opal_show_help("help-orterun.txt", "debugger-not-found", true); + orte_show_help("help-orterun.txt", "debugger-not-found", true); exit(1); } opal_argv_free(lines); @@ -368,7 +367,7 @@ void orte_run_debugger(char *basename, opal_cmd_line_t *cmd_line, execvp(new_argv[0], new_argv); value = opal_argv_join(new_argv, ' '); - opal_show_help("help-orterun.txt", "debugger-exec-failed", + orte_show_help("help-orterun.txt", "debugger-exec-failed", true, basename, value, new_argv[0]); free(value); opal_argv_free(new_argv); @@ -390,20 +389,20 @@ void orte_totalview_init_before_spawn(void) char *s; if (orte_debug_flag) { - opal_output(0, "Info: Spawned by a debugger"); + orte_output(0, "Info: Spawned by a debugger"); } if (mca_base_param_reg_int_name("orte", "mpi_wait_for_totalview", "Whether the MPI application should wait for a debugger or not", false, false, (int)false, &value) < 0) { - opal_output(0, "Error: mca_base_param_reg_int_name\n"); + orte_output(0, "Error: mca_base_param_reg_int_name\n"); } /* push mca parameter into the environment (not done automatically?) */ s = mca_base_param_environ_variable("orte", "mpi_wait_for_totalview", NULL); if (ORTE_SUCCESS != opal_setenv(s, "1", true, &environ)) { - opal_output(0, "Error: Can't setenv %s\n", s); + orte_output(0, "Error: Can't setenv %s\n", s); } free(s); } @@ -433,7 +432,7 @@ void orte_totalview_init_after_spawn(orte_jobid_t jobid) if (0) { /* debugging daemons <<-- needs work */ if (orte_debug_flag) { - opal_output(0, "Info: Setting up debugger process table for daemons\n"); + orte_output(0, "Info: Setting up debugger process table for daemons\n"); } } else { @@ -446,14 +445,14 @@ void orte_totalview_init_after_spawn(orte_jobid_t jobid) */ if (orte_debug_flag) { - opal_output(0, "Info: Setting up debugger process table for applications\n"); + orte_output(0, "Info: Setting up debugger process table for applications\n"); } MPIR_debug_state = 1; /* Get the job data for this job */ if (NULL == (jdata = orte_get_job_data_object(jobid))) { - opal_output(0, "Error: Can't get job data\n"); + orte_output(0, "Error: Can't get job data\n"); return; } @@ -466,7 +465,7 @@ void orte_totalview_init_after_spawn(orte_jobid_t jobid) MPIR_proctable = (struct MPIR_PROCDESC *) malloc(sizeof(struct MPIR_PROCDESC) * MPIR_proctable_size); if (MPIR_proctable == NULL) { - opal_output(0, "Error: Out of memory\n"); + orte_output(0, "Error: Out of memory\n"); } /* initialize MPIR_proctable */ @@ -476,7 +475,7 @@ void orte_totalview_init_after_spawn(orte_jobid_t jobid) apps = (orte_app_context_t**)jdata->apps->addr; for (j=0; j < jdata->num_procs; j++) { if (NULL == procs[j]) { - opal_output(0, "Error: undefined proc at position %ld\n", (long)j); + orte_output(0, "Error: undefined proc at position %ld\n", (long)j); } appctx = apps[procs[j]->app_idx]; diff --git a/orte/util/Makefile.am b/orte/util/Makefile.am index c13e4402ff..8d52cece89 100644 --- a/orte/util/Makefile.am +++ b/orte/util/Makefile.am @@ -35,7 +35,8 @@ headers += \ util/hostfile/hostfile_lex.h \ util/dash_host/dash_host.h \ util/comm/comm.h \ - util/nidmap.h + util/nidmap.h \ + util/output.h libopen_rte_la_SOURCES += \ util/error_strings.c \ @@ -49,4 +50,6 @@ libopen_rte_la_SOURCES += \ util/hostfile/hostfile.c \ util/dash_host/dash_host.c \ util/comm/comm.c \ - util/nidmap.c + util/nidmap.c \ + util/output.c + diff --git a/orte/util/comm/comm.c b/orte/util/comm/comm.c index e488188d61..b1be84c338 100644 --- a/orte/util/comm/comm.c +++ b/orte/util/comm/comm.c @@ -22,7 +22,7 @@ #include #include -#include "opal/util/output.h" +#include "orte/util/output.h" #include "opal/util/printf.h" #include "opal/threads/tsd.h" @@ -240,7 +240,7 @@ int orte_util_comm_attach_stdout(const orte_process_name_t *hnp, orte_std_cntr_t count; int rc, ret=ORTE_ERROR; - OPAL_OUTPUT_VERBOSE((5, orte_debug_output, + ORTE_OUTPUT_VERBOSE((5, orte_debug_output, "%s util_comm_attach_stdout: requesting HNP %s attach stdio for job %s vpid %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(hnp), @@ -279,7 +279,7 @@ int orte_util_comm_attach_stdout(const orte_process_name_t *hnp, goto CLEANUP; } - OPAL_OUTPUT_VERBOSE((5, orte_debug_output, + ORTE_OUTPUT_VERBOSE((5, orte_debug_output, "%s util_comm_attach_stdout: sending request to HNP %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(hnp))); @@ -293,7 +293,7 @@ int orte_util_comm_attach_stdout(const orte_process_name_t *hnp, OBJ_DESTRUCT(&buf); - OPAL_OUTPUT_VERBOSE((5, orte_debug_output, + ORTE_OUTPUT_VERBOSE((5, orte_debug_output, "%s util_comm_attach_stdout: waiting for response", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME))); @@ -327,7 +327,7 @@ int orte_util_comm_attach_stderr(const orte_process_name_t *hnp, orte_std_cntr_t count; int rc, ret=ORTE_ERROR; - OPAL_OUTPUT_VERBOSE((5, orte_debug_output, + ORTE_OUTPUT_VERBOSE((5, orte_debug_output, "%s util_comm_attach_stderr: requesting HNP %s attach stderr for job %s vpid %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(hnp), @@ -366,7 +366,7 @@ int orte_util_comm_attach_stderr(const orte_process_name_t *hnp, goto CLEANUP; } - OPAL_OUTPUT_VERBOSE((5, orte_debug_output, + ORTE_OUTPUT_VERBOSE((5, orte_debug_output, "%s util_comm_attach_stderr: sending request to HNP %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(hnp))); @@ -380,7 +380,7 @@ int orte_util_comm_attach_stderr(const orte_process_name_t *hnp, OBJ_DESTRUCT(&buf); - OPAL_OUTPUT_VERBOSE((5, orte_debug_output, + ORTE_OUTPUT_VERBOSE((5, orte_debug_output, "%s util_comm_attach_stderr: waiting for response", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME))); @@ -432,7 +432,7 @@ int orte_util_comm_spawn_job(const orte_process_name_t *hnp, orte_job_t *jdata) orte_std_cntr_t count; int rc; - OPAL_OUTPUT_VERBOSE((5, orte_debug_output, + ORTE_OUTPUT_VERBOSE((5, orte_debug_output, "%s util_comm_spawn_job: requesting HNP %s spawn new job", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(hnp))); @@ -454,7 +454,7 @@ int orte_util_comm_spawn_job(const orte_process_name_t *hnp, orte_job_t *jdata) } - OPAL_OUTPUT_VERBOSE((5, orte_debug_output, + ORTE_OUTPUT_VERBOSE((5, orte_debug_output, "%s util_comm_spawn_job: sending spawn cmd to HNP %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(hnp))); @@ -467,7 +467,7 @@ int orte_util_comm_spawn_job(const orte_process_name_t *hnp, orte_job_t *jdata) OBJ_DESTRUCT(&buf); - OPAL_OUTPUT_VERBOSE((5, orte_debug_output, + ORTE_OUTPUT_VERBOSE((5, orte_debug_output, "%s util_comm_spawn_job: waiting for response", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME))); @@ -506,7 +506,7 @@ int orte_util_comm_terminate_job(const orte_process_name_t *hnp, orte_jobid_t jo orte_std_cntr_t count; int rc, ret = ORTE_ERROR; - OPAL_OUTPUT_VERBOSE((5, orte_debug_output, + ORTE_OUTPUT_VERBOSE((5, orte_debug_output, "%s util_comm_spawn_job: requesting HNP %s terminate job %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(hnp), @@ -530,7 +530,7 @@ int orte_util_comm_terminate_job(const orte_process_name_t *hnp, orte_jobid_t jo goto CLEANUP; } - OPAL_OUTPUT_VERBOSE((5, orte_debug_output, + ORTE_OUTPUT_VERBOSE((5, orte_debug_output, "%s util_comm_spawn_job: sending terminate cmd to HNP %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(hnp))); @@ -544,7 +544,7 @@ int orte_util_comm_terminate_job(const orte_process_name_t *hnp, orte_jobid_t jo OBJ_DESTRUCT(&buf); - OPAL_OUTPUT_VERBOSE((5, orte_debug_output, + ORTE_OUTPUT_VERBOSE((5, orte_debug_output, "%s util_comm_terminate_job: waiting for response", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME))); @@ -576,7 +576,7 @@ int orte_util_comm_halt_vm(const orte_process_name_t *hnp) orte_daemon_cmd_flag_t command; int rc; - OPAL_OUTPUT_VERBOSE((5, orte_debug_output, + ORTE_OUTPUT_VERBOSE((5, orte_debug_output, "%s util_comm_halt_vm: ordering HNP %s terminate", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), ORTE_NAME_PRINT(hnp))); diff --git a/orte/util/dash_host/dash_host.c b/orte/util/dash_host/dash_host.c index d7fe1c3f09..6dcc5f6ef6 100644 --- a/orte/util/dash_host/dash_host.c +++ b/orte/util/dash_host/dash_host.c @@ -20,10 +20,9 @@ #include "orte/constants.h" #include "orte/types.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "opal/util/argv.h" #include "opal/util/if.h" -#include "opal/util/show_help.h" #include "opal/dss/dss.h" #include "orte/mca/errmgr/errmgr.h" @@ -213,7 +212,7 @@ int orte_util_filter_dash_host_nodes(opal_list_t *nodes, if (j < k) { char *tmp; tmp = opal_argv_join(mapped_nodes, ','); - opal_show_help("help-dash-host.txt", "not-all-mapped-alloc", + orte_show_help("help-dash-host.txt", "not-all-mapped-alloc", true, tmp); free(tmp); rc = ORTE_ERR_SILENT; diff --git a/orte/util/hnp_contact.c b/orte/util/hnp_contact.c index 8914bda6f4..1df749bb78 100644 --- a/orte/util/hnp_contact.c +++ b/orte/util/hnp_contact.c @@ -35,7 +35,7 @@ #include #endif /* HAVE_DIRENT_H */ -#include "opal/util/output.h" +#include "orte/util/output.h" #include "opal/util/os_path.h" #include "opal/util/os_dirpath.h" @@ -75,7 +75,7 @@ int orte_write_hnp_contact_file(char *filename) fp = fopen(filename, "w"); if (NULL == fp) { - opal_output( 0, "Impossible to open the file %s in write mode\n", + orte_output( 0, "Impossible to open the file %s in write mode\n", filename ); ORTE_ERROR_LOG(ORTE_ERR_FILE_OPEN_FAILURE); return ORTE_ERR_FILE_OPEN_FAILURE; diff --git a/orte/util/hostfile/hostfile.c b/orte/util/hostfile/hostfile.c index 256004b513..be678a80c7 100644 --- a/orte/util/hostfile/hostfile.c +++ b/orte/util/hostfile/hostfile.c @@ -28,17 +28,16 @@ #include #include "opal/class/opal_list.h" -#include "opal/util/output.h" #include "opal/util/argv.h" #include "opal/mca/mca.h" #include "opal/mca/base/base.h" -#include "opal/util/show_help.h" #include "opal/threads/mutex.h" #include "opal/util/if.h" #include "opal/util/os_path.h" #include "opal/util/path.h" #include "opal/mca/installdirs/installdirs.h" +#include "orte/util/output.h" #include "orte/util/proc_info.h" #include "orte/util/name_fns.h" #include "orte/mca/errmgr/errmgr.h" @@ -56,7 +55,7 @@ static void hostfile_parse_error(int token) { switch (token) { case ORTE_HOSTFILE_STRING: - opal_show_help("help-hostfile.txt", "parse_error_string", + orte_show_help("help-hostfile.txt", "parse_error_string", true, cur_hostfile_name, orte_util_hostfile_line, @@ -66,7 +65,7 @@ static void hostfile_parse_error(int token) case ORTE_HOSTFILE_IPV4: case ORTE_HOSTFILE_IPV6: case ORTE_HOSTFILE_INT: - opal_show_help("help-hostfile.txt", "parse_error_int", + orte_show_help("help-hostfile.txt", "parse_error_int", true, cur_hostfile_name, orte_util_hostfile_line, @@ -74,7 +73,7 @@ static void hostfile_parse_error(int token) orte_util_hostfile_value.ival); break; default: - opal_show_help("help-hostfile.txt", "parse_error", + orte_show_help("help-hostfile.txt", "parse_error", true, cur_hostfile_name, orte_util_hostfile_line, @@ -161,7 +160,7 @@ static int hostfile_parse_line(int token, opal_list_t* updates, opal_list_t* exc username = strdup(argv[0]); node_name = strdup(argv[1]); } else { - opal_output(0, "WARNING: Unhandled user@host-combination\n"); /* XXX */ + orte_output(0, "WARNING: Unhandled user@host-combination\n"); /* XXX */ } opal_argv_free (argv); @@ -177,7 +176,7 @@ static int hostfile_parse_line(int token, opal_list_t* updates, opal_list_t* exc } node_name[len-1] = '\0'; /* truncate */ - OPAL_OUTPUT_VERBOSE((2, orte_debug_output, + ORTE_OUTPUT_VERBOSE((2, orte_debug_output, "%s hostfile: node %s is being excluded", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), node_name)); @@ -209,7 +208,7 @@ static int hostfile_parse_line(int token, opal_list_t* updates, opal_list_t* exc node_name = strdup(orte_process_info.nodename); } - OPAL_OUTPUT_VERBOSE((2, orte_debug_output, + ORTE_OUTPUT_VERBOSE((2, orte_debug_output, "%s hostfile: node %s is being included - keep all is %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), node_name, keep_all ? "TRUE" : "FALSE")); @@ -249,7 +248,7 @@ static int hostfile_parse_line(int token, opal_list_t* updates, opal_list_t* exc case ORTE_HOSTFILE_SLOTS: rc = hostfile_parse_int(); if (rc < 0) { - opal_show_help("help-hostfile.txt", "slots", + orte_show_help("help-hostfile.txt", "slots", true, cur_hostfile_name, rc); OBJ_RELEASE(node); @@ -267,7 +266,7 @@ static int hostfile_parse_line(int token, opal_list_t* updates, opal_list_t* exc case ORTE_HOSTFILE_SLOTS_MAX: rc = hostfile_parse_int(); if (rc < 0) { - opal_show_help("help-hostfile.txt", "max_slots", + orte_show_help("help-hostfile.txt", "max_slots", true, cur_hostfile_name, ((size_t) rc)); OBJ_RELEASE(node); @@ -280,7 +279,7 @@ static int hostfile_parse_line(int token, opal_list_t* updates, opal_list_t* exc got_max = true; } } else { - opal_show_help("help-hostfile.txt", "max_slots_lt", + orte_show_help("help-hostfile.txt", "max_slots_lt", true, cur_hostfile_name, node->slots, rc); ORTE_ERROR_LOG(ORTE_ERR_BAD_PARAM); @@ -331,7 +330,7 @@ static int hostfile_parse(const char *hostfile, opal_list_t* updates, opal_list_ orte_util_hostfile_done = false; orte_util_hostfile_in = fopen(hostfile, "r"); if (NULL == orte_util_hostfile_in) { - opal_show_help("help-hostfile.txt", "no-hostfile", true, hostfile); + orte_show_help("help-hostfile.txt", "no-hostfile", true, hostfile); rc = ORTE_ERR_NOT_FOUND; goto unlock; } @@ -393,7 +392,7 @@ int orte_util_add_hostfile_nodes(opal_list_t *nodes, int rc; - OPAL_OUTPUT_VERBOSE((1, orte_debug_output, + ORTE_OUTPUT_VERBOSE((1, orte_debug_output, "%s hostfile: checking hostfile %s for nodes", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), hostfile)); @@ -450,7 +449,7 @@ int orte_util_filter_hostfile_nodes(opal_list_t *nodes, bool node_found; int rc; - OPAL_OUTPUT_VERBOSE((1, orte_debug_output, + ORTE_OUTPUT_VERBOSE((1, orte_debug_output, "%s hostfile: filtering nodes through hostfile %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), hostfile)); @@ -518,7 +517,7 @@ int orte_util_filter_hostfile_nodes(opal_list_t *nodes, * This is an error - report it to the user and return an error */ if (0 != opal_list_get_size(&newnodes)) { - opal_show_help("help-hostfile.txt", "not-all-mapped-alloc", + orte_show_help("help-hostfile.txt", "not-all-mapped-alloc", true, hostfile); while (NULL != (item1 = opal_list_remove_first(&newnodes))) { OBJ_RELEASE(item1); @@ -539,7 +538,7 @@ int orte_util_get_ordered_host_list(opal_list_t *nodes, opal_list_item_t *item, *itm; int rc; - OPAL_OUTPUT_VERBOSE((1, orte_debug_output, + ORTE_OUTPUT_VERBOSE((1, orte_debug_output, "%s hostfile: creating ordered list of hosts from hostfile %s", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), hostfile)); diff --git a/orte/util/name_fns.c b/orte/util/name_fns.c index cb5b4fabfd..855191684e 100644 --- a/orte/util/name_fns.c +++ b/orte/util/name_fns.c @@ -22,7 +22,7 @@ #include #include -#include "opal/util/output.h" +#include "orte/util/output.h" #include "opal/util/printf.h" #include "opal/threads/tsd.h" diff --git a/orte/util/nidmap.c b/orte/util/nidmap.c index 6dd242b654..2257eb731b 100644 --- a/orte/util/nidmap.c +++ b/orte/util/nidmap.c @@ -24,11 +24,10 @@ #include #include -#include "opal/util/output.h" -#include "opal/util/show_help.h" #include "opal/dss/dss.h" #include "orte/mca/errmgr/errmgr.h" +#include "orte/util/output.h" #include "orte/util/proc_info.h" #include "orte/util/name_fns.h" #include "orte/runtime/orte_globals.h" @@ -98,7 +97,7 @@ int orte_util_encode_nodemap(opal_byte_object_t *boptr) /* if it is anything but a digit, * then that's not good */ - opal_output(0, "%s encode:nidmap Nodename pattern is nonstandard", + orte_output(0, "%s encode:nidmap Nodename pattern is nonstandard", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME)); return ORTE_ERROR; } @@ -130,7 +129,7 @@ int orte_util_encode_nodemap(opal_byte_object_t *boptr) /* and the starting offset */ opal_dss.pack(&buf, &firstnode, 1, OPAL_INT32); - OPAL_OUTPUT_VERBOSE((2, orte_debug_output, + ORTE_OUTPUT_VERBOSE((2, orte_debug_output, "%s encode:nidmap:contig_nodes prefix %s num_digits %d offset %d", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), prefix, num_digs, firstnode)); @@ -161,7 +160,7 @@ int orte_util_encode_nodemap(opal_byte_object_t *boptr) opal_dss.pack(&buf, &lastnode, 1, OPAL_INT32); /* indicate start of new range */ opal_dss.pack(&buf, &nodenum, 1, OPAL_INT32); - OPAL_OUTPUT_VERBOSE((2, orte_debug_output, + ORTE_OUTPUT_VERBOSE((2, orte_debug_output, "%s encode:nidmap:contig_nodes end range %d start next range %d", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), lastnode, nodenum)); } @@ -169,7 +168,7 @@ int orte_util_encode_nodemap(opal_byte_object_t *boptr) } /* pack end of range */ opal_dss.pack(&buf, &lastnode, 1, OPAL_INT32); - OPAL_OUTPUT_VERBOSE((2, orte_debug_output, + ORTE_OUTPUT_VERBOSE((2, orte_debug_output, "%s encode:nidmap:contig_nodes end range %d", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), lastnode)); /* pack flag end of ranges */ @@ -179,7 +178,7 @@ int orte_util_encode_nodemap(opal_byte_object_t *boptr) /* if the nodes aren't contiguous, then we need * to simply pack every nodename individually */ - OPAL_OUTPUT_VERBOSE((2, orte_debug_output, + ORTE_OUTPUT_VERBOSE((2, orte_debug_output, "%s encode:nidmap non_contig_nodes - packing all names", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME))); /* indicate that this will not be a contiguous node map */ @@ -240,7 +239,7 @@ int orte_util_decode_nodemap(opal_byte_object_t *bo, opal_pointer_array_t *nodes #endif opal_buffer_t buf; - OPAL_OUTPUT_VERBOSE((2, orte_debug_output, + ORTE_OUTPUT_VERBOSE((2, orte_debug_output, "%s decode:nidmap decoding nodemap", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME))); @@ -253,7 +252,7 @@ int orte_util_decode_nodemap(opal_byte_object_t *bo, opal_pointer_array_t *nodes n=1; opal_dss.unpack(&buf, &num_nodes, &n, OPAL_INT32); - OPAL_OUTPUT_VERBOSE((2, orte_debug_output, + ORTE_OUTPUT_VERBOSE((2, orte_debug_output, "%s decode:nidmap decoding %d nodes with %d already loaded", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), num_nodes, nodes->lowest_free)); @@ -322,7 +321,7 @@ int orte_util_decode_nodemap(opal_byte_object_t *bo, opal_pointer_array_t *nodes step = 1; } - OPAL_OUTPUT_VERBOSE((2, orte_debug_output, + ORTE_OUTPUT_VERBOSE((2, orte_debug_output, "%s decode:nidmap:contig_nodes prefix %s num_digits %d offset %d endrange %d", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), prefix, num_digs, lastnode, endrange)); @@ -398,10 +397,10 @@ arch: free(arch); #endif - if (0 < opal_output_get_verbosity(orte_debug_output)) { + if (0 < orte_output_get_verbosity(orte_debug_output)) { nd = (orte_nid_t**)nodes->addr; for (i=0; i < num_nodes; i++) { - opal_output(0, "%s node[%d].name %s arch %0x", + orte_output(0, "%s node[%d].name %s arch %0x", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), i, (NULL == nd[i]) ? "NULL" : nd[i]->name, (NULL == nd[i]) ? 0 : nd[i]->arch); diff --git a/orte/util/output.c b/orte/util/output.c new file mode 100644 index 0000000000..4e99a6b34e --- /dev/null +++ b/orte/util/output.c @@ -0,0 +1,965 @@ +/* + * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana + * University Research and Technology + * Corporation. All rights reserved. + * Copyright (c) 2004-2006 The University of Tennessee and The University + * of Tennessee Research Foundation. All rights + * reserved. + * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, + * University of Stuttgart. All rights reserved. + * Copyright (c) 2004-2005 The Regents of the University of California. + * All rights reserved. + * Copyright (c) 2008 Cisco Systems, Inc. All rights reserved. + * $COPYRIGHT$ + * + * Additional copyrights may follow + * + * $HEADER$ + */ +#include "orte_config.h" +#include "orte/types.h" +#include "orte/constants.h" + +#include +#include +#include + +#include "opal/util/show_help.h" +#include "opal/util/output.h" +#include "opal/util/printf.h" +#include "opal/dss/dss.h" +#include "opal/mca/filter/filter.h" + +#include "orte/mca/errmgr/errmgr.h" +#include "orte/mca/rml/rml.h" +#include "orte/util/name_fns.h" +#include "orte/runtime/orte_globals.h" + +#include "orte/util/output.h" + +/* A bunch of wrappers around lower-level OPAL functions -- need no + ORTE infrastructure */ + +int orte_output_reopen(int output_id, opal_output_stream_t *lds) +{ + /* this function just acts as a wrapper around the + * corresponding opal_output fn + */ + return opal_output_reopen(output_id, lds); +} + +bool orte_output_switch(int output_id, bool enable) +{ + /* this function just acts as a wrapper around the + * corresponding opal_output fn + */ + return opal_output_switch(output_id, enable); +} + +void orte_output_reopen_all(void) +{ + /* this function just acts as a wrapper around the + * corresponding opal_output fn + */ + opal_output_reopen_all(); +} + +void orte_output_set_verbosity(int output_id, int level) +{ + /* this function just acts as a wrapper around the + * corresponding opal_output fn + */ + opal_output_set_verbosity(output_id, level); +} + +int orte_output_get_verbosity(int output_id) +{ + /* this function just acts as a wrapper around the + * corresponding opal_output fn + */ + return opal_output_get_verbosity(output_id); +} + +/* Whether we aggregate show_help() messages or not */ +static bool want_aggregate = true; + +/* Whether to report recursions or not */ +static bool show_recursions; + +static void register_mca(void) +{ + int tmp; + + mca_base_param_reg_int_name("orte", "base_help_aggregate", + "If orte_base_help_aggregate is true, duplicate help messages will be aggregated rather than displayed individually. This can be helpful for parallel jobs that experience multiple identical failures; rather than print out the same help/failure message N times, display it once with a count of how many processes sent the same message.", + false, false, + (int) want_aggregate, &tmp); + want_aggregate = OPAL_INT_TO_BOOL(tmp); + + mca_base_param_reg_int_name("orte", "base_show_output_recursions", + "If orte_base_show_output_recursion is true, recursive calls to orte_output will be reported to stderr", + false, false, + (int) false, &tmp); + show_recursions = OPAL_INT_TO_BOOL(tmp); + +} + + + +/************************************************************************/ + +/* Section for systems without RML and/or HNP support (e.g., Cray) -- + just output directly; don't do any fancy RML sending to the HNP. */ +#if ORTE_DISABLE_FULL_SUPPORT + +static int stderr_stream = -1; + +int orte_output_init(void) +{ + stderr_stream = opal_output_open(NULL); + regiester_mca(); + if (0 == ORTE_PROC_MY_NAME->vpid && want_aggregate) { + orte_output(stderr_stream, "WARNING: orte_base_help_aggregate was set to true, but this system does not support help message aggregation"); + } + return ORTE_SUCCESS; +} + +void orte_output_finalize(void) +{ + opal_output_close(stderr_stream); + return; +} + +int orte_output_open(opal_output_stream_t *lds, const char *primary_tag, ...) +{ + return opal_output_open(lds); +} + +void orte_output(int output_id, const char *format, ...) +{ + /* just call opal_output_vverbose with a verbosity of 0 */ + va_list arglist; + va_start(arglist, format); + opal_output_vverbose(0, output_id, format, arglist); + va_end(arglist); +} + +void orte_output_verbose(int verbose_level, int output_id, const char *format, ...) +{ + /* just call opal_output_verbose with the specified verbosity */ + va_list arglist; + va_start(arglist, format); + opal_output_vverbose(verbose_level, output_id, format, arglist); + va_end(arglist); +} + +void orte_output_close(int output_id) +{ + opal_output_close(output_id); +} + + +int orte_show_help(const char *filename, const char *topic, + bool want_error_header, ...) +{ + va_list arglist; + char *output; + + va_start(arglist, want_error_header); + output = opal_show_help_vstring(filename, topic, want_error_header, + arglist); + va_end(arglist); + + /* If nothing came back, there's nothing to do */ + if (NULL == output) { + return ORTE_SUCCESS; + } + + opal_output(stderr_stream, output); + return ORTE_SUCCESS; +} + + +#else + +/************************************************************************/ + +/* Section for systems that have full RML/HNP support */ + +/* defines used solely internal to orte_output */ +#define ORTE_OUTPUT_OTHER 0x00 +#define ORTE_OUTPUT_STDOUT 0x01 +#define ORTE_OUTPUT_STDERR 0x02 +#define ORTE_OUTPUT_SHOW_HELP 0x04 + +#define ORTE_OUTPUT_MAX_TAGS 10 + +/* struct to store stream-specific data */ +typedef struct { + opal_object_t super; + uint8_t flags; + int num_tags; + char *tags[ORTE_OUTPUT_MAX_TAGS]; +} orte_output_stream_t; + +static void orte_output_stream_constructor(orte_output_stream_t *ptr) +{ + ptr->flags = ORTE_OUTPUT_OTHER; + ptr->num_tags = 0; + memset(ptr->tags, 0, ORTE_OUTPUT_MAX_TAGS*sizeof(char*)); +} +static void orte_output_stream_destructor(orte_output_stream_t *ptr) +{ + int i; + + for (i=0; i < ORTE_OUTPUT_MAX_TAGS; i++) { + if (NULL != ptr->tags[i]) { + free(ptr->tags[i]); + } + } +} + +OBJ_CLASS_INSTANCE(orte_output_stream_t, opal_object_t, + orte_output_stream_constructor, + orte_output_stream_destructor); + +/* List items for holding process names */ +typedef struct { + opal_list_item_t super; + /* The process name */ + orte_process_name_t pnli_name; +} process_name_list_item_t; + +static void process_name_list_item_constructor(process_name_list_item_t *obj); +OBJ_CLASS_INSTANCE(process_name_list_item_t, opal_list_item_t, + process_name_list_item_constructor, NULL); + +/* List items for holding (filename, topic) tuples */ +typedef struct { + opal_list_item_t super; + /* The filename */ + char *tli_filename; + /* The topic */ + char *tli_topic; + /* List of process names that have displayed this (filename, topic) */ + opal_list_t tli_processes; + /* Time this message was displayed */ + time_t tli_time_displayed; + /* Count of processes since last display (i.e., "new" processes + that have showed this message that have not yet been output) */ + int tli_count_since_last_display; +} tuple_list_item_t; + +static void tuple_list_item_constructor(tuple_list_item_t *obj); +static void tuple_list_item_destructor(tuple_list_item_t *obj); +OBJ_CLASS_INSTANCE(tuple_list_item_t, opal_list_item_t, + tuple_list_item_constructor, + tuple_list_item_destructor); + + +/* List of (filename, topic) tuples that have already been displayed */ +static opal_list_t abd_tuples; + +/* How long to wait between displaying duplicate show_help notices */ +static struct timeval show_help_interval = { 5, 0 }; + +/* Timer for displaying duplicate help message notices */ +time_t show_help_time_last_displayed = 0; +bool show_help_timer_set = false; +static opal_event_t show_help_timer_event; + +/* Local static variables */ +static int stdout_stream, stderr_stream; +static opal_output_stream_t stdout_lds, stderr_lds, orte_output_default; +static opal_pointer_array_t orte_output_streams; +static bool orte_output_ready = false; + +static void process_name_list_item_constructor(process_name_list_item_t *obj) +{ + obj->pnli_name = orte_globals_name_invalid; +} + +static void tuple_list_item_constructor(tuple_list_item_t *obj) +{ + obj->tli_filename = NULL; + obj->tli_topic = NULL; + OBJ_CONSTRUCT(&(obj->tli_processes), opal_list_t); + obj->tli_time_displayed = time(NULL); + obj->tli_count_since_last_display = 0; +} + +static void tuple_list_item_destructor(tuple_list_item_t *obj) +{ + opal_list_item_t *item, *next; + + if (NULL != obj->tli_filename) { + free(obj->tli_filename); + } + if (NULL != obj->tli_topic) { + free(obj->tli_topic); + } + for (item = opal_list_get_first(&(obj->tli_processes)); + opal_list_get_end(&(obj->tli_processes)) != item; + item = next) { + next = opal_list_get_next(item); + opal_list_remove_item(&(obj->tli_processes), item); + OBJ_RELEASE(item); + } +} + +/* + * Check to see if a given (filename, topic) tuple has been displayed + * already. Return ORTE_SUCCESS if so, or ORTE_ERR_NOT_FOUND if not. + * + * Always return a tuple_list_item_t representing this (filename, + * topic) entry in the list of "already been displayed tuples" (if it + * wasn't in the list already, this function will create a new entry + * in the list and return it). + * + * Note that a list is not an overly-efficient mechanism for this kind + * of data. The assupmtion is that there will only be a small numebr + * of (filename, topic) tuples displayed so the storage required will + * be fairly small, and linear searches will be fast enough. + */ +static int get_tli(const char *filename, const char *topic, + tuple_list_item_t **tli) +{ + opal_list_item_t *item; + + /* Search the list for a duplicate. */ + for (item = opal_list_get_first(&abd_tuples); + opal_list_get_end(&abd_tuples) != item; + item = opal_list_get_next(item)) { + (*tli) = (tuple_list_item_t*) item; + if (0 == strcmp((*tli)->tli_filename, filename) && + 0 == strcmp((*tli)->tli_topic, topic)) { + return ORTE_SUCCESS; + } + } + + /* Nope, we didn't find it -- make a new one */ + *tli = OBJ_NEW(tuple_list_item_t); + if (NULL == *tli) { + return ORTE_ERR_OUT_OF_RESOURCE; + } + (*tli)->tli_filename = strdup(filename); + (*tli)->tli_topic = strdup(topic); + opal_list_append(&abd_tuples, &((*tli)->super)); + return ORTE_ERR_NOT_FOUND; +} + + + +static void output_vverbose(int verbose_level, int output_id, + int major_id, int minor_id, + const char *format, va_list arglist) +{ + char *output = NULL, *filtered = NULL; + opal_buffer_t buf; + uint8_t flag; + orte_output_stream_t **streams; + int rc; + static bool am_inside = false; + + if (output_id < 0) { + /* to be ignored */ + return; + } + + /* If we were called before this subsystem was initialized (or + after it was finalized), then just pass it down to + opal_output(). What else can we do? Shrug. */ + if (!orte_output_ready) { + opal_output_vverbose(verbose_level, output_id, format, arglist); + return; + } + + /* Render the string. If we get nothing back, there's nothing to + do (e.g., verbose level was too high) */ + output = opal_output_vstring(verbose_level, output_id, format, arglist); + if (NULL == output) { + return; + } + + /* We got a string back, so run it through the filter */ + streams = (orte_output_stream_t**)orte_output_streams.addr; + filtered = opal_filter.process(output, major_id, minor_id, + streams[output_id]->num_tags, + streams[output_id]->tags); + if (NULL == filtered) { + filtered = output; + } + + /* Per a soon-to-be-filed trac ticket: because this function calls + RML send, recursion is possible in two places: + + 1. RML send itself calls orte_output() + 2. RML send can call progress, which might call something which + calls orte_output + + So how to avoid the infinite loop? #1 is more of an issue than + #2, but it still *could* happen that #2 could cause infinit + recursion. It is not practical for RML send (and anything that + it calls) to use opal_output instead of orte_output. + + We have some ideas how to avoid the recursion, but for the sake + of getting this working, we're just going to opal_output the + message for now. Hence, the developer/user will always see the + message, but tools who are parsing different channels for the + output may see this message on the "wrong channel" (e.g., in + the MPI process' stdout instead of the special channel from the + HNP). + */ + if (am_inside) { + if (show_recursions) { + opal_output(0, "%s orte_output recursion detected!", ORTE_NAME_PRINT(ORTE_PROC_MY_NAME)); + } + opal_output(output_id, filtered); + goto cleanup; + } + am_inside = true; + + /* if I am the HNP, then I need to just pass this on to the + * opal_output_verbose function using the provided stream + */ + if (orte_process_info.hnp) { + OPAL_OUTPUT_VERBOSE((5, orte_debug_output, + "%s output to stream %d", + ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), + output_id)); + opal_output(output_id, filtered); + goto cleanup; + } + + /* If there's other flags besides STDOUT and STDERR set, then also + output this locally via opal_output */ + if ((~(ORTE_OUTPUT_STDOUT | ORTE_OUTPUT_STDERR)) & + streams[output_id]->flags) { + OPAL_OUTPUT_VERBOSE((5, orte_debug_output, + "%s locally output to stream %d", + ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), + output_id)); + /* pass the values to opal_output for local handling */ + opal_output(output_id, filtered); + } + + /* We only relay stdout/stderr to the HNP. Note that it is + important to do the RML send last in this function -- do not + move it earlier! Putting it last ensures that we keep the same + relative ordering of output from local calls to opal_output + (e.g., for syslog or file, above) as the RML sends to the + HNP. */ + flag = streams[output_id]->flags; + if (ORTE_OUTPUT_STDOUT & flag || ORTE_OUTPUT_STDERR & flag) { + OPAL_OUTPUT_VERBOSE((5, orte_debug_output, + "%s sending filtered output \'%s\' from stream %d", + ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), + filtered, output_id)); + + /* If RML is not yet setup, then just output this locally. + What else can we do? */ + if (NULL == orte_rml.send_buffer) { + opal_output(0, filtered); + } else { + /* setup a buffer to send to the HNP */ + OBJ_CONSTRUCT(&buf, opal_buffer_t); + /* pack a flag indicating the output channel */ + opal_dss.pack(&buf, &flag, 1, OPAL_UINT8); + /* pack the string */ + opal_dss.pack(&buf, &filtered, 1, OPAL_STRING); + /* send to the HNP */ + if (0 > (rc = orte_rml.send_buffer(ORTE_PROC_MY_HNP, &buf, + ORTE_RML_TAG_OUTPUT, 0))) { + ORTE_ERROR_LOG(rc); + } + OBJ_DESTRUCT(&buf); + } + } + + cleanup: + if (filtered != output && NULL != filtered) { + free(filtered); + } + if (NULL != output) { + free(output); + } + am_inside = false; +} + +static void show_accumulated_duplicates(int fd, short event, void *context) +{ + opal_list_item_t *item; + time_t now = time(NULL); + tuple_list_item_t *tli; + + /* Loop through all the messages we've displayed and see if any + processes have sent duplicates that have not yet been displayed + yet */ + for (item = opal_list_get_first(&abd_tuples); + opal_list_get_end(&abd_tuples) != item; + item = opal_list_get_next(item)) { + tli = (tuple_list_item_t*) item; + if (tli->tli_count_since_last_display > 0) { + orte_output(stderr_stream, + "%d more process%s sent help message %s / %s", + tli->tli_count_since_last_display, + (tli->tli_count_since_last_display > 1) ? "es have" : " has", + tli->tli_filename, tli->tli_topic); + tli->tli_count_since_last_display = 0; + } + } + + show_help_time_last_displayed = now; + show_help_timer_set = false; +} + +static int show_help(const char *filename, const char *topic, + const char *output, orte_process_name_t *sender) +{ + int rc; + tuple_list_item_t *tli; + process_name_list_item_t *pnli; + time_t now = time(NULL); + + /* If we're aggregating, check for duplicates. Otherwise, don't + track duplicates at all and always display the message. */ + if (want_aggregate) { + rc = get_tli(filename, topic, &tli); + } else { + rc = ORTE_ERR_NOT_FOUND; + } + + /* Was it already displayed? */ + if (ORTE_SUCCESS == rc) { + /* Yes. But do we want to print anything? That's complicated. + + We always show the first message of a given (filename, + topic) tuple as soon as it arrives. But we don't want to + show duplicate notices often, because we could get overrun + with them. So we want to gather them up and say "We got N + duplicates" every once in a while. + + And keep in mind that at termination, we'll unconditionally + show all accumulated duplicate notices. + + A simple scheme is as follows: + - when the first of a (filename, topic) tuple arrives + - print the message + - if a timer is not set, set T=now + - when a duplicate (filename, topic) tuple arrives + - if now>(T+5) and timer is not set (due to + non-pre-emptiveness of our libevent, a timer *could* be + set!) + - print all accumulated duplicates + - reset T=now + - else if a timer was not set, set the timer for T+5 + - else if a timer was set, do nothing (just wait) + - set T=now when the timer expires + */ + ++tli->tli_count_since_last_display; + if (now > show_help_time_last_displayed + 5 && !show_help_timer_set) { + show_accumulated_duplicates(0, 0, NULL); + } else if (!show_help_timer_set) { + opal_evtimer_set(&show_help_timer_event, + show_accumulated_duplicates, NULL); + opal_evtimer_add(&show_help_timer_event, &show_help_interval); + show_help_timer_set = true; + } + } + /* Not already displayed */ + else if (ORTE_ERR_NOT_FOUND == rc) { + orte_output(stderr_stream, output); + if (!show_help_timer_set) { + show_help_time_last_displayed = now; + } + } + /* Some other error occurred */ + else { + ORTE_ERROR_LOG(rc); + return rc; + } + + /* If we're aggregating, add this process name to the list */ + if (want_aggregate) { + pnli = OBJ_NEW(process_name_list_item_t); + if (NULL == pnli) { + rc = ORTE_ERR_OUT_OF_RESOURCE; + ORTE_ERROR_LOG(rc); + return rc; + } + pnli->pnli_name = *sender; + opal_list_append(&(tli->tli_processes), &(pnli->super)); + } + return ORTE_SUCCESS; +} + + +/* Note that this function is called from ess/hnp, so don't make it + static */ +void orte_output_recv_output(int status, orte_process_name_t* sender, + opal_buffer_t *buffer, orte_rml_tag_t tag, + void* cbdata) +{ + char *output=NULL; + char *filename=NULL, *topic=NULL; + uint8_t flag; + int32_t n; + int rc; + + OPAL_OUTPUT_VERBOSE((5, orte_debug_output, + "%s got output from sender %s", + ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), + ORTE_NAME_PRINT(sender))); + + /* unpack the flag indicating the output stream */ + n = 1; + if (ORTE_SUCCESS != (rc = opal_dss.unpack(buffer, &flag, &n, OPAL_UINT8))) { + ORTE_ERROR_LOG(rc); + goto cleanup; + } + + /* if the flag is from show_help... */ + if (ORTE_OUTPUT_SHOW_HELP & flag) { + OPAL_OUTPUT_VERBOSE((5, orte_debug_output, + "%s got output from show_help", + ORTE_NAME_PRINT(ORTE_PROC_MY_NAME))); + + /* unpack the filename of the show_help text file */ + n = 1; + if (ORTE_SUCCESS != (rc = opal_dss.unpack(buffer, &filename, &n, OPAL_STRING))) { + ORTE_ERROR_LOG(rc); + goto cleanup; + } + /* unpack the topic tag */ + n = 1; + if (ORTE_SUCCESS != (rc = opal_dss.unpack(buffer, &topic, &n, OPAL_STRING))) { + ORTE_ERROR_LOG(rc); + goto cleanup; + } + /* unpack the resulting string */ + n = 1; + if (ORTE_SUCCESS != (rc = opal_dss.unpack(buffer, &output, &n, OPAL_STRING))) { + ORTE_ERROR_LOG(rc); + goto cleanup; + } + + /* Send it to show_help */ + rc = show_help(filename, topic, output, sender); + } else { + OPAL_OUTPUT_VERBOSE((5, orte_debug_output, + "%s got output from stdout/err", + ORTE_NAME_PRINT(ORTE_PROC_MY_NAME))); + /* this must be from stdout or stderr - get the string */ + n = 1; + if (ORTE_SUCCESS != (rc = opal_dss.unpack(buffer, &output, &n, OPAL_STRING))) { + ORTE_ERROR_LOG(rc); + goto cleanup; + } + /* output via appropriate channel */ + if (ORTE_OUTPUT_STDOUT & flag) { + OPAL_OUTPUT_VERBOSE((5, orte_debug_output, + "%s output %s to stdout", + ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), + output)); + opal_output(stdout_stream, output); + } else { + OPAL_OUTPUT_VERBOSE((5, orte_debug_output, + "%s output %s to stderr", + ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), + output)); + opal_output(stderr_stream, output); + } + } + +cleanup: + if (NULL != output) { + free(output); + } + if (NULL != filename) { + free(filename); + } + if (NULL != topic) { + free(topic); + } + /* reissue the recv */ + rc = orte_rml.recv_buffer_nb(ORTE_NAME_WILDCARD, ORTE_RML_TAG_OUTPUT, + ORTE_RML_NON_PERSISTENT, orte_output_recv_output, NULL); + if (rc != ORTE_SUCCESS && rc != ORTE_ERR_NOT_IMPLEMENTED) { + ORTE_ERROR_LOG(rc); + } +} + +int orte_output_init(void) +{ + orte_output_stream_t *stream; + + OPAL_OUTPUT_VERBOSE((5, orte_debug_output, "orte_output init")); + + register_mca(); + + /* define the default stream that has everything off */ + OBJ_CONSTRUCT(&orte_output_default, opal_output_stream_t); + + /* Show help duplicate detection */ + OBJ_CONSTRUCT(&abd_tuples, opal_list_t); + + /* setup arrays to track what output streams are + * going to stdout and/or stderr, and to track + * tags for possible filtering + */ + OBJ_CONSTRUCT(&orte_output_streams, opal_pointer_array_t); + /* reserve places for 50 streams - the array will + * resize above that if required + */ + opal_pointer_array_init(&orte_output_streams, 50, INT_MAX, 10); + /* initialize the 0 position of the array as this + * corresponds to the automatically-opened stderr + * stream of opal_output + */ + stream = OBJ_NEW(orte_output_stream_t); + stream->flags = ORTE_OUTPUT_STDERR; + stream->num_tags = 1; + stream->tags[0] = strdup("STDERR"); + opal_pointer_array_set_item(&orte_output_streams, 0, stream); + + /* if we are on the HNP, we need to open + * dedicated orte_output streams for stdout/stderr + * for our use so that we can control their behavior + */ + if (orte_process_info.hnp) { + /* setup stdout stream - we construct our own + * stream object so we can control the behavior + * for outputting stuff from remote procs + */ + OBJ_CONSTRUCT(&stdout_lds, opal_output_stream_t); + /* deliver to stdout only */ + stdout_lds.lds_want_stdout = true; + stdout_stream = opal_output_open(&stdout_lds); + stream = OBJ_NEW(orte_output_stream_t); + stream->flags = ORTE_OUTPUT_STDOUT; + stream->num_tags = 1; + stream->tags[0] = strdup("STDOUT"); + opal_pointer_array_set_item(&orte_output_streams, stdout_stream, stream); + /* setup stderr stream - we construct our own + * stream object so we can control the behavior + */ + OBJ_CONSTRUCT(&stderr_lds, opal_output_stream_t); + /* deliver to stderr only */ + stderr_lds.lds_want_stderr = true; + /* we filter the stderr */ + stderr_lds.lds_filter_flags = OPAL_OUTPUT_FILTER_STDERR; + stderr_stream = opal_output_open(&stderr_lds); + stream = OBJ_NEW(orte_output_stream_t); + stream->flags = ORTE_OUTPUT_STDERR; + stream->num_tags = 1; + stream->tags[0] = strdup("STDERR"); + opal_pointer_array_set_item(&orte_output_streams, stderr_stream, stream); + } + + orte_output_ready = true; + return ORTE_SUCCESS; +} + +void orte_output_finalize(void) +{ + int i; + orte_output_stream_t **streams; + + orte_output_ready = false; + + OBJ_DESTRUCT(&orte_output_default); + + /* Shutdown show_help, showing final messages */ + if (orte_process_info.hnp) { + show_accumulated_duplicates(0, 0, NULL); + } + OBJ_DESTRUCT(&abd_tuples); + if (show_help_timer_set) { + opal_evtimer_del(&show_help_timer_event); + } + + /* if we are the HNP, cancel the recv */ + if (orte_process_info.hnp) { + orte_rml.recv_cancel(ORTE_NAME_WILDCARD, ORTE_RML_TAG_OUTPUT); + /* close our output streams */ + opal_output_close(stdout_stream); + opal_output_close(stderr_stream); + OBJ_DESTRUCT(&stdout_lds); + OBJ_DESTRUCT(&stderr_lds); + return; + } + + /* if we are not the HNP, we just need to + * cleanup our tracking array + */ + streams = (orte_output_stream_t**)orte_output_streams.addr; + for (i=0; i < orte_output_streams.size; i++) { + if (NULL != streams[i]) { + OBJ_RELEASE(streams[i]); + } + } + OBJ_DESTRUCT(&orte_output_streams); +} + +int orte_output_open(opal_output_stream_t *lds, const char *primary_tag, ...) +{ + int stream; + uint8_t flag = ORTE_OUTPUT_OTHER; + orte_output_stream_t *ptr; + va_list arglist; + char *tag; + + /* if we are the HNP, this function just acts as + * a wrapper around the corresponding opal_output fn + */ + if (orte_process_info.hnp) { + stream = opal_output_open(lds); + OPAL_OUTPUT_VERBOSE((5, orte_debug_output, "HNP opened stream %d", stream)); + goto track; + } + + /* if we not the HNP, then we need to open the stream + * and also record whether or not it is sending + * output to stdout/stderr + */ + if (NULL == lds) { + /* we have to ensure that the opal_output stream + * doesn't open stdout and stderr, so setup the + * stream here and ensure the settings are + * correct - otherwise, opal_output will default + * the stream to having stderr active! + */ + lds = &orte_output_default; + flag = ORTE_OUTPUT_STDERR; + } else { + /* does this stream involve stdout? */ + if (lds->lds_want_stdout) { + flag |= ORTE_OUTPUT_STDOUT; + lds->lds_want_stdout = false; + } + /* does it involve stderr? */ + if (lds->lds_want_stderr) { + flag |= ORTE_OUTPUT_STDERR; + lds->lds_want_stderr = false; + } + } + /* open the stream */ + stream = opal_output_open(lds); + + OPAL_OUTPUT_VERBOSE((5, orte_debug_output, + "%s opened stream %d", + ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), + stream)); + +track: + /* track the settings */ + ptr = OBJ_NEW(orte_output_stream_t); + ptr->flags = flag; + ptr->num_tags = 1; + ptr->tags[0] = strdup(primary_tag); + va_start(arglist, primary_tag); + while (NULL != (tag = va_arg(arglist, char*))) { + ptr->tags[ptr->num_tags] = strdup(tag); + ptr->num_tags++; + } + va_end(arglist); + opal_pointer_array_set_item(&orte_output_streams, stream, ptr); + + return stream; +} + +void orte_output(int output_id, const char *format, ...) +{ + /* just call output_vverbose with a verbosity of 0 */ + va_list arglist; + va_start(arglist, format); + output_vverbose(0, output_id, ORTE_PROC_MY_NAME->jobid, ORTE_PROC_MY_NAME->vpid, format, arglist); + va_end(arglist); +} + +void orte_output_verbose(int verbose_level, int output_id, const char *format, ...) +{ + /* just call output_verbose with the specified verbosity */ + va_list arglist; + va_start(arglist, format); + output_vverbose(verbose_level, output_id, ORTE_PROC_MY_NAME->jobid, ORTE_PROC_MY_NAME->vpid, format, arglist); + va_end(arglist); +} + +void orte_output_close(int output_id) +{ + orte_output_stream_t **streams; + + /* cleanout the stream settings */ + streams = (orte_output_stream_t**)orte_output_streams.addr; + if (output_id >= 0 && NULL != streams[output_id]) { + OBJ_RELEASE(streams[output_id]); + } + opal_output_close(output_id); +} + + +int orte_show_help(const char *filename, const char *topic, + bool want_error_header, ...) +{ + int rc = ORTE_SUCCESS; + va_list arglist; + char *output; + + va_start(arglist, want_error_header); + output = opal_show_help_vstring(filename, topic, want_error_header, + arglist); + va_end(arglist); + + /* If nothing came back, there's nothing to do */ + if (NULL == output) { + return ORTE_SUCCESS; + } + + if (orte_process_info.hnp) { + rc = show_help(filename, topic, output, ORTE_PROC_MY_NAME); + } + + /* if we are not the HNP, then we must relay the output message to + * the HNP for processing + */ + else { + opal_buffer_t buf; + uint8_t flag = ORTE_OUTPUT_SHOW_HELP; + int rc; + static bool am_inside = false; + + /* JMS Note that we *may* have a similar recursion situation + as with output_vverbose(), above. Need to think about this + properly, but put a safeguard in here for sure for the time + being. */ + if (am_inside) { + rc = show_help(filename, topic, output, ORTE_PROC_MY_NAME); + } else { + am_inside = true; + + /* build the message to the HNP */ + OBJ_CONSTRUCT(&buf, opal_buffer_t); + /* pack the flag indicating this is from show_help */ + opal_dss.pack(&buf, &flag, 1, OPAL_UINT8); + /* pack the filename of the show_help text file */ + opal_dss.pack(&buf, &filename, 1, OPAL_STRING); + /* pack the topic tag */ + opal_dss.pack(&buf, &topic, 1, OPAL_STRING); + /* pack the resulting string */ + opal_dss.pack(&buf, &output, 1, OPAL_STRING); + /* send it to the HNP */ + if (0 > (rc = orte_rml.send_buffer(ORTE_PROC_MY_HNP, &buf, ORTE_RML_TAG_OUTPUT, 0))) { + ORTE_ERROR_LOG(rc); + } + OBJ_DESTRUCT(&buf); + am_inside = false; + } + } + + free(output); + return rc; +} + +#endif /* ORTE_DISABLE_FULL_SUPPORT */ + diff --git a/orte/util/output.h b/orte/util/output.h new file mode 100644 index 0000000000..2a105336cf --- /dev/null +++ b/orte/util/output.h @@ -0,0 +1,333 @@ +/* + * Copyright (c) 2004-2008 The Trustees of Indiana University and Indiana + * University Research and Technology + * Corporation. All rights reserved. + * Copyright (c) 2004-2006 The University of Tennessee and The University + * of Tennessee Research Foundation. All rights + * reserved. + * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, + * University of Stuttgart. All rights reserved. + * Copyright (c) 2004-2005 The Regents of the University of California. + * All rights reserved. + * Copyright (c) 2008 Cisco Systems, Inc. All rights reserved. + * $COPYRIGHT$ + * + * Additional copyrights may follow + * + * $HEADER$ + */ + +/** @file: + * + * Populates global structure with system-specific information. + * + * Notes: add limits.h, compute size of integer and other types via sizeof(type)*CHAR_BIT + * + */ + +#ifndef _ORTE_OUTPUT_H_ +#define _ORTE_OUTPUT_H_ + +#include "orte_config.h" +#include "orte/types.h" + +#include "opal/util/output.h" + +#include "orte/mca/rml/rml_types.h" + +BEGIN_C_DECLS + +/** + * Initializes the output stream system and opens a default + * "verbose" stream. + * + * @retval success Upon success. + * @retval error Upon failure. + * + * This should be the first function invoked in the output + * subsystem. After this call, the default "verbose" stream is open + * and can be written to via calls to orte_output_verbose() and + * orte_output_error(). + * + * By definition, the default verbose stream has a handle ID of 0, + * and has a verbose level of 0. + */ +ORTE_DECLSPEC int orte_output_init(void); + +/** + * Shut down the output stream system. + * + * Shut down the output stream system, including the default verbose + * stream. + */ +ORTE_DECLSPEC void orte_output_finalize(void); + +/** + * Opens an output stream. + * + * @param lds A pointer to opal_output_stream_t describing what the + * characteristics of the output stream should be. + * + * This function opens an output stream and returns an integer + * handle. The caller is responsible for maintaining the handle and + * using it in successive calls to ORTE_OUTPUT(), orte_output(), + * orte_output_switch(), and orte_output_close(). + * + * If lds is NULL, the default descriptions will be used, meaning + * that output will only be sent to stderr. + * + * It is safe to have multiple threads invoke this function + * simultaneously; their execution will be serialized in an + * unspecified manner. + * + * Be sure to see orte_output() for a description of how + * the various streams work. + * + * In addition, the caller is required to provide at least one string "tag" + * describing the expected content to come out of this stream. For example, + * the RMAPS framework will open two streams: + * + * debug_stream = orte_output_open(NULL, "RMAPS", "debug") + * display_map_stream = orte_output_open(NULL, "RMAPS", "map"); + * + * The first stream will be used by all debugging output according to + * verbosity. The second stream is used solely in those cases where + * the user has requested --display-map. Thus, subsequent filters on + * the output can know and appropriately tag the content being output + * through the various streams + * + */ +ORTE_DECLSPEC int orte_output_open(opal_output_stream_t *lds, const char *primary_tag, ...); + +/** + * Re-opens / redirects an output stream. + * + * @param output_id Stream handle to reopen + * @param lds A pointer to opal_output_stream_t describing what the + * characteristics of the reopened output stream should be. + * + * This function redirects an existing stream into a new [set of] + * location[s], as specified by the lds parameter. If the output_is + * passed is invalid, this call is effectively the same as opening a + * new stream with a specific stream handle. + */ +ORTE_DECLSPEC int orte_output_reopen(int output_id, opal_output_stream_t *lds); + +/** + * Enables and disables output streams. + * + * @param output_id Stream handle to switch + * @param enable Boolean indicating whether to enable the stream + * output or not. + * + * @returns The previous enable state of the stream (true == enabled, + * false == disabled). + * + * The output of a stream can be temporarily disabled by passing an + * enable value to false, and later resumed by passing an enable + * value of true. This does not close the stream -- it simply tells + * the orte_output subsystem to intercept and discard any output sent + * to the stream via ORTE_OUTPUT() or orte_output() until the output + * is re-enabled. + */ +ORTE_DECLSPEC bool orte_output_switch(int output_id, bool enable); + +/** + * \internal + * + * Reopens all existing output streams. + * + * This function should never be called by user applications; it is + * typically only invoked after a restart (i.e., in a new process) + * where output streams need to be re-initialized. + */ +ORTE_DECLSPEC void orte_output_reopen_all(void); + +/** + * Close an output stream. + * + * @param output_id Handle of the stream to close. + * + * Close an output stream. No output will be sent to the stream + * after it is closed. Be aware that output handles tend to be + * re-used; it is possible that after a stream is closed, if another + * stream is opened, it will get the same handle value. + */ +ORTE_DECLSPEC void orte_output_close(int output_id); + +/** + * Main function to send output to a stream. + * + * @param output_id Stream id returned from orte_output_open(). + * @param format printf-style format string. + * @param varargs printf-style varargs list to fill the string + * specified by the format parameter. + * + * This is the main function to send output to custom streams (note + * that output to the default "verbose" stream is handled through + * orte_output_verbose() and orte_output_error()). + * + * It is never necessary to send a trailing "\n" in the strings to + * this function; some streams requires newlines, others do not -- + * this function will append newlines as necessary. + * + * Verbosity levels are ignored in this function. + * + * Note that for output streams that are directed to files, the + * files are stored under the process' session directory. If the + * session directory does not exist when orte_output() is invoked, + * the output will be discarded! Once the session directory is + * created, orte_output() will automatically create the file and + * writing to it. + */ +ORTE_DECLSPEC void orte_output(int output_id, const char *format, ...) + __opal_attribute_format__(__printf__, 2, 3); + +/** + * Send output to a stream only if the passed verbosity level is + * high enough. + * + * @param output_id Stream id returned from orte_output_open(). + * @param level Target verbosity level. + * @param format printf-style format string. + * @param varargs printf-style varargs list to fill the string + * specified by the format parameter. + * + * Output is only sent to the stream if the current verbosity level + * is greater than or equal to the level parameter. This mechanism + * can be used to send "information" kinds of output to user + * applications, but only when the user has asked for a high enough + * verbosity level. + * + * It is never necessary to send a trailing "\n" in the strings to + * this function; some streams requires newlines, others do not -- + * this function will append newlines as necessary. + * + * This function is really a convenience wrapper around checking the + * current verbosity level set on the stream, and if the passed + * level is less than or equal to the stream's verbosity level, this + * function will effectively invoke orte_output to send the output to + * the stream. + * + * @see orte_output_set_verbosity() + */ +ORTE_DECLSPEC void orte_output_verbose(int verbose_level, int output_id, const char *format, ...) + __opal_attribute_format__(__printf__, 3, 4); + + +/** + * Set the verbosity level for a stream. + * + * @param output_id Stream id returned from orte_output_open(). + * @param level New verbosity level + * + * This function sets the verbosity level on a given stream. It + * will be used for all future invocations of orte_output_verbose(). + */ +ORTE_DECLSPEC void orte_output_set_verbosity(int output_id, int level); + +/** + * Get the verbosity level for a stream + * + * @param output_id Stream id returned from orte_output_open() + * @returns Verbosity of stream + */ +ORTE_DECLSPEC int orte_output_get_verbosity(int output_id); + + +/** + * Show help + * + * Sends show help messages to the HNP if on a backend node + */ +ORTE_DECLSPEC int orte_show_help(const char *filename, const char *topic, + bool want_error_header, ...); + +#if ORTE_DISABLE_FULL_SUPPORT + +#if OMPI_ENABLE_DEBUG +/** + * Main macro for use in sending debugging output to output streams; + * will be "compiled out" when ORTE is configured without + * --enable-debug. + * + * @see orte_output() + */ +#define ORTE_OUTPUT(a) opal_output a + +/** + * Macro for use in sending debugging output to the output + * streams. Will be "compiled out" when ORTE is configured + * without --enable-debug. + * + * @see orte_output_verbose() + */ +#define ORTE_OUTPUT_VERBOSE(a) opal_output_verbose a +#else +/** + * Main macro for use in sending debugging output to output streams; + * will be "compiled out" when ORTE is configured without + * --enable-debug. + * + * @see orte_output() + */ +#define ORTE_OUTPUT(a) + +/** + * Macro for use in sending debugging output to the output + * streams. Will be "compiled out" when ORTE is configured + * without --enable-debug. + * + * @see orte_output_verbose() + */ +#define ORTE_OUTPUT_VERBOSE(a) +#endif + +#else + +ORTE_DECLSPEC void orte_output_recv_output(int status, orte_process_name_t* sender, + opal_buffer_t *buffer, orte_rml_tag_t tag, + void* cbdata); + +#if OMPI_ENABLE_DEBUG +/** + * Main macro for use in sending debugging output to output streams; + * will be "compiled out" when ORTE is configured without + * --enable-debug. + * + * @see orte_output() + */ +#define ORTE_OUTPUT(a) orte_output a + +/** + * Macro for use in sending debugging output to the output + * streams. Will be "compiled out" when ORTE is configured + * without --enable-debug. + * + * @see orte_output_verbose() + */ +#define ORTE_OUTPUT_VERBOSE(a) orte_output_verbose a +#else +/** + * Main macro for use in sending debugging output to output streams; + * will be "compiled out" when ORTE is configured without + * --enable-debug. + * + * @see orte_output() + */ +#define ORTE_OUTPUT(a) + +/** + * Macro for use in sending debugging output to the output + * streams. Will be "compiled out" when ORTE is configured + * without --enable-debug. + * + * @see orte_output_verbose() + */ +#define ORTE_OUTPUT_VERBOSE(a) +#endif + +#endif /* ORTE_DISABLE_FULL_SUPPORT */ + +END_C_DECLS +#endif diff --git a/orte/util/pre_condition_transports.c b/orte/util/pre_condition_transports.c index 4acb36bc0a..9403fbcf1e 100644 --- a/orte/util/pre_condition_transports.c +++ b/orte/util/pre_condition_transports.c @@ -40,7 +40,7 @@ #include "opal/util/opal_environ.h" #include "opal/util/argv.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "orte/mca/errmgr/errmgr.h" #include "orte/mca/plm/plm_types.h" diff --git a/orte/util/proc_info.c b/orte/util/proc_info.c index b5835e0f5b..212a398a37 100644 --- a/orte/util/proc_info.c +++ b/orte/util/proc_info.c @@ -31,7 +31,7 @@ #include "opal/mca/base/base.h" #include "opal/mca/base/mca_base_param.h" -#include "opal/util/output.h" +#include "orte/util/output.h" #include "opal/util/arch.h" #include "orte/runtime/orte_globals.h" @@ -119,7 +119,7 @@ int orte_proc_info(void) "Daemon contact info", true, false, NULL, &(orte_process_info.my_daemon_uri)); - OPAL_OUTPUT_VERBOSE((1, orte_debug_output, + ORTE_OUTPUT_VERBOSE((1, orte_debug_output, "proc_info: hnp_uri %s\n\tdaemon uri %s", (NULL == orte_process_info.my_hnp_uri) ? "NULL" : orte_process_info.my_hnp_uri, (NULL == orte_process_info.my_daemon_uri) ? "NULL" : orte_process_info.my_daemon_uri)); @@ -147,7 +147,7 @@ int orte_proc_info(void) /* get the arch */ if (ORTE_SUCCESS != opal_arch_compute_local_id(&orte_process_info.arch)) { - opal_output(0, "Process on node %s could not obtain local architecture - aborting", orte_process_info.nodename); + orte_output(0, "Process on node %s could not obtain local architecture - aborting", orte_process_info.nodename); exit(ORTE_ERROR_DEFAULT_EXIT_CODE); } diff --git a/orte/util/session_dir.c b/orte/util/session_dir.c index 2563c405f2..76bb1db228 100644 --- a/orte/util/session_dir.c +++ b/orte/util/session_dir.c @@ -45,7 +45,7 @@ #include #endif /* HAVE_PWD_H */ -#include "opal/util/output.h" +#include "orte/util/output.h" #include "opal/util/os_path.h" #include "opal/util/os_dirpath.h" #include "opal/util/basename.h" @@ -458,13 +458,13 @@ int orte_session_dir(bool create, } if (orte_debug_flag) { - opal_output(0, "procdir: %s", + orte_output(0, "procdir: %s", OMPI_PRINTF_FIX_STRING(orte_process_info.proc_session_dir)); - opal_output(0, "jobdir: %s", + orte_output(0, "jobdir: %s", OMPI_PRINTF_FIX_STRING(orte_process_info.job_session_dir)); - opal_output(0, "top: %s", + orte_output(0, "top: %s", OMPI_PRINTF_FIX_STRING(orte_process_info.top_session_dir)); - opal_output(0, "tmp: %s", + orte_output(0, "tmp: %s", OMPI_PRINTF_FIX_STRING(orte_process_info.tmpdir_base)); } @@ -523,26 +523,26 @@ orte_session_dir_cleanup(orte_jobid_t jobid) opal_os_dirpath_destroy(tmp, false, orte_dir_check_file); - if (opal_os_dirpath_is_empty(job_session_dir)) { + if (NULL != job_session_dir && opal_os_dirpath_is_empty(job_session_dir)) { if (orte_debug_flag) { - opal_output(0, "sess_dir_finalize: found job session dir empty - deleting"); + orte_output(0, "sess_dir_finalize: found job session dir empty - deleting"); } rmdir(job_session_dir); } else { if (orte_debug_flag) { - opal_output(0, "sess_dir_finalize: job session dir not empty - leaving"); + orte_output(0, "sess_dir_finalize: job session dir not empty - leaving"); } goto CLEANUP; } if (opal_os_dirpath_is_empty(tmp)) { if (orte_debug_flag) { - opal_output(0, "sess_dir_finalize: found top session dir empty - deleting"); + orte_output(0, "sess_dir_finalize: found top session dir empty - deleting"); } rmdir(tmp); } else { if (orte_debug_flag) { - opal_output(0, "sess_dir_finalize: top session dir not empty - leaving"); + orte_output(0, "sess_dir_finalize: top session dir not empty - leaving"); } } @@ -608,48 +608,48 @@ orte_session_dir_finalize(orte_process_name_t *proc) if (opal_os_dirpath_is_empty(proc_session_dir)) { if (orte_debug_flag) { - opal_output(0, "sess_dir_finalize: found proc session dir empty - deleting"); + orte_output(0, "sess_dir_finalize: found proc session dir empty - deleting"); } rmdir(proc_session_dir); } else { if (orte_debug_flag) { - opal_output(0, "sess_dir_finalize: proc session dir not empty - leaving"); + orte_output(0, "sess_dir_finalize: proc session dir not empty - leaving"); } goto CLEANUP; } if (opal_os_dirpath_is_empty(job_session_dir)) { if (orte_debug_flag) { - opal_output(0, "sess_dir_finalize: found job session dir empty - deleting"); + orte_output(0, "sess_dir_finalize: found job session dir empty - deleting"); } rmdir(job_session_dir); } else { if (orte_debug_flag) { - opal_output(0, "sess_dir_finalize: job session dir not empty - leaving"); + orte_output(0, "sess_dir_finalize: job session dir not empty - leaving"); } goto CLEANUP; } if (opal_os_dirpath_is_empty(orte_process_info.top_session_dir)) { if (orte_debug_flag) { - opal_output(0, "sess_dir_finalize: found top session dir empty - deleting"); + orte_output(0, "sess_dir_finalize: found top session dir empty - deleting"); } rmdir(orte_process_info.top_session_dir); } else { if (orte_debug_flag) { - opal_output(0, "sess_dir_finalize: top session dir not empty - leaving"); + orte_output(0, "sess_dir_finalize: top session dir not empty - leaving"); } goto CLEANUP; } if (opal_os_dirpath_is_empty(tmp)) { if (orte_debug_flag) { - opal_output(0, "sess_dir_finalize: found top session dir empty - deleting"); + orte_output(0, "sess_dir_finalize: found top session dir empty - deleting"); } rmdir(tmp); } else { if (orte_debug_flag) { - opal_output(0, "sess_dir_finalize: top session dir not empty - leaving"); + orte_output(0, "sess_dir_finalize: top session dir not empty - leaving"); } }