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.
106 строки
2.9 KiB
C
106 строки
2.9 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 (c) 2007 Los Alamos National Security, LLC. All rights
|
|
* reserved.
|
|
* $COPYRIGHT$
|
|
*
|
|
* Additional copyrights may follow
|
|
*
|
|
* $HEADER$
|
|
*/
|
|
|
|
#include "opal_config.h"
|
|
|
|
#include "opal/threads/mutex.h"
|
|
|
|
/*
|
|
* If we have progress threads, always default to using threads.
|
|
* Otherwise, wait and see if some upper layer wants to use threads.
|
|
*/
|
|
bool opal_uses_threads = false;
|
|
bool opal_mutex_check_locks = false;
|
|
|
|
|
|
#ifdef __WINDOWS__
|
|
|
|
static void opal_mutex_construct(opal_mutex_t *m)
|
|
{
|
|
InterlockedExchange(&m->m_lock, 0);
|
|
#if !OPAL_HAVE_THREAD_SUPPORT && OPAL_ENABLE_DEBUG
|
|
m->m_lock_debug = 0;
|
|
m->m_lock_file = NULL;
|
|
m->m_lock_line = 0;
|
|
#endif /* !OPAL_HAVE_THREAD_SUPPORT && OPAL_ENABLE_DEBUG */
|
|
}
|
|
|
|
static void opal_mutex_destruct(opal_mutex_t *m)
|
|
{
|
|
}
|
|
|
|
#else
|
|
|
|
static void opal_mutex_construct(opal_mutex_t *m)
|
|
{
|
|
#if OPAL_HAVE_POSIX_THREADS
|
|
|
|
#if OPAL_ENABLE_DEBUG
|
|
pthread_mutexattr_t attr;
|
|
pthread_mutexattr_init(&attr);
|
|
|
|
/* set type to ERRORCHECK so that we catch recursive locks */
|
|
#if OMPI_HAVE_PTHREAD_MUTEX_ERRORCHECK_NP
|
|
pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_ERRORCHECK_NP);
|
|
#elif OMPI_HAVE_PTHREAD_MUTEX_ERRORCHECK
|
|
pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_ERRORCHECK);
|
|
#endif /* OMPI_HAVE_PTHREAD_MUTEX_ERRORCHECK_NP */
|
|
|
|
pthread_mutex_init(&m->m_lock_pthread, &attr);
|
|
pthread_mutexattr_destroy(&attr);
|
|
|
|
#else
|
|
|
|
/* Without debugging, choose the fastest available mutexes */
|
|
pthread_mutex_init(&m->m_lock_pthread, NULL);
|
|
|
|
#endif /* OPAL_ENABLE_DEBUG */
|
|
|
|
#elif OPAL_HAVE_SOLARIS_THREADS
|
|
mutex_init(&m->m_lock_solaris, USYNC_THREAD, NULL);
|
|
#endif
|
|
|
|
#if OPAL_ENABLE_DEBUG && !OPAL_HAVE_THREAD_SUPPORT
|
|
m->m_lock_debug = 0;
|
|
m->m_lock_file = NULL;
|
|
m->m_lock_line = 0;
|
|
#endif
|
|
|
|
#if OPAL_HAVE_ATOMIC_SPINLOCKS
|
|
opal_atomic_init( &m->m_lock_atomic, OPAL_ATOMIC_UNLOCKED );
|
|
#endif
|
|
}
|
|
|
|
static void opal_mutex_destruct(opal_mutex_t *m)
|
|
{
|
|
#if OPAL_HAVE_POSIX_THREADS
|
|
pthread_mutex_destroy(&m->m_lock_pthread);
|
|
#elif OPAL_HAVE_SOLARIS_THREADS
|
|
mutex_destroy(&m->m_lock_solaris);
|
|
#endif
|
|
}
|
|
|
|
#endif /* __WINDOWS__ */
|
|
|
|
OBJ_CLASS_INSTANCE(opal_mutex_t,
|
|
opal_object_t,
|
|
opal_mutex_construct,
|
|
opal_mutex_destruct);
|