From 4314609a00b92f5114d4da6ec1a81f8c60192157 Mon Sep 17 00:00:00 2001 From: Jeff Squyres Date: Tue, 18 Mar 2008 22:26:43 +0000 Subject: [PATCH] * Remove a meaningless clause (it could never be true) * Fix an error message to correctly display if we were before MPI_INIT or after MPI_FINALIZE (refs trac:1243) This commit was SVN r17873. The following Trac tickets were found above: Ticket 1243 --> https://svn.open-mpi.org/trac/ompi/ticket/1243 --- ompi/runtime/ompi_mpi_abort.c | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/ompi/runtime/ompi_mpi_abort.c b/ompi/runtime/ompi_mpi_abort.c index d1ce4072ad..377246abc2 100644 --- a/ompi/runtime/ompi_mpi_abort.c +++ b/ompi/runtime/ompi_mpi_abort.c @@ -74,17 +74,6 @@ ompi_mpi_abort(struct ompi_communicator_t* comm, } pid = getpid(); - /* Corner case: if we're being called as a result of the - OMPI_ERR_INIT_FINALIZE macro (meaning that this is before - MPI_INIT or after MPI_FINALIZE), then just abort nothing MPI or - ORTE has been setup yet. */ - - if (!ompi_mpi_initialized || ompi_mpi_finalized) { - if (orte_initialized) { - orte_errmgr.abort(errcode, NULL); - } - } - /* Should we print a stack trace? */ if (ompi_mpi_abort_print_stack) { @@ -125,12 +114,13 @@ ompi_mpi_abort(struct ompi_communicator_t* comm, } } - /* If ORTE isn't setup yet, then don't even try killing everyone. - Sorry, Charlie... */ + /* If ORTE isn't setup yet/any more, then don't even try killing + everyone. Sorry, Charlie... */ if (!orte_initialized) { - fprintf(stderr, "[%s:%d] Abort before MPI_INIT completed successfully; not able to guarantee that all other processes were killed!\n", - host, (int) pid); + fprintf(stderr, "[%s:%d] Abort %s completed successfully; not able to guarantee that all other processes were killed!\n", + host, (int) pid, ompi_mpi_finalized ? + "after MPI_FINALIZE" : "before MPI_INIT"); exit(errcode); }