diff options
| author | Ramon Fernandez <ramon.fernandez@mongodb.com> | 2015-04-27 11:33:41 -0400 |
|---|---|---|
| committer | Ramon Fernandez <ramon.fernandez@mongodb.com> | 2015-04-27 11:33:47 -0400 |
| commit | 34b853ed0566a3bbffcd825191b9000de331bddc (patch) | |
| tree | 06f3f81436489f252da15900b2fef169e7ca1bde /src/third_party/wiredtiger/src/include/mutex.h | |
| parent | 076cd926ab476f872afdd89a0e5e7e733d26c3ae (diff) | |
| download | mongo-34b853ed0566a3bbffcd825191b9000de331bddc.tar.gz | |
SERVER-18199 Import wiredtiger-wiredtiger-2.5.3-371-g1f44c05.tar.gz from wiredtiger branch mongodb-3.2
Diffstat (limited to 'src/third_party/wiredtiger/src/include/mutex.h')
| -rw-r--r-- | src/third_party/wiredtiger/src/include/mutex.h | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/src/third_party/wiredtiger/src/include/mutex.h b/src/third_party/wiredtiger/src/include/mutex.h index 07aa740c525..fd7fd16dea7 100644 --- a/src/third_party/wiredtiger/src/include/mutex.h +++ b/src/third_party/wiredtiger/src/include/mutex.h @@ -61,10 +61,9 @@ struct __wt_rwlock { * instructions). */ #define SPINLOCK_GCC 0 -#define SPINLOCK_PTHREAD_MUTEX 1 -#define SPINLOCK_PTHREAD_MUTEX_ADAPTIVE 2 -#define SPINLOCK_PTHREAD_MUTEX_LOGGING 3 -#define SPINLOCK_MSVC 4 +#define SPINLOCK_MSVC 1 +#define SPINLOCK_PTHREAD_MUTEX 2 +#define SPINLOCK_PTHREAD_MUTEX_ADAPTIVE 3 #if SPINLOCK_TYPE == SPINLOCK_GCC @@ -73,16 +72,12 @@ typedef volatile int WT_COMPILER_TYPE_ALIGN(WT_CACHE_LINE_ALIGNMENT) #elif SPINLOCK_TYPE == SPINLOCK_PTHREAD_MUTEX ||\ SPINLOCK_TYPE == SPINLOCK_PTHREAD_MUTEX_ADAPTIVE ||\ - SPINLOCK_TYPE == SPINLOCK_MSVC ||\ - SPINLOCK_TYPE == SPINLOCK_PTHREAD_MUTEX_LOGGING + SPINLOCK_TYPE == SPINLOCK_MSVC typedef WT_COMPILER_TYPE_ALIGN(WT_CACHE_LINE_ALIGNMENT) struct { wt_mutex_t lock; - uint64_t counter; /* Statistics: counter */ - const char *name; /* Statistics: mutex name */ - int8_t id; /* Statistics: current holder ID */ int8_t initialized; /* Lock initialized, for cleanup */ } WT_SPINLOCK; |