Add helgrind and drd annotations to critnib data strcture

Author: vinser52

src/critnib/critnib.c

@@ -64,6 +64,7 @@
 #include "utils_assert.h"
 #include "utils_common.h"
 #include "utils_concurrency.h"
+#include "utils_sanitizers.h"
 
 /*
  * A node that has been deleted is left untouched for this many delete
@@ -137,10 +138,12 @@ struct critnib {
  * atomic load
  */
 static void load(void *src, void *dst) {
+    utils_annotate_acquire(src);
     util_atomic_load_acquire((word *)src, (word *)dst);
 }
 
 static void load64(uint64_t *src, uint64_t *dst) {
+    utils_annotate_acquire((void *)src);
     util_atomic_load_acquire(src, dst);
 }
 
@@ -149,6 +152,7 @@ static void load64(uint64_t *src, uint64_t *dst) {
  */
 static void store(void *dst, void *src) {
     util_atomic_store_release((word *)dst, (word)src);
+    utils_annotate_release(dst);
 }
 
 /*

src/utils/utils_sanitizers.h

@@ -113,6 +113,8 @@ extern "C" {
 static inline void utils_annotate_acquire(void *ptr) {
 #if __SANITIZE_THREAD__
     __tsan_acquire(ptr);
+#elif UMF_VG_HELGRIND_ENABLED || UMF_VG_DRD_ENABLED
+    ANNOTATE_HAPPENS_AFTER(ptr);
 #else
     (void)ptr;
 #endif
@@ -121,6 +123,8 @@ static inline void utils_annotate_acquire(void *ptr) {
 static inline void utils_annotate_release(void *ptr) {
 #if __SANITIZE_THREAD__
     __tsan_release(ptr);
+#elif UMF_VG_HELGRIND_ENABLED || UMF_VG_DRD_ENABLED
+    ANNOTATE_HAPPENS_BEFORE(ptr);
 #else
     (void)ptr;
 #endif