Merge pull request #9 from ClickHouse/vdimir/cherry-pick-tsan-fix

vdimir · web-flow · commit 621a9ecf4c32 · 2024-08-13T12:21:36.000+02:00
Cherry-pick fix for TSAN warning for mongoc_handshake_t::frozen
diff --git a/.tsan-suppressions b/.tsan-suppressions
@@ -1,2 +1 @@
 race:mongoc_counter*
-race:_mongoc_handshake_freeze
diff --git a/src/libmongoc/src/mongoc/mongoc-handshake.c b/src/libmongoc/src/mongoc/mongoc-handshake.c
@@ -720,7 +720,9 @@ _mongoc_handshake_build_doc_with_application (const char *appname)
 void
 _mongoc_handshake_freeze (void)
 {
+   bson_mutex_lock (&gHandshakeLock);
    _mongoc_handshake_get ()->frozen = true;
+   bson_mutex_unlock (&gHandshakeLock);
 }
 
 /*

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1 @@`
`1`	`1`	`race:mongoc_counter*`
`2`		`-race:_mongoc_handshake_freeze`
Original file line number	Diff line number	Diff line change
`@@ -720,7 +720,9 @@ _mongoc_handshake_build_doc_with_application (const char *appname)`
`720`	`720`	`void`
`721`	`721`	`_mongoc_handshake_freeze (void)`
`722`	`722`	`{`
	`723`	`+ bson_mutex_lock (&gHandshakeLock);`
`723`	`724`	`_mongoc_handshake_get ()->frozen = true;`
	`725`	`+ bson_mutex_unlock (&gHandshakeLock);`
`724`	`726`	`}`
`725`	`727`
`726`	`728`	`/*`