|
 |
9e73702 |
From 6257d829c9d7e71ac51bcdc6b5b981c7a19200e2 Mon Sep 17 00:00:00 2001
|
|
|
9e73702 |
From: Mark Andrews <marka@isc.org>
|
|
|
9e73702 |
Date: Mon, 25 Nov 2019 05:46:55 +0000
|
|
|
9e73702 |
Subject: [PATCH] Merge branch
|
|
|
9e73702 |
'1373-threadsanitizer-data-race-rbtdb-c-5193-in-detachnode' into 'master'
|
|
|
9e73702 |
|
|
|
9e73702 |
Resolve "ThreadSanitizer: data race rbtdb.c:5193 in detachnode"
|
|
|
9e73702 |
|
|
|
9e73702 |
Closes #1373
|
|
|
9e73702 |
|
|
|
9e73702 |
See merge request isc-projects/bind9!2598
|
|
|
9e73702 |
---
|
|
|
9e73702 |
lib/dns/include/dns/rbt.h | 22 +++++++++-------------
|
|
|
9e73702 |
1 file changed, 9 insertions(+), 13 deletions(-)
|
|
|
9e73702 |
|
|
|
9e73702 |
diff --git a/lib/dns/include/dns/rbt.h b/lib/dns/include/dns/rbt.h
|
|
|
9e73702 |
index 67ac3e4d8a..a084bd6193 100644
|
|
|
9e73702 |
--- a/lib/dns/include/dns/rbt.h
|
|
|
9e73702 |
+++ b/lib/dns/include/dns/rbt.h
|
|
|
9e73702 |
@@ -49,10 +49,7 @@ ISC_LANG_BEGINDECLS
|
|
|
9e73702 |
|
|
|
9e73702 |
#define DNS_RBT_USEMAGIC 1
|
|
|
9e73702 |
|
|
|
9e73702 |
-/*
|
|
|
9e73702 |
- * These should add up to 30.
|
|
|
9e73702 |
- */
|
|
|
9e73702 |
-#define DNS_RBT_LOCKLENGTH 10
|
|
|
9e73702 |
+#define DNS_RBT_LOCKLENGTH (sizeof(((dns_rbtnode_t *)0)->locknum)*8)
|
|
|
9e73702 |
#define DNS_RBT_REFLENGTH 20
|
|
|
9e73702 |
|
|
|
9e73702 |
#define DNS_RBTNODE_MAGIC ISC_MAGIC('R','B','N','O')
|
|
|
9e73702 |
@@ -159,16 +156,15 @@ struct dns_rbtnode {
|
|
|
9e73702 |
* separate region of memory.
|
|
|
9e73702 |
*/
|
|
|
9e73702 |
void *data;
|
|
|
9e73702 |
- unsigned int :0; /* start of bitfields c/o node lock */
|
|
|
9e73702 |
- unsigned int dirty:1;
|
|
|
9e73702 |
- unsigned int wild:1;
|
|
|
9e73702 |
- unsigned int locknum:DNS_RBT_LOCKLENGTH;
|
|
|
9e73702 |
-#ifndef DNS_RBT_USEISCREFCOUNT
|
|
|
9e73702 |
- unsigned int references:DNS_RBT_REFLENGTH;
|
|
|
9e73702 |
-#endif
|
|
|
9e73702 |
- unsigned int :0; /* end of bitfields c/o node lock */
|
|
|
9e73702 |
+ uint8_t :0; /* start of bitfields c/o node lock */
|
|
|
9e73702 |
+ uint8_t dirty:1;
|
|
|
9e73702 |
+ uint8_t wild:1;
|
|
|
9e73702 |
+ uint8_t :0; /* end of bitfields c/o node lock */
|
|
|
9e73702 |
+ uint16_t locknum; /* note that this is not in the bitfield */
|
|
|
9e73702 |
#ifdef DNS_RBT_USEISCREFCOUNT
|
|
|
9e73702 |
- isc_refcount_t references; /* note that this is not in the bitfield */
|
|
|
9e73702 |
+ isc_refcount_t references;
|
|
|
9e73702 |
+#else
|
|
|
9e73702 |
+ unsigned int references:DNS_RBT_REFLENGTH;
|
|
|
9e73702 |
#endif
|
|
|
9e73702 |
/*@}*/
|
|
|
9e73702 |
};
|
|
|
9e73702 |
--
|
|
|
9e73702 |
2.21.0
|
|
|
9e73702 |
|