9613b3176c
After much work by Jeff and myself, and quite a lot of discussion, it has become clear that we simply cannot resolve the infinite loops caused by RML-involved subsystems calling orte_output. The original rationale for the change to orte_output has also been reduced by shifting the output of XML-formatted vs human readable messages to an alternative approach. I have globally replaced the orte_output/ORTE_OUTPUT calls in the code base, as well as the corresponding .h file name. I have test compiled and run this on the various environments within my reach, so hopefully this will prove minimally disruptive. This commit was SVN r18619.
61 строка
2.0 KiB
C
61 строка
2.0 KiB
C
/*
|
|
* 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$
|
|
*/
|
|
|
|
#include "ompi_config.h"
|
|
|
|
#include "mpi.h"
|
|
#include "ompi/constants.h"
|
|
#include "orte/util/show_help.h"
|
|
#include "ompi/mca/coll/coll.h"
|
|
#include "ompi/mca/coll/base/base.h"
|
|
#include "coll_demo.h"
|
|
|
|
|
|
/*
|
|
* barrier_intra
|
|
*
|
|
* Function: - barrier
|
|
* Accepts: - same as MPI_Barrier()
|
|
* Returns: - MPI_SUCCESS or error code
|
|
*/
|
|
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");
|
|
return demo_module->underlying.coll_barrier(comm,
|
|
demo_module->underlying.coll_barrier_module);
|
|
}
|
|
|
|
|
|
/*
|
|
* barrier_inter
|
|
*
|
|
* Function: - barrier
|
|
* Accepts: - same as MPI_Barrier()
|
|
* Returns: - MPI_SUCCESS or error code
|
|
*/
|
|
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");
|
|
return demo_module->underlying.coll_barrier(comm,
|
|
demo_module->underlying.coll_barrier_module);
|
|
}
|