summaryrefslogtreecommitdiff
path: root/src/third_party/wiredtiger/src/include/thread_group.h
diff options
context:
space:
mode:
authorRamon Fernandez <ramon@mongodb.com>2016-09-26 08:11:23 -0400
committerRamon Fernandez <ramon@mongodb.com>2016-09-26 08:11:23 -0400
commit9dda827a3ae58beef36d53da1b55554cbd8744c4 (patch)
tree6bcd26e1daf5f808a1e5b1dce3f75925aae8b773 /src/third_party/wiredtiger/src/include/thread_group.h
parent0de201d310304852d97a7fd4f3248110c83f29b5 (diff)
downloadmongo-9dda827a3ae58beef36d53da1b55554cbd8744c4.tar.gz
Import wiredtiger: fc0e7abe82595e579573d42448632f7b36a2d154 from branch mongodb-3.4
ref: 5bc03723a7..fc0e7abe82 for: 3.3.15 WT-2864 Reconfiguring the checkpoint server can lead to hangs WT-2874 Change test_compact01 to avoid eviction WT-2918 The dist scripts create C files s_whitespace complains about WT-2919 Don't mask error returns from style checking scripts WT-2921 Reduce the WT_SESSION hazard_size when possible WT-2923 heap-use-after-free on address in compaction WT-2924 Ensure we are doing eviction when threads are waiting for it WT-2925 WT_THREAD_PANIC_FAIL is a WT_THREAD structure flag WT-2926 WT_CONNECTION.reconfigure can attempt unlock of not-locked lock WT-2928 Eviction failing to switch queues can lead to starvation
Diffstat (limited to 'src/third_party/wiredtiger/src/include/thread_group.h')
-rw-r--r--src/third_party/wiredtiger/src/include/thread_group.h15
1 files changed, 8 insertions, 7 deletions
diff --git a/src/third_party/wiredtiger/src/include/thread_group.h b/src/third_party/wiredtiger/src/include/thread_group.h
index f946dcab144..76758a090c4 100644
--- a/src/third_party/wiredtiger/src/include/thread_group.h
+++ b/src/third_party/wiredtiger/src/include/thread_group.h
@@ -14,7 +14,14 @@ struct __wt_thread {
WT_SESSION_IMPL *session;
u_int id;
wt_thread_t tid;
-#define WT_THREAD_RUN 0x01
+
+ /*
+ * WT_THREAD and thread-group function flags, merged because
+ * WT_THREAD_PANIC_FAIL appears in both groups.
+ */
+#define WT_THREAD_CAN_WAIT 0x01 /* WT_SESSION_CAN_WAIT */
+#define WT_THREAD_PANIC_FAIL 0x02 /* panic if the thread fails */
+#define WT_THREAD_RUN 0x04 /* thread is running */
uint32_t flags;
/* The runner function used by all threads. */
@@ -22,12 +29,6 @@ struct __wt_thread {
};
/*
- * Flags for thread group functions.
- */
-#define WT_THREAD_CAN_WAIT 0x01
-#define WT_THREAD_PANIC_FAIL 0x02
-
-/*
* WT_THREAD_GROUP --
* Encapsulation of a group of utility threads.
*/