summaryrefslogtreecommitdiff
path: root/src/conn/conn_cache.c
diff options
context:
space:
mode:
authorKeith Bostic <keith@wiredtiger.com>2016-02-29 08:55:36 -0500
committerKeith Bostic <keith@wiredtiger.com>2016-02-29 08:55:36 -0500
commit0a8aac89fbefb8e376210720d4163f5cde78a134 (patch)
treea4bf086a213d7003f06d1f82fc573942031a38f6 /src/conn/conn_cache.c
parent8ed209bca54c245412cdcdddfb44120e3389882c (diff)
downloadmongo-0a8aac89fbefb8e376210720d4163f5cde78a134.tar.gz
WT-2345: __wt_evict_file_exclusive_on/off cleanups
Use a per-file spinlock instead of a global cache lock to protect the per-file eviction disabled information, check to see if the lock even needs to be acquired in eviction before doing the work.
Diffstat (limited to 'src/conn/conn_cache.c')
-rw-r--r--src/conn/conn_cache.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/conn/conn_cache.c b/src/conn/conn_cache.c
index 1831aad5895..2b2aa9a2e42 100644
--- a/src/conn/conn_cache.c
+++ b/src/conn/conn_cache.c
@@ -152,7 +152,6 @@ __wt_cache_create(WT_SESSION_IMPL *session, const char *cfg[])
WT_ERR(__wt_cond_alloc(session,
"eviction waiters", false, &cache->evict_waiter_cond));
WT_ERR(__wt_spin_init(session, &cache->evict_lock, "cache eviction"));
- WT_ERR(__wt_spin_init(session, &cache->evict_walk_lock, "cache walk"));
/* Allocate the LRU eviction queue. */
cache->evict_slots = WT_EVICT_WALK_BASE + WT_EVICT_WALK_INCR;
@@ -249,7 +248,6 @@ __wt_cache_destroy(WT_SESSION_IMPL *session)
WT_TRET(__wt_cond_destroy(session, &cache->evict_cond));
WT_TRET(__wt_cond_destroy(session, &cache->evict_waiter_cond));
__wt_spin_destroy(session, &cache->evict_lock);
- __wt_spin_destroy(session, &cache->evict_walk_lock);
__wt_free(session, cache->evict_queue);
__wt_free(session, conn->cache);