ITS#7363 Preprocessor namespace cleanup.

Rename USE_POSIX_SEM to MDB_USE_POSIX_SEM.
Separate MDB_FDATASYNC from MDB_USE_POSIX_SEM.

diff --git a/libraries/libmdb/mdb.c b/libraries/libmdb/mdb.c
index 8252cd63bc036f2f9b2943fa2b7e1d5dcd0388ff..092aa1c5ed8e62313cf3d6af7b7926b239b2b4f9 100644 (file)
--- a/libraries/libmdb/mdb.c
+++ b/libraries/libmdb/mdb.c
@@ -62,12 +62,15 @@
 #endif
 
 #if defined(__APPLE__) || defined (BSD)
-#define USE_POSIX_SEM
+# define MDB_USE_POSIX_SEM     1
+# define MDB_FDATASYNC         fsync
+#elif defined(ANDROID)
+# define MDB_FDATASYNC         fsync
 #endif
 
 #ifndef _WIN32
 #include <pthread.h>
-#ifdef USE_POSIX_SEM
+#ifdef MDB_USE_POSIX_SEM
 #include <semaphore.h>
 #endif
 #endif
@@ -155,16 +158,12 @@
 #define        close(fd)       CloseHandle(fd)
 #define        munmap(ptr,len) UnmapViewOfFile(ptr)
 #else
-#ifdef USE_POSIX_SEM
+#ifdef MDB_USE_POSIX_SEM
 #define LOCK_MUTEX_R(env)      sem_wait((env)->me_rmutex)
 #define UNLOCK_MUTEX_R(env)    sem_post((env)->me_rmutex)
 #define LOCK_MUTEX_W(env)      sem_wait((env)->me_wmutex)
 #define UNLOCK_MUTEX_W(env)    sem_post((env)->me_wmutex)
-#define MDB_FDATASYNC(fd)      fsync(fd)
 #else
-#ifdef ANDROID
-#define MDB_FDATASYNC(fd)      fsync(fd)
-#endif
        /** Lock the reader mutex.
         */
 #define LOCK_MUTEX_R(env)      pthread_mutex_lock(&(env)->me_txns->mti_mutex)
@@ -180,7 +179,7 @@
        /** Unlock the writer mutex.
         */
 #define UNLOCK_MUTEX_W(env)    pthread_mutex_unlock(&(env)->me_txns->mti_wmutex)
-#endif /* USE_POSIX_SEM */
+#endif /* MDB_USE_POSIX_SEM */
 
        /** Get the error code for the last failed system function.
         */
@@ -205,7 +204,7 @@
 #define        GET_PAGESIZE(x) ((x) = sysconf(_SC_PAGE_SIZE))
 #endif
 
-#if defined(_WIN32) || defined(USE_POSIX_SEM)
+#if defined(_WIN32) || defined(MDB_USE_POSIX_SEM)
 #define MNAME_LEN      32
 #else
 #define MNAME_LEN      (sizeof(pthread_mutex_t))
@@ -481,7 +480,7 @@ typedef struct MDB_txbody {
        uint32_t        mtb_magic;
                /** Version number of this lock file. Must be set to #MDB_VERSION. */
        uint32_t        mtb_version;
-#if defined(_WIN32) || defined(USE_POSIX_SEM)
+#if defined(_WIN32) || defined(MDB_USE_POSIX_SEM)
        char    mtb_rmname[MNAME_LEN];
 #else
                /** Mutex protecting access to this table.
@@ -514,7 +513,7 @@ typedef struct MDB_txninfo {
                char pad[(sizeof(MDB_txbody)+CACHELINE-1) & ~(CACHELINE-1)];
        } mt1;
        union {
-#if defined(_WIN32) || defined(USE_POSIX_SEM)
+#if defined(_WIN32) || defined(MDB_USE_POSIX_SEM)
                char mt2_wmname[MNAME_LEN];
 #define        mti_wmname      mt2.mt2_wmname
 #else
@@ -930,9 +929,8 @@ struct MDB_env {
 #ifdef _WIN32
        HANDLE          me_rmutex;              /* Windows mutexes don't reside in shared mem */
        HANDLE          me_wmutex;
-#endif
-#ifdef USE_POSIX_SEM
-       sem_t           *me_rmutex;             /* Apple doesn't support shared mutexes */
+#elif defined(MDB_USE_POSIX_SEM)
+       sem_t           *me_rmutex;             /* Shared mutexes are not supported */
        sem_t           *me_wmutex;
 #endif
 };
@@ -2792,7 +2790,7 @@ mdb_env_excl_lock(MDB_env *env, int *excl)
        return 0;
 }
 
-#if defined(_WIN32) || defined(USE_POSIX_SEM)
+#if defined(_WIN32) || defined(MDB_USE_POSIX_SEM)
 /*
  * hash_64 - 64 bit Fowler/Noll/Vo-0 FNV-1a hash code
  *
@@ -3002,8 +3000,7 @@ mdb_env_setup_locks(MDB_env *env, char *lpath, int mode, int *excl)
                        rc = ErrCode();
                        goto fail;
                }
-#else  /* _WIN32 */
-#ifdef USE_POSIX_SEM
+#elif defined(MDB_USE_POSIX_SEM)
                struct stat stbuf;
                struct {
                        dev_t dev;
@@ -3040,7 +3037,7 @@ mdb_env_setup_locks(MDB_env *env, char *lpath, int mode, int *excl)
                        rc = ErrCode();
                        goto fail;
                }
-#else  /* USE_POSIX_SEM */
+#else  /* MDB_USE_POSIX_SEM */
                pthread_mutexattr_t mattr;
 
                pthread_mutexattr_init(&mattr);
@@ -3050,8 +3047,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_wmutex, &mattr);
-#endif /* USE_POSIX_SEM */
-#endif /* _WIN32 */
+#endif /* _WIN32 || MDB_USE_POSIX_SEM */
                env->me_txns->mti_version = MDB_VERSION;
                env->me_txns->mti_magic = MDB_MAGIC;
                env->me_txns->mti_txnid = 0;
@@ -3084,8 +3080,7 @@ mdb_env_setup_locks(MDB_env *env, char *lpath, int mode, int *excl)
                        rc = ErrCode();
                        goto fail;
                }
-#endif
-#ifdef USE_POSIX_SEM
+#elif defined(MDB_USE_POSIX_SEM)
                env->me_rmutex = sem_open(env->me_txns->mti_rmname, 0);
                if (env->me_rmutex == SEM_FAILED) {
                        rc = ErrCode();
@@ -3271,8 +3266,7 @@ mdb_env_close(MDB_env *env)
                /* Windows automatically destroys the mutexes when
                 * the last handle closes.
                 */
-#else
-#ifdef USE_POSIX_SEM
+#elif defined(MDB_USE_POSIX_SEM)
                sem_close(env->me_rmutex);
                sem_close(env->me_wmutex);
                { int excl = 0;
@@ -3283,7 +3277,6 @@ mdb_env_close(MDB_env *env)
                                sem_unlink(env->me_txns->mti_wmname);
                        }
                }
-#endif
 #endif
                munmap((void *)env->me_txns, (env->me_maxreaders-1)*sizeof(MDB_reader)+sizeof(MDB_txninfo));
        }