From 0a29c7a7c5737b0e6027cf4cb01828b1abd8f41c Mon Sep 17 00:00:00 2001
From: Luke Chen <luke.chen@mongodb.com>
Date: Mon, 17 Dec 2018 15:19:04 +1100
Subject: Import wiredtiger: d5793d4dd57bb763079e3f79821444e7e666ff44 from
 branch mongodb-4.2

ref: 5812c92f5f..d5793d4dd5
for: 4.1.7

WT-4280       Add debugging to know which session has a hazard pointer
WT-4430       Fix race between prepare and page instantiate with fast truncate
WT-4482       lint
---
 src/third_party/wiredtiger/dist/function.py  | 3 +++
 src/third_party/wiredtiger/dist/s_clang-tidy | 6 ++++++
 src/third_party/wiredtiger/dist/s_string.ok  | 1 +
 3 files changed, 10 insertions(+)

(limited to 'src/third_party/wiredtiger/dist')

diff --git a/src/third_party/wiredtiger/dist/function.py b/src/third_party/wiredtiger/dist/function.py
index 446f16dc47f..7c632b4e227 100644
--- a/src/third_party/wiredtiger/dist/function.py
+++ b/src/third_party/wiredtiger/dist/function.py
@@ -49,11 +49,14 @@ types = [
     'TEST_',
     'WT_',
     'wt_',
+    'DWORD',
     'double',
     'float',
     'intmax_t',
     'intptr_t',
+    'clock_t',
     'pid_t',
+    'pthread_t',
     'size_t',
     'ssize_t',
     'time_t',
diff --git a/src/third_party/wiredtiger/dist/s_clang-tidy b/src/third_party/wiredtiger/dist/s_clang-tidy
index 89d3fa4112a..8fd140ca883 100644
--- a/src/third_party/wiredtiger/dist/s_clang-tidy
+++ b/src/third_party/wiredtiger/dist/s_clang-tidy
@@ -48,16 +48,22 @@ args="-checks=*"
 args="$args,-android-cloexec-fopen"
 args="$args,-clang-analyzer-core.NullDereference"
 args="$args,-clang-analyzer-optin.performance.Padding"
+args="$args,-cppcoreguidelines-avoid-magic-numbers"
 args="$args,-google-readability-braces-around-statements"
 args="$args,-hicpp-braces-around-statements"
+args="$args,-hicpp-multiway-paths-covered"
 args="$args,-hicpp-no-assembler"
 args="$args,-hicpp-signed-bitwise"
+args="$args,-hicpp-uppercase-literal-suffix"
+args="$args,-hicpp-uppercase-literal-suffix-header-guard"
 args="$args,-llvm-header-guard"
 args="$args,-llvm-include-order"
 args="$args,-readability-braces-around-statements"
 args="$args,-readability-inconsistent-declaration-parameter-name"
+args="$args,-readability-magic-numbers"
 args="$args,-readability-named-parameter"
 args="$args,-readability-non-const-parameter"
+args="$args,-readability-uppercase-literal-suffix"
 
 # clang-tidy gets unhappy if we toss the whole tree at it, so run
 # through a file at a time.
diff --git a/src/third_party/wiredtiger/dist/s_string.ok b/src/third_party/wiredtiger/dist/s_string.ok
index 20befb6bf97..c5546aed751 100644
--- a/src/third_party/wiredtiger/dist/s_string.ok
+++ b/src/third_party/wiredtiger/dist/s_string.ok
@@ -701,6 +701,7 @@ endian
 english
 enqueue
 enqueued
+enum
 env
 eof
 epi
-- 
cgit v1.2.1