diff options
author | Rich Salz <rsalz@openssl.org> | 2017-10-04 21:17:58 -0400 |
---|---|---|
committer | Rich Salz <rsalz@openssl.org> | 2017-10-12 22:04:12 -0400 |
commit | 0e598a3d185e9bbfe1a513c05063970a1c532e23 (patch) | |
tree | ca2dcce92dfeaa5413c6a065e17127b76860b4b8 /crypto/mem.c | |
parent | 8abeefeccc4cfbfba9b5ebfc7604fe257a97317a (diff) |
Add CRYPTO_get_alloc_counts.
Use atomic operations for the counters
Rename malloc_lock to memdbg_lock
Also fix some style errors in mem_dbg.c
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/4359)
Diffstat (limited to 'crypto/mem.c')
-rw-r--r-- | crypto/mem.c | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/crypto/mem.c b/crypto/mem.c index c171ae486c..c77584cd5f 100644 --- a/crypto/mem.c +++ b/crypto/mem.c @@ -31,6 +31,14 @@ static void (*free_impl)(void *, const char *, int) = CRYPTO_free; #ifndef OPENSSL_NO_CRYPTO_MDEBUG +static int malloc_count; +static int realloc_count; +static int free_count; +static int dummy; + +# define INCREMENT(x) CRYPTO_atomic_add(&x, 1, &dummy, memdbg_lock) +# define GET(ret, val) CRYPTO_atomic_read(&val, ret, memdbg_lock) + static char *md_failstring; static long md_count; static int md_fail_percent = 0; @@ -45,6 +53,7 @@ static int shouldfail(void); #else static int call_malloc_debug = 0; +# define INCREMENT(x) /* empty */ # define FAILTEST() /* empty */ #endif @@ -86,6 +95,16 @@ void CRYPTO_get_mem_functions( } #ifndef OPENSSL_NO_CRYPTO_MDEBUG +void CRYPTO_get_alloc_counts(int *mcount, int *rcount, int *fcount) +{ + if (mcount != NULL) + GET(mcount, malloc_count); + if (rcount != NULL) + GET(rcount, realloc_count); + if (fcount != NULL) + GET(fcount, free_count); +} + /* * Parse a "malloc failure spec" string. This likes like a set of fields * separated by semicolons. Each field has a count and an optional failure @@ -171,6 +190,7 @@ void *CRYPTO_malloc(size_t num, const char *file, int line) { void *ret = NULL; + INCREMENT(malloc_count); if (malloc_impl != NULL && malloc_impl != CRYPTO_malloc) return malloc_impl(num, file, line); @@ -207,6 +227,7 @@ void *CRYPTO_zalloc(size_t num, const char *file, int line) void *CRYPTO_realloc(void *str, size_t num, const char *file, int line) { + INCREMENT(realloc_count); if (realloc_impl != NULL && realloc_impl != &CRYPTO_realloc) return realloc_impl(str, num, file, line); @@ -264,6 +285,7 @@ void *CRYPTO_clear_realloc(void *str, size_t old_len, size_t num, void CRYPTO_free(void *str, const char *file, int line) { + INCREMENT(free_count); if (free_impl != NULL && free_impl != &CRYPTO_free) { free_impl(str, file, line); return; |