fceabb2498
This is a fairly intrusive change, but outside of the moving of opal/event to opal/mca/event, the only changes involved (a) changing all calls to opal_event functions to reflect the new framework instead, and (b) ensuring that all opal_event_t objects are properly constructed since they are now true opal_objects. Note: Shiqing has just returned from vacation and has not yet had a chance to complete the Windows integration. Thus, this commit almost certainly breaks Windows support on the trunk. However, I want this to have a chance to soak for as long as possible before I become less available a week from today (going to be at a class for 5 days, and thus will only be sparingly available) so we can find and fix any problems. Biggest change is moving the libevent code from opal/event to a new opal/mca/event framework. This was done to make it much easier to update libevent in the future. New versions can be inserted as a new component and tested in parallel with the current version until validated, then we can remove the earlier version if we so choose. This is a statically built framework ala installdirs, so only one component will build at a time. There is no selection logic - the sole compiled component simply loads its function pointers into the opal_event struct. I have gone thru the code base and converted all the libevent calls I could find. However, I cannot compile nor test every environment. It is therefore quite likely that errors remain in the system. Please keep an eye open for two things: 1. compile-time errors: these will be obvious as calls to the old functions (e.g., opal_evtimer_new) must be replaced by the new framework APIs (e.g., opal_event.evtimer_new) 2. run-time errors: these will likely show up as segfaults due to missing constructors on opal_event_t objects. It appears that it became a typical practice for people to "init" an opal_event_t by simply using memset to zero it out. This will no longer work - you must either OBJ_NEW or OBJ_CONSTRUCT an opal_event_t. I tried to catch these cases, but may have missed some. Believe me, you'll know when you hit it. There is also the issue of the new libevent "no recursion" behavior. As I described on a recent email, we will have to discuss this and figure out what, if anything, we need to do. This commit was SVN r23925.
104 строки
3.5 KiB
C
104 строки
3.5 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-2008 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/runtime/params.h"
|
|
#include "ompi/communicator/communicator.h"
|
|
#include "ompi/errhandler/errhandler.h"
|
|
#include "ompi/info/info.h"
|
|
#include "ompi/file/file.h"
|
|
#include "ompi/mca/io/io.h"
|
|
#include "ompi/mca/io/base/base.h"
|
|
#include "ompi/memchecker.h"
|
|
|
|
#if OPAL_HAVE_WEAK_SYMBOLS && OMPI_PROFILING_DEFINES
|
|
#pragma weak MPI_File_open = PMPI_File_open
|
|
#endif
|
|
|
|
#if OMPI_PROFILING_DEFINES
|
|
#include "ompi/mpi/c/profile/defines.h"
|
|
#endif
|
|
|
|
static const char FUNC_NAME[] = "MPI_File_open";
|
|
|
|
|
|
int MPI_File_open(MPI_Comm comm, char *filename, int amode,
|
|
MPI_Info info, MPI_File *fh)
|
|
{
|
|
int rc;
|
|
|
|
MEMCHECKER(
|
|
memchecker_comm(comm);
|
|
);
|
|
|
|
if (MPI_PARAM_CHECK) {
|
|
OMPI_ERR_INIT_FINALIZE(FUNC_NAME);
|
|
if (NULL == info || ompi_info_is_freed(info)) {
|
|
return OMPI_ERRHANDLER_INVOKE(MPI_COMM_WORLD, MPI_ERR_INFO,
|
|
FUNC_NAME);
|
|
} else if (ompi_comm_invalid(comm)) {
|
|
return OMPI_ERRHANDLER_INVOKE(MPI_COMM_WORLD, MPI_ERR_COMM,
|
|
FUNC_NAME);
|
|
}
|
|
if (OMPI_COMM_IS_INTER(comm)) {
|
|
return OMPI_ERRHANDLER_INVOKE (comm, MPI_ERR_COMM,
|
|
FUNC_NAME);
|
|
}
|
|
|
|
}
|
|
|
|
/* Note that MPI-2:9.7 (p265 in the ps; p261 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_THREAD_MULTIPLE))) {
|
|
return OMPI_ERRHANDLER_INVOKE(MPI_FILE_NULL, rc, FUNC_NAME);
|
|
}
|
|
}
|
|
|
|
OPAL_CR_ENTER_LIBRARY();
|
|
|
|
/* Create an empty MPI_File handle */
|
|
|
|
*fh = MPI_FILE_NULL;
|
|
rc = ompi_file_open(comm, filename, amode, info, fh);
|
|
|
|
/* Creating the file handle also selects a component to use,
|
|
creates a module, and calls file_open() on the module. So
|
|
we're good to go. */
|
|
|
|
OMPI_ERRHANDLER_RETURN(rc, *fh, rc, FUNC_NAME);
|
|
}
|