AuroraMiddleware/scuffed-code
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ICU-770 Add a function to destroy a mutex, and don't allocate memory for the global mutex.

Browse Source 
X-SVN-Rev: 5168
This commit is contained in:
George Rhoten 2001-07-03 20:35:27 +00:00
parent ac454c01db
commit 5486a097ba
2 changed files with 74 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

103
icu4c/source/common/umutex.c
View File

@ -81,17 +81,25 @@
/* the global mutex. Use it proudly and wash it often. */
UMTX gGlobalMutex = NULL;
void umtx_lock( UMTX *mutex )
#if defined(WIN32)
static CRITICAL_SECTION gPlatformMutex;
#elif defined(POSIX)
static pthread_mutex_t gPlatformMutex;
#endif
void umtx_lock(UMTX *mutex)
{
#if (ICU_USE_THREADS == 1)
if( mutex == NULL )
if (mutex == NULL)
{
mutex = &gGlobalMutex;
mutex = &gGlobalMutex;
}
if(*mutex == NULL)
if (*mutex == NULL)
{
umtx_init(mutex);
umtx_init(mutex);
}
#if defined(WIN32)
@ -101,11 +109,10 @@ void umtx_lock( UMTX *mutex )
#elif defined(POSIX)
# ifdef POSIX_DEBUG_REENTRANCY
if(gInMutex == TRUE) /* in the mutex -- possible deadlock*/
if(pthread_equal(gLastThread,pthread_self()))
WeAreDeadlocked();
if (gInMutex == TRUE) /* in the mutex -- possible deadlock*/
if(pthread_equal(gLastThread, pthread_self()))
WeAreDeadlocked();
# endif
pthread_mutex_lock((pthread_mutex_t*) *mutex);
# ifdef POSIX_DEBUG_REENTRANCY
@ -116,25 +123,25 @@ void umtx_lock( UMTX *mutex )
#endif /* ICU_USE_THREADS==1 */
}
void umtx_unlock( UMTX* mutex )
void umtx_unlock(UMTX* mutex)
{
#if (ICU_USE_THREADS==1)
if( mutex == NULL )
if(mutex == NULL)
{
mutex = &gGlobalMutex;
if(*mutex == NULL)
{
return; /* jitterbug 135, fix for multiprocessor machines */
}
mutex = &gGlobalMutex;
}
#if defined(WIN32)
if(*mutex == NULL)
{
return; /* jitterbug 135, fix for multiprocessor machines */
}
#if defined (WIN32)
LeaveCriticalSection((CRITICAL_SECTION*)*mutex);
#elif defined(POSIX)
#elif defined (POSIX)
pthread_mutex_unlock((pthread_mutex_t*)*mutex);
#ifdef POSIX_DEBUG_REENTRANCY
gInMutex = FALSE;
#endif
@ -143,32 +150,40 @@ void umtx_unlock( UMTX* mutex )
#endif /* ICU_USE_THREADS == 1 */
}
U_CAPI void umtx_init( UMTX *mutex )
U_CAPI void umtx_init(UMTX *mutex)
{
#if (ICU_USE_THREADS == 1)
if( mutex == NULL ) /* initialize the global mutex */
if (mutex == NULL) /* initialize the global mutex */
{
mutex = &gGlobalMutex;
mutex = &gGlobalMutex;
}
if(*mutex != NULL) /* someone already did it. */
return;
#if defined(WIN32)
*mutex = uprv_malloc(sizeof(CRITICAL_SECTION));
InitializeCriticalSection((CRITICAL_SECTION*)*mutex);
if (*mutex != NULL) /* someone already did it. */
return;
if (*mutex == gGlobalMutex)
{
*mutex = &gPlatformMutex;
}
else
{
#if defined (WIN32)
*mutex = uprv_malloc(sizeof(CRITICAL_SECTION));
#elif defined( POSIX )
*mutex = uprv_malloc(sizeof(pthread_mutex_t));
#if defined(HPUX_CMA)
pthread_mutex_init((pthread_mutex_t*)*mutex, pthread_mutexattr_default);
#else
pthread_mutex_init((pthread_mutex_t*)*mutex,NULL);
*mutex = uprv_malloc(sizeof(pthread_mutex_t));
#endif
}
#if defined (WIN32)
InitializeCriticalSection((CRITICAL_SECTION*)*mutex);
#elif defined (POSIX)
# if defined (HPUX_CMA)
pthread_mutex_init((pthread_mutex_t*)*mutex, pthread_mutexattr_default);
# else
pthread_mutex_init((pthread_mutex_t*)*mutex, NULL);
# endif
# ifdef POSIX_DEBUG_REENTRANCY
gInMutex = FALSE;
@ -178,9 +193,27 @@ if( mutex == NULL ) /* initialize the global mutex */
#endif /* ICU_USE_THREADS==1 */
}
U_CAPI void umtx_destroy(UMTX *mutex) {
if (mutex == NULL) /* initialize the global mutex */
{
mutex = &gGlobalMutex;
}
if (*mutex == NULL) /* someone already did it. */
return;
#if defined (WIN32)
DeleteCriticalSection((CRITICAL_SECTION*)*mutex);
#elif defined (POSIX)
pthread_mutex_destroy((pthread_mutex_t*)*mutex);
#endif
if (*mutex != gGlobalMutex)
{
uprv_free(*mutex);
}
*mutex = NULL;
}

7
icu4c/source/common/umutex.h
View File

@ -48,7 +48,7 @@ typedef void * Mutex;
/* Lock a mutex. Pass in NULL if you want the (ick) Single Global
Mutex. */
U_CAPI void U_EXPORT2 umtx_lock ( UMTX* mutex );
U_CAPI void U_EXPORT2 umtx_lock ( UMTX* mutex );
/* Unlock a mutex. Pass in NULL if you want the single global
mutex. */
@ -58,6 +58,11 @@ U_CAPI void U_EXPORT2 umtx_unlock ( UMTX* mutex );
umtx_init( &aMutex ); */
U_CAPI void U_EXPORT2 umtx_init ( UMTX* mutex );
/* Destroy a mutex. This will free the resources of a mutex.
Use it this way:
umtx_destroy( &aMutex ); */
U_CAPI void U_EXPORT2 umtx_destroy( UMTX *mutex );
#endif /*_CMUTEX*/
/*eof*/