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, 12 insertions, 12 deletions

diff --git a/src/third_party/wiredtiger/src/log/log.c b/src/third_party/wiredtiger/src/log/log.c
index 217a3deab60..167297c5c80 100644
--- a/src/third_party/wiredtiger/src/log/log.c
+++ b/src/third_party/wiredtiger/src/log/log.c
@@ -311,10 +311,10 @@ __wt_log_force_sync(WT_SESSION_IMPL *session, WT_LSN *min_lsn)
 		    "log_force_sync: sync directory %s to LSN %" PRIu32
 		    "/%" PRIu32,
 		    log->log_dir_fh->name, min_lsn->l.file, min_lsn->l.offset);
-		time_start = __wt_rdtsc(session);
+		time_start = __wt_clock(session);
 		WT_ERR(__wt_fsync(session, log->log_dir_fh, true));
-		time_stop = __wt_rdtsc(session);
-		fsync_duration_usecs = WT_TSCDIFF_US(time_stop, time_start);
+		time_stop = __wt_clock(session);
+		fsync_duration_usecs = WT_CLOCKDIFF_US(time_stop, time_start);
 		log->sync_dir_lsn = *min_lsn;
 		WT_STAT_CONN_INCR(session, log_sync_dir);
 		WT_STAT_CONN_INCRV(session,
@@ -334,10 +334,10 @@ __wt_log_force_sync(WT_SESSION_IMPL *session, WT_LSN *min_lsn)
 		__wt_verbose(session, WT_VERB_LOG,
 		    "log_force_sync: sync %s to LSN %" PRIu32 "/%" PRIu32,
 		    log_fh->name, min_lsn->l.file, min_lsn->l.offset);
-		time_start = __wt_rdtsc(session);
+		time_start = __wt_clock(session);
 		WT_ERR(__wt_fsync(session, log_fh, true));
-		time_stop = __wt_rdtsc(session);
-		fsync_duration_usecs = WT_TSCDIFF_US(time_stop, time_start);
+		time_stop = __wt_clock(session);
+		fsync_duration_usecs = WT_CLOCKDIFF_US(time_stop, time_start);
 		log->sync_lsn = *min_lsn;
 		WT_STAT_CONN_INCR(session, log_sync);
 		WT_STAT_CONN_INCRV(session,
@@ -1844,11 +1844,11 @@ __wt_log_release(WT_SESSION_IMPL *session, WT_LOGSLOT *slot, bool *freep)
 			    "/%" PRIu32,
 			    log->log_dir_fh->name,
 			    sync_lsn.l.file, sync_lsn.l.offset);
-			time_start = __wt_rdtsc(session);
+			time_start = __wt_clock(session);
 			WT_ERR(__wt_fsync(session, log->log_dir_fh, true));
-			time_stop = __wt_rdtsc(session);
+			time_stop = __wt_clock(session);
 			fsync_duration_usecs =
-			    WT_TSCDIFF_US(time_stop, time_start);
+			    WT_CLOCKDIFF_US(time_stop, time_start);
 			log->sync_dir_lsn = sync_lsn;
 			WT_STAT_CONN_INCR(session, log_sync_dir);
 			WT_STAT_CONN_INCRV(session,
@@ -1866,11 +1866,11 @@ __wt_log_release(WT_SESSION_IMPL *session, WT_LOGSLOT *slot, bool *freep)
 			    log->log_fh->name,
 			    sync_lsn.l.file, sync_lsn.l.offset);
 			WT_STAT_CONN_INCR(session, log_sync);
-			time_start = __wt_rdtsc(session);
+			time_start = __wt_clock(session);
 			WT_ERR(__wt_fsync(session, log->log_fh, true));
-			time_stop = __wt_rdtsc(session);
+			time_stop = __wt_clock(session);
 			fsync_duration_usecs =
-			    WT_TSCDIFF_US(time_stop, time_start);
+			    WT_CLOCKDIFF_US(time_stop, time_start);
 			WT_STAT_CONN_INCRV(session,
 			    log_sync_duration, fsync_duration_usecs);
 			log->sync_lsn = sync_lsn;