diff options
| author | Keith Bostic <keith@wiredtiger.com> | 2015-08-24 08:08:21 -0400 |
|---|---|---|
| committer | Keith Bostic <keith@wiredtiger.com> | 2015-08-24 08:08:21 -0400 |
| commit | d34e3e8ae5522f3434d2764ee6dae5b915c1c4c5 (patch) | |
| tree | 4a78b6e41ddb8af63c403c736f949253929b7858 /src/conn/conn_handle.c | |
| parent | 0993da448ef02429a95f41ce8ccd17912f9836d3 (diff) | |
| parent | 2a89b8b983fae7e94cc10198df480e2f85004b32 (diff) | |
| download | mongo-d34e3e8ae5522f3434d2764ee6dae5b915c1c4c5.tar.gz | |
Merge branch 'develop' into wt-1967-evict-any
Diffstat (limited to 'src/conn/conn_handle.c')
| -rw-r--r-- | src/conn/conn_handle.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/conn/conn_handle.c b/src/conn/conn_handle.c index 7ab07045287..7a8a6cba838 100644 --- a/src/conn/conn_handle.c +++ b/src/conn/conn_handle.c @@ -59,8 +59,10 @@ __wt_connection_init(WT_CONNECTION_IMPL *conn) WT_RET(__wt_spin_init(session, &conn->reconfig_lock, "reconfigure")); WT_RET(__wt_spin_init(session, &conn->schema_lock, "schema")); WT_RET(__wt_spin_init(session, &conn->table_lock, "table creation")); - WT_RET(__wt_calloc_def(session, WT_PAGE_LOCKS(conn), &conn->page_lock)); - for (i = 0; i < WT_PAGE_LOCKS(conn); ++i) + + WT_RET(__wt_calloc_def(session, WT_PAGE_LOCKS, &conn->page_lock)); + WT_CACHE_LINE_ALIGNMENT_VERIFY(session, conn->page_lock); + for (i = 0; i < WT_PAGE_LOCKS; ++i) WT_RET( __wt_spin_init(session, &conn->page_lock[i], "btree page")); @@ -143,7 +145,7 @@ __wt_connection_destroy(WT_CONNECTION_IMPL *conn) __wt_spin_destroy(session, &conn->reconfig_lock); __wt_spin_destroy(session, &conn->schema_lock); __wt_spin_destroy(session, &conn->table_lock); - for (i = 0; i < WT_PAGE_LOCKS(conn); ++i) + for (i = 0; i < WT_PAGE_LOCKS; ++i) __wt_spin_destroy(session, &conn->page_lock[i]); __wt_free(session, conn->page_lock); |