Import wiredtiger: 357efdd4ce279efc71ff618c59fe1b903ef80bb2 from branch mongodb-3.8

ref: 9e50448231..357efdd4ce
for: 3.7.2

WT-3565       Test and understand mixed timestamp/no-timestamp usage to same data
WT-3597       Add a diagnostic check for updates to the same key out of timestamp order
WT-3632       Increase how granularly cache usage settings can be configured
WT-3695       format failed to report a stuck cache
WT-3740       race in page dirty-byte decrement.
WT-3767       Avoid lookaside instantiation for faster reads
WT-3775       Improve commit timestamp is older than oldest timestamp error message
WT-3792       LSM version 1 metadata incompatibility
WT-3796       Report a better error message if transaction commit fails
WT-3799       Test/format with timestamps enabled pin cache full
WT-3809       Fix a bug in lookaside related to birthmarks
WT-3811       Python scripts for visualizing operation tracking files
WT-3818       __rec_txn_read() code order cleanup
WT-3825       Fix calculation of CPU ticks per unit time
WT-3826       random-abort test failure
WT-3827       test_compact02 failure
WT-3828       Link error on OS/X for __wt_process data reference
WT-3831       uninitialized buffer value in statlog server path comparison
WT-3832       Fixup shell script warning messages
WT-3833       test/format cache_minimum value error
WT-3841       Fix error message pattern in timestamp09
WT-3842       full-build Friday & lint
WT-3844       Checkpoints can hang on limbo pages
WT-3845       Compiler warning in examples using GCC 5.4.0

1 files changed, 15 insertions, 15 deletions

diff --git a/src/third_party/wiredtiger/src/cursor/cur_file.c b/src/third_party/wiredtiger/src/cursor/cur_file.c
index 5f68ad3883e..9d6f031807f 100644
--- a/src/third_party/wiredtiger/src/cursor/cur_file.c
+++ b/src/third_party/wiredtiger/src/cursor/cur_file.c
@@ -196,11 +196,11 @@ __curfile_search(WT_CURSOR *cursor)
 	CURSOR_API_CALL(cursor, session, search, cbt->btree);
 	WT_ERR(__cursor_checkkey(cursor));
 
-	time_start = __wt_rdtsc(session);
+	time_start = __wt_clock(session);
 	WT_ERR(__wt_btcur_search(cbt));
-	time_stop = __wt_rdtsc(session);
+	time_stop = __wt_clock(session);
 	 __wt_stat_usecs_hist_incr_opread(session,
-	    WT_TSCDIFF_US(time_stop, time_start));
+	    WT_CLOCKDIFF_US(time_stop, time_start));
 
 	/* Search maintains a position, key and value. */
 	WT_ASSERT(session,
@@ -227,11 +227,11 @@ __curfile_search_near(WT_CURSOR *cursor, int *exact)
 	CURSOR_API_CALL(cursor, session, search_near, cbt->btree);
 	WT_ERR(__cursor_checkkey(cursor));
 
-	time_start = __wt_rdtsc(session);
+	time_start = __wt_clock(session);
 	WT_ERR(__wt_btcur_search_near(cbt, exact));
-	time_stop = __wt_rdtsc(session);
+	time_stop = __wt_clock(session);
 	__wt_stat_usecs_hist_incr_opread(session,
-	    WT_TSCDIFF_US(time_stop, time_start));
+	    WT_CLOCKDIFF_US(time_stop, time_start));
 
 	/* Search-near maintains a position, key and value. */
 	WT_ASSERT(session,
@@ -261,11 +261,11 @@ __curfile_insert(WT_CURSOR *cursor)
 		WT_ERR(__cursor_checkkey(cursor));
 	WT_ERR(__cursor_checkvalue(cursor));
 
-	time_start = __wt_rdtsc(session);
+	time_start = __wt_clock(session);
 	WT_ERR(__wt_btcur_insert(cbt));
-	time_stop = __wt_rdtsc(session);
+	time_stop = __wt_clock(session);
 	__wt_stat_usecs_hist_incr_opwrite(session,
-	    WT_TSCDIFF_US(time_stop, time_start));
+	    WT_CLOCKDIFF_US(time_stop, time_start));
 
 	/*
 	 * Insert maintains no position, key or value (except for column-store
@@ -362,11 +362,11 @@ __curfile_update(WT_CURSOR *cursor)
 	WT_ERR(__cursor_checkkey(cursor));
 	WT_ERR(__cursor_checkvalue(cursor));
 
-	time_start = __wt_rdtsc(session);
+	time_start = __wt_clock(session);
 	WT_ERR(__wt_btcur_update(cbt));
-	time_stop = __wt_rdtsc(session);
+	time_stop = __wt_clock(session);
 	__wt_stat_usecs_hist_incr_opwrite(session,
-	    WT_TSCDIFF_US(time_stop, time_start));
+	    WT_CLOCKDIFF_US(time_stop, time_start));
 
 	/* Update maintains a position, key and value. */
 	WT_ASSERT(session,
@@ -394,11 +394,11 @@ __curfile_remove(WT_CURSOR *cursor)
 	CURSOR_REMOVE_API_CALL(cursor, session, cbt->btree);
 	WT_ERR(__cursor_checkkey(cursor));
 
-	time_start = __wt_rdtsc(session);
+	time_start = __wt_clock(session);
 	WT_ERR(__wt_btcur_remove(cbt));
-	time_stop = __wt_rdtsc(session);
+	time_stop = __wt_clock(session);
 	__wt_stat_usecs_hist_incr_opwrite(session,
-	    WT_TSCDIFF_US(time_stop, time_start));
+	    WT_CLOCKDIFF_US(time_stop, time_start));
 
 	/*
 	 * Remove with a search-key is fire-and-forget, no position and no key.