summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Cahill <michael.cahill@wiredtiger.com>2014-12-22 15:37:23 +1100
committerMichael Cahill <michael.cahill@wiredtiger.com>2014-12-22 15:37:23 +1100
commit6a98af60ca3c423851c0a4c39edb0dfa7d741291 (patch)
treefa2018674dc1010466e31ad6c53b4b4838859636
parent995d6f8c26ae19013a1eb921fd871481ca643f47 (diff)
downloadmongo-6a98af60ca3c423851c0a4c39edb0dfa7d741291.tar.gz
Rename flags to call this phase "eviction of pages that would block application threads".
-rw-r--r--src/evict/evict_lru.c13
-rw-r--r--src/evict/evict_page.c4
-rw-r--r--src/include/cache.h7
3 files changed, 12 insertions, 12 deletions
diff --git a/src/evict/evict_lru.c b/src/evict/evict_lru.c
index 2ff7cec9ef6..69fa1f85c93 100644
--- a/src/evict/evict_lru.c
+++ b/src/evict/evict_lru.c
@@ -407,13 +407,14 @@ __evict_has_work(WT_SESSION_IMPL *session, uint32_t *flagsp)
(cache->eviction_dirty_target * bytes_max) / 100)
/* Ignore clean pages unless the cache is too large */
LF_SET(WT_EVICT_PASS_DIRTY);
- else if (F_ISSET(cache, WT_EVICT_EARLY_CANDIDATES)) {
+ else if (F_ISSET(cache, WT_EVICT_WOULD_BLOCK)) {
/*
- * Trickle out pages with oldest generation set regardless of
- * whether we have reached the eviction trigger.
+ * Evict pages with oldest generation (which would otherwise
+ * block application threads) set regardless of whether we have
+ * reached the eviction trigger.
*/
- LF_SET(WT_EVICT_PASS_TRICKLE);
- F_CLR(cache, WT_EVICT_EARLY_CANDIDATES);
+ LF_SET(WT_EVICT_PASS_WOULD_BLOCK);
+ F_CLR(cache, WT_EVICT_WOULD_BLOCK);
}
if (F_ISSET(cache, WT_EVICT_STUCK))
@@ -1088,7 +1089,7 @@ __evict_walk_file(WT_SESSION_IMPL *session, u_int *slotp, uint32_t flags)
* If we are only trickling out pages marked for definite
* eviction, skip anything that isn't marked.
*/
- if (LF_ISSET(WT_EVICT_PASS_TRICKLE) &&
+ if (LF_ISSET(WT_EVICT_PASS_WOULD_BLOCK) &&
page->read_gen != WT_READGEN_OLDEST)
continue;
diff --git a/src/evict/evict_page.c b/src/evict/evict_page.c
index e840fb83cfb..4e96898fd92 100644
--- a/src/evict/evict_page.c
+++ b/src/evict/evict_page.c
@@ -118,8 +118,8 @@ done: session->excl_next = 0;
txn_state->snap_min = WT_TXN_NONE;
if ((inmem_split || (forced_eviction && ret == EBUSY)) &&
- !F_ISSET(S2C(session)->cache, WT_EVICT_EARLY_CANDIDATES)) {
- F_SET(S2C(session)->cache, WT_EVICT_EARLY_CANDIDATES);
+ !F_ISSET(S2C(session)->cache, WT_EVICT_WOULD_BLOCK)) {
+ F_SET(S2C(session)->cache, WT_EVICT_WOULD_BLOCK);
WT_TRET(__wt_evict_server_wake(session));
}
diff --git a/src/include/cache.h b/src/include/cache.h
index a28204c5582..cf688b3993f 100644
--- a/src/include/cache.h
+++ b/src/include/cache.h
@@ -19,7 +19,7 @@
#define WT_EVICT_PASS_AGGRESSIVE 0x01
#define WT_EVICT_PASS_ALL 0x02
#define WT_EVICT_PASS_DIRTY 0x04
-#define WT_EVICT_PASS_TRICKLE 0x08
+#define WT_EVICT_PASS_WOULD_BLOCK 0x08
/*
* WT_EVICT_ENTRY --
@@ -34,7 +34,6 @@ struct __wt_evict_entry {
* WT_EVICT_WORKER --
* Encapsulation of an eviction worker thread.
*/
-
struct __wt_evict_worker {
WT_SESSION_IMPL *session;
u_int id;
@@ -114,8 +113,8 @@ struct __wt_cache {
#define WT_CACHE_POOL_RUN 0x02 /* Cache pool thread running */
#define WT_EVICT_ACTIVE 0x04 /* Eviction server is active */
#define WT_EVICT_CLEAR_WALKS 0x08 /* Clear eviction walks */
-#define WT_EVICT_EARLY_CANDIDATES 0x10 /* Evict before trigger */
-#define WT_EVICT_STUCK 0x20 /* Eviction server is stuck */
+#define WT_EVICT_STUCK 0x10 /* Eviction server is stuck */
+#define WT_EVICT_WOULD_BLOCK 0x20 /* Pages that would block apps */
uint32_t flags;
};