From bd9ed5bbe07754221ad014dceefc0ebdb0ecab32 Mon Sep 17 00:00:00 2001 From: Luke Chen Date: Fri, 5 Jan 2018 22:07:41 +1100 Subject: Import wiredtiger: 9e5044823185feffa71e56a6593cfb92e0741a41 from branch mongodb-3.8 ref: 1a29eac4dc..9e50448231 for: 3.7.1 WT-2705 High throughput cache bound many threaded workloads can experience long latencies WT-3725 Add statistics to locks around timestamp structures WT-3750 Fast-path fs_directory_list of a single file. WT-3768 Lookaside optimization: birthmarks WT-3769 Fix a bug in reverse cursor walks with particular delete patterns and prefix compression enabled WT-3779 Add support for string formats with WT_CURSOR::modify WT-3800 test_wt2834_join_bloom_fix hang WT-3806 Make sure rdtsc values move forward in time WT-3807 clang static analysis updates WT-3810 wt_rdtsc calibration needs to be longer and verify validity WT-3812 debugging page output should handle complex key/value items. WT-3816 Enable prefix compression on the lookaside table WT-3819 clang static analysis improvements WT-3820 Add a WT_SESSION.breakpoint method for Python debugging. WT-3822 Update WiredTiger copyrights to 2018 WT-3824 tsc_nsec_ratio can compute to zero and cause divide by zero bug --- src/third_party/wiredtiger/src/include/os.h | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'src/third_party/wiredtiger/src/include/os.h') diff --git a/src/third_party/wiredtiger/src/include/os.h b/src/third_party/wiredtiger/src/include/os.h index 9f5f35344ba..a3f1420d72b 100644 --- a/src/third_party/wiredtiger/src/include/os.h +++ b/src/third_party/wiredtiger/src/include/os.h @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2014-2017 MongoDB, Inc. + * Copyright (c) 2014-2018 MongoDB, Inc. * Copyright (c) 2008-2014 WiredTiger, Inc. * All rights reserved. * @@ -65,14 +65,14 @@ #define WT_TIMEDIFF_SEC(end, begin) \ (WT_TIMEDIFF_NS((end), (begin)) / WT_BILLION) -#define WT_TSCDIFF_NS(s, end, begin) \ - (__wt_tsc_to_nsec((s), (uint64_t)(end) - (uint64_t)(begin))) -#define WT_TSCDIFF_US(s, end, begin) \ - (WT_TSCDIFF_NS((s), (end), (begin)) / WT_THOUSAND) -#define WT_TSCDIFF_MS(s, end, begin) \ - (WT_TSCDIFF_NS((s), (end), (begin)) / WT_MILLION) -#define WT_TSCDIFF_SEC(s, end, begin) \ - (WT_TSCDIFF_NS((s), (end), (begin)) / WT_BILLION) +#define WT_TSCDIFF_NS(end, begin) \ + (__wt_tsc_to_nsec(end, begin)) +#define WT_TSCDIFF_US(end, begin) \ + (WT_TSCDIFF_NS(end, begin) / WT_THOUSAND) +#define WT_TSCDIFF_MS(end, begin) \ + (WT_TSCDIFF_NS(end, begin) / WT_MILLION) +#define WT_TSCDIFF_SEC(end, begin) \ + (WT_TSCDIFF_NS(end, begin) / WT_BILLION) #define WT_TIMECMP(t1, t2) \ ((t1).tv_sec < (t2).tv_sec ? -1 : \ -- cgit v1.2.1