summaryrefslogtreecommitdiffstats
path: root/crypto/mem_dbg.c
diff options
context:
space:
mode:
Diffstat (limited to 'crypto/mem_dbg.c')
-rw-r--r--crypto/mem_dbg.c46
1 files changed, 1 insertions, 45 deletions
diff --git a/crypto/mem_dbg.c b/crypto/mem_dbg.c
index 9a48410bea..292bf2aef7 100644
--- a/crypto/mem_dbg.c
+++ b/crypto/mem_dbg.c
@@ -373,15 +373,6 @@ static APP_INFO *pop_info(void)
next->references++;
(void)lh_APP_INFO_insert(amih, next);
}
-#ifdef LEVITTE_DEBUG_MEM
- if (CRYPTO_THREADID_cmp(&ret->threadid, &tmp.threadid)) {
- fprintf(stderr,
- "pop_info(): deleted info has other thread ID (%lu) than the current thread (%lu)!!!!\n",
- CRYPTO_THREADID_hash(&ret->threadid),
- CRYPTO_THREADID_hash(&tmp.threadid));
- abort();
- }
-#endif
if (--(ret->references) <= 0) {
ret->next = NULL;
if (next != NULL)
@@ -420,18 +411,8 @@ int CRYPTO_push_info_(const char *info, const char *file, int line)
ami->references = 1;
ami->next = NULL;
- if ((amim = lh_APP_INFO_insert(amih, ami)) != NULL) {
-#ifdef LEVITTE_DEBUG_MEM
- if (CRYPTO_THREADID_cmp(&ami->threadid, &amim->threadid)) {
- fprintf(stderr,
- "CRYPTO_push_info(): previous info has other thread ID (%lu) than the current thread (%lu)!!!!\n",
- CRYPTO_THREADID_hash(&amim->threadid),
- CRYPTO_THREADID_hash(&ami->threadid));
- abort();
- }
-#endif
+ if ((amim = lh_APP_INFO_insert(amih, ami)) != NULL)
ami->next = amim;
- }
err:
MemCheck_on(); /* release MALLOC2 lock */
}
@@ -514,10 +495,6 @@ void CRYPTO_dbg_malloc(void *addr, int num, const char *file, int line,
m->order = order;
}
m->order = order++;
-#ifdef LEVITTE_DEBUG_MEM
- fprintf(stderr, "LEVITTE_DEBUG_MEM: [%5ld] %c 0x%p (%d)\n",
- m->order, (before_p & 128) ? '*' : '+', m->addr, m->num);
-#endif
if (options & V_CRYPTO_MDEBUG_TIME)
m->time = time(NULL);
else
@@ -565,10 +542,6 @@ void CRYPTO_dbg_free(void *addr, int before_p)
m.addr = addr;
mp = lh_MEM_delete(mh, &m);
if (mp != NULL) {
-#ifdef LEVITTE_DEBUG_MEM
- fprintf(stderr, "LEVITTE_DEBUG_MEM: [%5ld] - 0x%p (%d)\n",
- mp->order, mp->addr, mp->num);
-#endif
app_info_free(mp->app_info);
OPENSSL_free(mp);
}
@@ -587,12 +560,6 @@ void CRYPTO_dbg_realloc(void *addr1, void *addr2, int num,
{
MEM m, *mp;
-#ifdef LEVITTE_DEBUG_MEM
- fprintf(stderr,
- "LEVITTE_DEBUG_MEM: --> CRYPTO_dbg_malloc(addr1 = %p, addr2 = %p, num = %d, file = \"%s\", line = %d, before_p = %d)\n",
- addr1, addr2, num, file, line, before_p);
-#endif
-
switch (before_p) {
case 0:
break;
@@ -611,11 +578,6 @@ void CRYPTO_dbg_realloc(void *addr1, void *addr2, int num,
m.addr = addr1;
mp = lh_MEM_delete(mh, &m);
if (mp != NULL) {
-#ifdef LEVITTE_DEBUG_MEM
- fprintf(stderr,
- "LEVITTE_DEBUG_MEM: [%5ld] * 0x%p (%d) -> 0x%p (%d)\n",
- mp->order, mp->addr, mp->num, addr2, num);
-#endif
mp->addr = addr2;
mp->num = num;
#if defined(CRYPTO_MDEBUG_BACKTRACE) && defined(__GNUC__)
@@ -716,12 +678,6 @@ static void print_leak_doall_arg(const MEM *m, MEM_LEAK *l)
while (amip && !CRYPTO_THREADID_cmp(&amip->threadid, &ti));
}
-#ifdef LEVITTE_DEBUG_MEM
- if (amip) {
- fprintf(stderr, "Thread switch detected in backtrace!!!!\n");
- abort();
- }
-#endif
#if defined(CRYPTO_MDEBUG_BACKTRACE) && defined(__GNUC__)
{
size_t i;