diff options
| author | Michael Cahill <michael.cahill@wiredtiger.com> | 2013-11-14 11:27:34 +1100 |
|---|---|---|
| committer | Michael Cahill <michael.cahill@wiredtiger.com> | 2013-11-14 11:27:34 +1100 |
| commit | 3a5b773b1fc5ef4e2f7517af98139dde6559d70f (patch) | |
| tree | 5cc4d87cc05ae23181f540d0aa3896210135f877 /src/include/connection.h | |
| parent | 9c4eaa69a7e27361e2b7657e9484cffc7d7a3f1a (diff) | |
| parent | 47e9b2952ea88ac127036612b3fc883d65044502 (diff) | |
| download | mongo-3a5b773b1fc5ef4e2f7517af98139dde6559d70f.tar.gz | |
Merge branch 'develop' into fine-grained-durability
Conflicts:
src/include/flags.h
Diffstat (limited to 'src/include/connection.h')
| -rw-r--r-- | src/include/connection.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/include/connection.h b/src/include/connection.h index 0c0384b1976..3966e30f491 100644 --- a/src/include/connection.h +++ b/src/include/connection.h @@ -87,8 +87,8 @@ struct __wt_connection_impl { * very short operations, each one is 64 bytes, so 256 will fill the L1 * cache on most CPUs. */ -#define WT_PAGE_LOCKS(conn) WT_ELEMENTS((conn)->page_lock) - WT_SPINLOCK *page_lock[17]; /* Btree page spinlocks */ +#define WT_PAGE_LOCKS(conn) 16 + WT_SPINLOCK *page_lock; /* Btree page spinlocks */ u_int page_lock_cnt; /* Next spinlock to use */ /* Connection queue */ |