diff options
| author | Andy Polyakov <appro@openssl.org> | 2018-07-29 14:11:49 +0200 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2018-08-07 09:08:18 +0200 |
| commit | cab76c0f6482df5140efa2ca93c9e2d972fcd9b0 (patch) | |
| tree | bc9501103fccc8d91af4a080fa48643d6726de7e /crypto/lhash/lhash_lcl.h | |
| parent | ede3e6653c1127e852493655737327170567a453 (diff) | |
lhash/lhash.c: switch to Thread-Sanitizer-friendly primitives.
Reviewed-by: Paul Dale <paul.dale@oracle.com>
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/6786)
Diffstat (limited to 'crypto/lhash/lhash_lcl.h')
| -rw-r--r-- | crypto/lhash/lhash_lcl.h | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/crypto/lhash/lhash_lcl.h b/crypto/lhash/lhash_lcl.h index 78691eb622..8f79232988 100644 --- a/crypto/lhash/lhash_lcl.h +++ b/crypto/lhash/lhash_lcl.h @@ -8,6 +8,8 @@ */ #include <openssl/crypto.h> +#include "internal/tsan_assist.h" + struct lhash_node_st { void *data; struct lhash_node_st *next; @@ -29,14 +31,14 @@ struct lhash_st { unsigned long num_expand_reallocs; unsigned long num_contracts; unsigned long num_contract_reallocs; - unsigned long num_hash_calls; - unsigned long num_comp_calls; + TSAN_QUALIFIER unsigned long num_hash_calls; + TSAN_QUALIFIER unsigned long num_comp_calls; unsigned long num_insert; unsigned long num_replace; unsigned long num_delete; unsigned long num_no_delete; - unsigned long num_retrieve; - unsigned long num_retrieve_miss; - unsigned long num_hash_comps; + TSAN_QUALIFIER unsigned long num_retrieve; + TSAN_QUALIFIER unsigned long num_retrieve_miss; + TSAN_QUALIFIER unsigned long num_hash_comps; int error; }; |