99144db970
Some MPI C interface files saw some spacing changes to conform to the coding standards of Open MPI.
Changed MPI C interface files to use {{{OPAL_CR_ENTER_LIBRARY()}}} and {{{OPAL_CR_EXIT_LIBRARY()}}} instead of just {{{OPAL_CR_TEST_CHECKPOINT_READY()}}}. This will allow the checkpoint/restart system more flexibility in how it is to behave.
Fixed the configure check for {{{--enable-ft-thread}}} so it has a know dependance on {{{--enable-mpi-thread}}} (and/or {{{--enable-progress-thread}}}).
Added a line for Checkpoint/Restart support to {{{ompi_info}}}.
Added some options to choose at runtime whether or not to use the checkpoint polling thread. By default, if the user asked for it to be compiled in, then it is used. But some users will want the ability to toggle its use at runtime.
There are still some places for improvement, but the feature works correctly. As always with Checkpoint/Restart, it is compiled out unless explicitly asked for at configure time. Further, if it was configured in, then it is not used unless explicitly asked for by the user at runtime.
This commit was SVN r17516.
86 строки
2.9 KiB
C
86 строки
2.9 KiB
C
/*
|
|
* 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$
|
|
*/
|
|
|
|
#include "ompi_config.h"
|
|
|
|
#include "ompi/mpi/c/bindings.h"
|
|
#include "ompi/info/info.h"
|
|
#include "ompi/file/file.h"
|
|
#include "ompi/mca/io/io.h"
|
|
#include "ompi/mca/io/base/base.h"
|
|
|
|
#if OMPI_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
|
|
#pragma weak MPI_File_delete = PMPI_File_delete
|
|
#endif
|
|
|
|
#if OMPI_PROFILING_DEFINES
|
|
#include "ompi/mpi/c/profile/defines.h"
|
|
#endif
|
|
|
|
static const char FUNC_NAME[] = "MPI_File_delete";
|
|
|
|
|
|
int MPI_File_delete(char *filename, MPI_Info info)
|
|
{
|
|
int rc;
|
|
|
|
if (MPI_PARAM_CHECK) {
|
|
rc = MPI_SUCCESS;
|
|
OMPI_ERR_INIT_FINALIZE(FUNC_NAME);
|
|
if (NULL == info || ompi_info_is_freed(info)) {
|
|
rc = MPI_ERR_INFO;
|
|
} else if (NULL == filename) {
|
|
rc = MPI_ERR_ARG;
|
|
}
|
|
OMPI_ERRHANDLER_CHECK(rc, MPI_FILE_NULL, rc, FUNC_NAME);
|
|
}
|
|
|
|
/* Note that MPI-2:9.7 (p265 in the ps; 261 in the pdf) says that
|
|
errors in MPI_FILE_OPEN (before the file handle is created)
|
|
should invoke the default error handler on MPI_FILE_NULL.
|
|
Hence, if we get a file handle out of ompi_file_open(), invoke
|
|
the error handler on that. If not, invoke the error handler on
|
|
MPI_FILE_NULL. */
|
|
|
|
/* The io framework is only initialized lazily. If it hasn't
|
|
already been initialized, do so now (note that MPI_FILE_OPEN
|
|
and MPI_FILE_DELETE are the only two places that it will be
|
|
initialized). */
|
|
|
|
if (!(mca_io_base_components_opened_valid ||
|
|
mca_io_base_components_available_valid)) {
|
|
if (OMPI_SUCCESS != (rc = mca_io_base_open())) {
|
|
return OMPI_ERRHANDLER_INVOKE(MPI_FILE_NULL, rc, FUNC_NAME);
|
|
}
|
|
if (OMPI_SUCCESS !=
|
|
(rc = mca_io_base_find_available(OMPI_ENABLE_PROGRESS_THREADS,
|
|
OMPI_ENABLE_MPI_THREADS))) {
|
|
return OMPI_ERRHANDLER_INVOKE(MPI_FILE_NULL, rc, FUNC_NAME);
|
|
}
|
|
}
|
|
|
|
OPAL_CR_ENTER_LIBRARY();
|
|
|
|
/* Since there is no MPI_File handle associated with this
|
|
function, the MCA has to do a selection and perform the
|
|
action */
|
|
|
|
rc = mca_io_base_delete(filename, info);
|
|
OMPI_ERRHANDLER_RETURN(rc, MPI_FILE_NULL, rc, FUNC_NAME);
|
|
}
|