mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-01-06 10:46:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

ITS#7363 Use posix semaphores on apple and bsd systems.

Browse Source
This commit is contained in:
Chris Mikkelson 2012-08-22 13:22:19 -05:00 committed by Howard Chu
parent f114fec545
commit 9f983b7999
1 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
libraries/libmdb/mdb.c
View File

@ -61,9 +61,13 @@
#include <resolv.h> /* defines BYTE_ORDER on HPUX and Solaris */ #include <resolv.h> /* defines BYTE_ORDER on HPUX and Solaris */
#endif #endif
#if defined(__APPLE__) || defined (BSD)
#define USE_POSIX_SEM
#endif
#ifndef _WIN32 #ifndef _WIN32
#include <pthread.h> #include <pthread.h>
#ifdef __APPLE__ #ifdef USE_POSIX_SEM
#include <semaphore.h> #include <semaphore.h>
#endif #endif
#endif #endif
@ -150,7 +154,7 @@
#define close(fd) CloseHandle(fd) #define close(fd) CloseHandle(fd)
#define munmap(ptr,len) UnmapViewOfFile(ptr) #define munmap(ptr,len) UnmapViewOfFile(ptr)
#else #else
#ifdef __APPLE__ #ifdef USE_POSIX_SEM
#define LOCK_MUTEX_R(env) sem_wait((env)->me_rmutex) #define LOCK_MUTEX_R(env) sem_wait((env)->me_rmutex)
#define UNLOCK_MUTEX_R(env) sem_post((env)->me_rmutex) #define UNLOCK_MUTEX_R(env) sem_post((env)->me_rmutex)
#define LOCK_MUTEX_W(env) sem_wait((env)->me_wmutex) #define LOCK_MUTEX_W(env) sem_wait((env)->me_wmutex)
@ -175,7 +179,7 @@
/** Unlock the writer mutex. /** Unlock the writer mutex.
*/ */
#define UNLOCK_MUTEX_W(env) pthread_mutex_unlock(&(env)->me_txns->mti_wmutex) #define UNLOCK_MUTEX_W(env) pthread_mutex_unlock(&(env)->me_txns->mti_wmutex)
#endif /* __APPLE__ */ #endif /* USE_POSIX_SEM */
/** Get the error code for the last failed system function. /** Get the error code for the last failed system function.
*/ */
@ -200,7 +204,7 @@
#define GET_PAGESIZE(x) ((x) = sysconf(_SC_PAGE_SIZE)) #define GET_PAGESIZE(x) ((x) = sysconf(_SC_PAGE_SIZE))
#endif #endif
#if defined(_WIN32) || defined(__APPLE__) #if defined(_WIN32) || defined(USE_POSIX_SEM)
#define MNAME_LEN 32 #define MNAME_LEN 32
#else #else
#define MNAME_LEN (sizeof(pthread_mutex_t)) #define MNAME_LEN (sizeof(pthread_mutex_t))
@ -464,7 +468,7 @@ typedef struct MDB_txbody {
uint32_t mtb_magic; uint32_t mtb_magic;
/** Version number of this lock file. Must be set to #MDB_VERSION. */ /** Version number of this lock file. Must be set to #MDB_VERSION. */
uint32_t mtb_version; uint32_t mtb_version;
#if defined(_WIN32) || defined(__APPLE__) #if defined(_WIN32) || defined(USE_POSIX_SEM)
char mtb_rmname[MNAME_LEN]; char mtb_rmname[MNAME_LEN];
#else #else
/** Mutex protecting access to this table. /** Mutex protecting access to this table.
@ -497,7 +501,7 @@ typedef struct MDB_txninfo {
char pad[(sizeof(MDB_txbody)+CACHELINE-1) & ~(CACHELINE-1)]; char pad[(sizeof(MDB_txbody)+CACHELINE-1) & ~(CACHELINE-1)];
} mt1; } mt1;
union { union {
#if defined(_WIN32) || defined(__APPLE__) #if defined(_WIN32) || defined(USE_POSIX_SEM)
char mt2_wmname[MNAME_LEN]; char mt2_wmname[MNAME_LEN];
#define mti_wmname mt2.mt2_wmname #define mti_wmname mt2.mt2_wmname
#else #else
@ -914,7 +918,7 @@ struct MDB_env {
HANDLE me_rmutex; /* Windows mutexes don't reside in shared mem */ HANDLE me_rmutex; /* Windows mutexes don't reside in shared mem */
HANDLE me_wmutex; HANDLE me_wmutex;
#endif #endif
#ifdef __APPLE__ #ifdef USE_POSIX_SEM
sem_t *me_rmutex; /* Apple doesn't support shared mutexes */ sem_t *me_rmutex; /* Apple doesn't support shared mutexes */
sem_t *me_wmutex; sem_t *me_wmutex;
#endif #endif
@ -2644,7 +2648,7 @@ mdb_env_share_locks(MDB_env *env)
} }
#endif #endif
} }
#if defined(_WIN32) || defined(__APPLE__) #if defined(_WIN32) || defined(USE_POSIX_SEM)
/* /*
* hash_64 - 64 bit Fowler/Noll/Vo-0 FNV-1a hash code * hash_64 - 64 bit Fowler/Noll/Vo-0 FNV-1a hash code
* *
@ -2883,7 +2887,7 @@ mdb_env_setup_locks(MDB_env *env, char *lpath, int mode, int *excl)
goto fail; goto fail;
} }
#else /* _WIN32 */ #else /* _WIN32 */
#ifdef __APPLE__ #ifdef USE_POSIX_SEM
struct stat stbuf; struct stat stbuf;
struct { struct {
dev_t dev; dev_t dev;
@ -2920,7 +2924,7 @@ mdb_env_setup_locks(MDB_env *env, char *lpath, int mode, int *excl)
rc = ErrCode(); rc = ErrCode();
goto fail; goto fail;
} }
#else /* __APPLE__ */ #else /* USE_POSIX_SEM */
pthread_mutexattr_t mattr; pthread_mutexattr_t mattr;
pthread_mutexattr_init(&mattr); pthread_mutexattr_init(&mattr);
@ -2930,7 +2934,7 @@ mdb_env_setup_locks(MDB_env *env, char *lpath, int mode, int *excl)
} }
pthread_mutex_init(&env->me_txns->mti_mutex, &mattr); pthread_mutex_init(&env->me_txns->mti_mutex, &mattr);
pthread_mutex_init(&env->me_txns->mti_wmutex, &mattr); pthread_mutex_init(&env->me_txns->mti_wmutex, &mattr);
#endif /* __APPLE__ */ #endif /* USE_POSIX_SEM */
#endif /* _WIN32 */ #endif /* _WIN32 */
env->me_txns->mti_version = MDB_VERSION; env->me_txns->mti_version = MDB_VERSION;
env->me_txns->mti_magic = MDB_MAGIC; env->me_txns->mti_magic = MDB_MAGIC;
@ -2965,7 +2969,7 @@ mdb_env_setup_locks(MDB_env *env, char *lpath, int mode, int *excl)
goto fail; goto fail;
} }
#endif #endif
#ifdef __APPLE__ #ifdef USE_POSIX_SEM
env->me_rmutex = sem_open(env->me_txns->mti_rmname, 0); env->me_rmutex = sem_open(env->me_txns->mti_rmname, 0);
if (!env->me_rmutex) { if (!env->me_rmutex) {
rc = ErrCode(); rc = ErrCode();