mem.c

Timestamp:

Mar 31, 2022 9:00:36 AM (3 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

150730

Message:

libs/openssl: Update to 3.0.2 and switch to it, bugref:10128

Location:

trunk/src/libs/openssl-3.0.2

Files:

trunk/src/libs/openssl-3.0.2

Property svn:mergeinfo

-              r94082
+              r94404
 /*
  * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved.
+ *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
 …
 # include "internal/tsan_assist.h"
+# ifdef TSAN_REQUIRES_LOCKING
+#  define INCREMENT(x) /* empty */
+#  define LOAD(x) 0
+# else  /* TSAN_REQUIRES_LOCKING */
 static TSAN_QUALIFIER int malloc_count;
 static TSAN_QUALIFIER int realloc_count;
 static TSAN_QUALIFIER int free_count;
+# define INCREMENT(x) tsan_counter(&(x))
+#  define INCREMENT(x) tsan_counter(&(x))
+#  define LOAD(x)      tsan_load(&x)
+# endif /* TSAN_REQUIRES_LOCKING */
 static char *md_failstring;
 …
+{
     if (mcount != NULL)
         *mcount = tsan_load(&malloc_count);
+        *mcount = LOAD(malloc_count);
     if (rcount != NULL)
         *rcount = tsan_load(&realloc_count);
+        *rcount = LOAD(realloc_count);
     if (fcount != NULL)
         *fcount = tsan_load(&free_count);
+        *fcount = LOAD(free_count);
+}

Note: See TracChangeset for help on using the changeset viewer.