diff options
| author | Susan LoVerso <sue@wiredtiger.com> | 2015-11-18 14:52:02 -0500 |
|---|---|---|
| committer | Susan LoVerso <sue@wiredtiger.com> | 2015-11-18 14:52:02 -0500 |
| commit | 6caf4c5674139482520753c04db1e1b779f3ac7c (patch) | |
| tree | 129e2914d85c2c7d3bb2c0174f0678fdfe7e47c8 /dist | |
| parent | e95bff1310097caef190dbe8210ee3f59b7681ac (diff) | |
| parent | e2f11301fe0f877225dbd102aba458b887cd40ee (diff) | |
| download | mongo-6caf4c5674139482520753c04db1e1b779f3ac7c.tar.gz | |
Merge branch 'develop' into trunc-stats
Conflicts:
src/include/wiredtiger.in
Diffstat (limited to 'dist')
| -rw-r--r-- | dist/s_define.list | 5 | ||||
| -rw-r--r-- | dist/s_string.ok | 1 | ||||
| -rw-r--r-- | dist/stat_data.py | 8 |
3 files changed, 10 insertions, 4 deletions
diff --git a/dist/s_define.list b/dist/s_define.list index d204a11835b..a2b86610755 100644 --- a/dist/s_define.list +++ b/dist/s_define.list @@ -36,6 +36,8 @@ WT_READ_BARRIER WT_REF_SIZE WT_SESSION_LOCKED_CHECKPOINT WT_SESSION_LOCKED_TURTLE +WT_STATS_FIELD_TO_SLOT +WT_STATS_SLOT_ID WT_STAT_DECR WT_STAT_DECRV WT_STAT_FAST_CONN_DECRV @@ -45,9 +47,8 @@ WT_STAT_FAST_DECRV WT_STAT_FAST_INCR WT_STAT_FAST_INCRV WT_STAT_FAST_SET -WT_STATS_FIELD_TO_SLOT -WT_STATS_SLOT_ID WT_STAT_WRITE +WT_TIMEDIFF_US WT_TRET_ERROR_OK WT_WITH_LOCK __F diff --git a/dist/s_string.ok b/dist/s_string.ok index c14f4c961e6..21cd360c144 100644 --- a/dist/s_string.ok +++ b/dist/s_string.ok @@ -507,6 +507,7 @@ dev dh dhandle dhandles +difftime dir dirlist dlclose diff --git a/dist/stat_data.py b/dist/stat_data.py index 9c49e20fa61..85ecdeb5be5 100644 --- a/dist/stat_data.py +++ b/dist/stat_data.py @@ -199,7 +199,9 @@ connection_stats = [ 'eviction server populating queue, but not evicting pages'), CacheStat('cache_eviction_slow', 'eviction server unable to reach eviction goal'), - CacheStat('cache_eviction_split', 'pages split during eviction'), + CacheStat('cache_eviction_split_internal', + 'internal pages split during eviction'), + CacheStat('cache_eviction_split_leaf', 'leaf pages split during eviction'), CacheStat('cache_eviction_walk', 'pages walked for eviction'), CacheStat('cache_eviction_worker_evicting', 'eviction worker thread evicting pages'), @@ -479,7 +481,9 @@ dsrc_stats = [ 'data source pages selected for eviction unable to be evicted'), CacheStat('cache_eviction_hazard', 'hazard pointer blocked page eviction'), CacheStat('cache_eviction_internal', 'internal pages evicted'), - CacheStat('cache_eviction_split', 'pages split during eviction'), + CacheStat('cache_eviction_split_internal', + 'internal pages split during eviction'), + CacheStat('cache_eviction_split_leaf', 'leaf pages split during eviction'), CacheStat('cache_inmem_split', 'in-memory page splits'), CacheStat('cache_inmem_splittable', 'in-memory page passed criteria to be split'), |