Import wiredtiger: 5bc03723a7e77c96b1d5e45a97173654872c727a from branch mongodb-3.4

ref: deeb0f589a..5bc03723a7
for: 3.3.13

WT-2859       Improve statistics macros to not collect stats when statistics=none is set
WT-2894       Create workload that shows negative scaling when overwhelmed
WT-2900       Add ARM8 build support to WiredTiger and fix ARM CRC assembler tags
WT-2902       Enhance eviction to work better with update heavy YCSB load
WT-2905       dead code: MongoDB Coverity #99881
WT-2908       Add dry-run support to python unit-test
WT-2910       test_inmem01 can abort due to stuck cache
WT-2911       add support for gcc6
WT-2912       make --enable-strict run on the zseries test box
WT-2913       stuck cache after latest merge
WT-2914       Fix link error on OS/X for checksum_init call
WT-2916       whitespace check not working

3 files changed, 11 insertions, 11 deletions

diff --git a/src/third_party/wiredtiger/src/async/async_api.c b/src/third_party/wiredtiger/src/async/async_api.c
index 0a855514a07..bac4dc01bae 100644
--- a/src/third_party/wiredtiger/src/async/async_api.c
+++ b/src/third_party/wiredtiger/src/async/async_api.c
@@ -113,7 +113,7 @@ __async_new_op_alloc(WT_SESSION_IMPL *session, const char *uri,
 
 	conn = S2C(session);
 	async = conn->async;
-	WT_STAT_FAST_CONN_INCR(session, async_op_alloc);
+	WT_STAT_CONN_INCR(session, async_op_alloc);
 	*opp = NULL;
 
 retry:
@@ -143,7 +143,7 @@ retry:
 	 * We still haven't found one.  Return an error.
 	 */
 	if (op == NULL || op->state != WT_ASYNCOP_FREE) {
-		WT_STAT_FAST_CONN_INCR(session, async_full);
+		WT_STAT_CONN_INCR(session, async_full);
 		WT_RET(EBUSY);
 	}
 	/*
@@ -152,10 +152,10 @@ retry:
 	 * Start the next search at the next entry after this one.
 	 */
 	if (!__wt_atomic_cas32(&op->state, WT_ASYNCOP_FREE, WT_ASYNCOP_READY)) {
-		WT_STAT_FAST_CONN_INCR(session, async_alloc_race);
+		WT_STAT_CONN_INCR(session, async_alloc_race);
 		goto retry;
 	}
-	WT_STAT_FAST_CONN_INCRV(session, async_alloc_view, view);
+	WT_STAT_CONN_INCRV(session, async_alloc_view, view);
 	WT_RET(__async_get_format(conn, uri, config, op));
 	op->unique_id = __wt_atomic_add64(&async->op_id, 1);
 	op->optype = WT_AOP_NONE;
@@ -507,7 +507,7 @@ __wt_async_flush(WT_SESSION_IMPL *session)
 	if (workers == 0)
 		return (0);
 
-	WT_STAT_FAST_CONN_INCR(session, async_flush);
+	WT_STAT_CONN_INCR(session, async_flush);
 	/*
 	 * We have to do several things.  First we have to prevent
 	 * other callers from racing with us so that only one
diff --git a/src/third_party/wiredtiger/src/async/async_op.c b/src/third_party/wiredtiger/src/async/async_op.c
index 2bdc9e4ec8e..8c074e503d9 100644
--- a/src/third_party/wiredtiger/src/async/async_op.c
+++ b/src/third_party/wiredtiger/src/async/async_op.c
@@ -104,7 +104,7 @@ __async_search(WT_ASYNC_OP *asyncop)
 
 	op = (WT_ASYNC_OP_IMPL *)asyncop;
 	ASYNCOP_API_CALL(O2C(op), session, search);
-	WT_STAT_FAST_CONN_INCR(O2S(op), async_op_search);
+	WT_STAT_CONN_INCR(O2S(op), async_op_search);
 	WT_ERR(__async_op_wrap(op, WT_AOP_SEARCH));
 err:	API_END_RET(session, ret);
 }
@@ -122,7 +122,7 @@ __async_insert(WT_ASYNC_OP *asyncop)
 
 	op = (WT_ASYNC_OP_IMPL *)asyncop;
 	ASYNCOP_API_CALL(O2C(op), session, insert);
-	WT_STAT_FAST_CONN_INCR(O2S(op), async_op_insert);
+	WT_STAT_CONN_INCR(O2S(op), async_op_insert);
 	WT_ERR(__async_op_wrap(op, WT_AOP_INSERT));
 err:	API_END_RET(session, ret);
 }
@@ -140,7 +140,7 @@ __async_update(WT_ASYNC_OP *asyncop)
 
 	op = (WT_ASYNC_OP_IMPL *)asyncop;
 	ASYNCOP_API_CALL(O2C(op), session, update);
-	WT_STAT_FAST_CONN_INCR(O2S(op), async_op_update);
+	WT_STAT_CONN_INCR(O2S(op), async_op_update);
 	WT_ERR(__async_op_wrap(op, WT_AOP_UPDATE));
 err:	API_END_RET(session, ret);
 }
@@ -158,7 +158,7 @@ __async_remove(WT_ASYNC_OP *asyncop)
 
 	op = (WT_ASYNC_OP_IMPL *)asyncop;
 	ASYNCOP_API_CALL(O2C(op), session, remove);
-	WT_STAT_FAST_CONN_INCR(O2S(op), async_op_remove);
+	WT_STAT_CONN_INCR(O2S(op), async_op_remove);
 	WT_ERR(__async_op_wrap(op, WT_AOP_REMOVE));
 err:	API_END_RET(session, ret);
 }
@@ -176,7 +176,7 @@ __async_compact(WT_ASYNC_OP *asyncop)
 
 	op = (WT_ASYNC_OP_IMPL *)asyncop;
 	ASYNCOP_API_CALL(O2C(op), session, compact);
-	WT_STAT_FAST_CONN_INCR(O2S(op), async_op_compact);
+	WT_STAT_CONN_INCR(O2S(op), async_op_compact);
 	WT_ERR(__async_op_wrap(op, WT_AOP_COMPACT));
 err:	API_END_RET(session, ret);
 }
diff --git a/src/third_party/wiredtiger/src/async/async_worker.c b/src/third_party/wiredtiger/src/async/async_worker.c
index cf83d797738..401d0616eab 100644
--- a/src/third_party/wiredtiger/src/async/async_worker.c
+++ b/src/third_party/wiredtiger/src/async/async_worker.c
@@ -37,7 +37,7 @@ retry:
 	 */
 	while (last_consume == async->head &&
 	    async->flush_state != WT_ASYNC_FLUSHING) {
-		WT_STAT_FAST_CONN_INCR(session, async_nowork);
+		WT_STAT_CONN_INCR(session, async_nowork);
 		if (++tries < MAX_ASYNC_YIELD)
 			/*
 			 * Initially when we find no work, allow other