summaryrefslogtreecommitdiff
path: root/src/include/cache.h
diff options
context:
space:
mode:
authorAlex Gorrod <alexander.gorrod@mongodb.com>2016-09-26 17:05:25 +1000
committerAlex Gorrod <alexander.gorrod@mongodb.com>2016-09-26 17:05:25 +1000
commit9cf2f89d6d95e1de797f05ab1fef28695f8bae7b (patch)
treeee85341e7c28ff824ed4adb2a005d5ed7bea64ba /src/include/cache.h
parentbb18c439152379fb528af217345be40819b01fc4 (diff)
parentfc0e7abe82595e579573d42448632f7b36a2d154 (diff)
Merge branch 'mongodb-3.4' into mongodb-3.2mongodb-3.2.10
Diffstat (limited to 'src/include/cache.h')
-rw-r--r--src/include/cache.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/include/cache.h b/src/include/cache.h
index 515135f26ab..b24b625aec4 100644
--- a/src/include/cache.h
+++ b/src/include/cache.h
@@ -66,7 +66,7 @@ struct __wt_cache {
uint64_t bytes_dirty_leaf;
uint64_t pages_dirty_leaf;
uint64_t bytes_evict; /* Bytes/pages discarded by eviction */
- uint64_t pages_evict;
+ volatile uint64_t pages_evict;
uint64_t pages_evicted; /* Pages evicted during a pass */
uint64_t bytes_image; /* Bytes of disk images */
uint64_t bytes_inmem; /* Bytes/pages in memory */
@@ -175,7 +175,7 @@ struct __wt_cache {
#define WT_CACHE_EVICT_CLEAN_HARD 0x002 /* Clean % blocking app threads */
#define WT_CACHE_EVICT_DIRTY 0x004 /* Evict dirty pages */
#define WT_CACHE_EVICT_DIRTY_HARD 0x008 /* Dirty % blocking app threads */
-#define WT_CACHE_EVICT_SCRUB 0x010 /* Scrub dirty pages pages */
+#define WT_CACHE_EVICT_SCRUB 0x010 /* Scrub dirty pages */
#define WT_CACHE_EVICT_URGENT 0x020 /* Pages are in the urgent queue */
#define WT_CACHE_EVICT_ALL (WT_CACHE_EVICT_CLEAN | WT_CACHE_EVICT_DIRTY)
#define WT_CACHE_EVICT_MASK 0x0FF