ComputerSurge/bind9
3
0
Fork 0
Code Pull Requests 1 Activity

Prevent inlining of code with thread sanitiser disabled

Browse Source
This commit is contained in:
Mark Andrews
2020-12-10 06:31:19 +00:00
parent c2676bccc5
commit 0e5a076cc1
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bin/named/client.c
+1 -1
View File
@@ -3861,7 +3861,7 @@ ns_clientmgr_destroy(ns_clientmgr_t **managerp) {
* the taillock every time ISC_QUEUE_POP is called.
* Isolate ISC_QUEUE_POP from tsan analysis.
*/
ISC_NO_SANITIZE_THREAD static ns_client_t *
ISC_NO_SANITIZE_THREAD static ISC_NO_SANITIZE_INLINE ns_client_t *
queue_pop(ns_clientmgr_t *manager)
{
ns_client_t *client = NULL;
lib/isc/include/isc/util.h
+3 -1
View File
@@ -227,9 +227,11 @@
#endif
#if __SANITIZE_THREAD__
#define ISC_NO_SANITIZE_THREAD __attribute__((no_sanitize("thread")))
#define ISC_NO_SANITIZE_THREAD __attribute__((no_sanitize("thread"))) __attribute__((noinline))
#define ISC_NO_SANITIZE_INLINE
#else /* if __SANITIZE_THREAD__ */
#define ISC_NO_SANITIZE_THREAD
#define ISC_NO_SANITIZE_INLINE inline
#endif /* if __SANITIZE_THREAD__ */
#ifdef UNIT_TESTING