generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add optional (compile-time configurable) time to CRYPTO_mem_leaks output.

Browse Source 
This is much more helpful than the counter when doing tests with the library
interactively.
This commit is contained in:
Bodo Möller 1999-07-18 22:39:45 +00:00
parent dc347119e6
commit 3dff94c2e4
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Configure
View File

@ -97,7 +97,7 @@ my %table=(
"debug-ben-debug", "gcc:-DBN_DEBUG -DREF_CHECK -DCRYPTO_MDEBUG -g3 -O2 -pedantic -Wall -Wshadow -Werror -pipe::(unknown):::::", "debug-ben-debug", "gcc:-DBN_DEBUG -DREF_CHECK -DCRYPTO_MDEBUG -g3 -O2 -pedantic -Wall -Wshadow -Werror -pipe::(unknown):::::",
"debug-ben-strict", "gcc:-DBN_DEBUG -DREF_CHECK -DCRYPTO_MDEBUG -DCONST_STRICT -O2 -Wall -Wshadow -Werror -Wpointer-arith -Wcast-qual -Wwrite-strings -pipe::(unknown):::::", "debug-ben-strict", "gcc:-DBN_DEBUG -DREF_CHECK -DCRYPTO_MDEBUG -DCONST_STRICT -O2 -Wall -Wshadow -Werror -Wpointer-arith -Wcast-qual -Wwrite-strings -pipe::(unknown):::::",
"debug-rse","cc:-DTERMIOS -DL_ENDIAN -pipe -O -g -ggdb3 -Wall::(unknown)::BN_LLONG $x86_gcc_des $x86_gcc_opts:$x86_elf_asm", "debug-rse","cc:-DTERMIOS -DL_ENDIAN -pipe -O -g -ggdb3 -Wall::(unknown)::BN_LLONG $x86_gcc_des $x86_gcc_opts:$x86_elf_asm",
"debug-bodo", "gcc:-DBIO_PAIR_DEBUG -DL_ENDIAN -DREF_CHECK -DCRYPTO_MDEBUG -g -m486 -Wall::-D_REENTRANT::BN_LLONG $x86_gcc_des $x86_gcc_opts:$x86_elf_asm", "debug-bodo", "gcc:-DBIO_PAIR_DEBUG -DL_ENDIAN -DREF_CHECK -DCRYPTO_MDEBUG -DCRYPTO_MDEBUG_TIME -g -m486 -Wall::-D_REENTRANT::BN_LLONG $x86_gcc_des $x86_gcc_opts:$x86_elf_asm",
"dist", "cc:-O::(unknown):::::", "dist", "cc:-O::(unknown):::::",
# Basic configs that should work on any box # Basic configs that should work on any box

18
crypto/mem.c
View File

@ -58,6 +58,9 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#ifdef CRYPTO_MDEBUG_TIME
# include <time.h>
#endif
#include <openssl/buffer.h> #include <openssl/buffer.h>
#include <openssl/bio.h> #include <openssl/bio.h>
#include <openssl/lhash.h> #include <openssl/lhash.h>
@ -89,6 +92,9 @@ typedef struct mem_st
const char *file; const char *file;
int line; int line;
unsigned long order; unsigned long order;
#ifdef CRYPTO_MDEBUG_TIME
time_t time;
#endif
} MEM; } MEM;
int CRYPTO_mem_ctrl(int mode) int CRYPTO_mem_ctrl(int mode)
@ -238,6 +244,9 @@ void *CRYPTO_dbg_malloc(int num, const char *file, int line)
m->order=order; m->order=order;
} }
m->order=order++; m->order=order++;
#ifdef CRYPTO_MDEBUG_TIME
m->time=time(NULL);
#endif
if ((mm=(MEM *)lh_insert(mh,(char *)m)) != NULL) if ((mm=(MEM *)lh_insert(mh,(char *)m)) != NULL)
{ {
/* Not good, but don't sweat it */ /* Not good, but don't sweat it */
@ -322,8 +331,17 @@ static void print_leak(MEM *m, MEM_LEAK *l)
if(m->addr == (char *)l->bio) if(m->addr == (char *)l->bio)
return; return;
#ifdef CRYPTO_MDEBUG_TIME
{
struct tm *lcl = localtime(&m->time);
sprintf(buf,"[%02d:%02d:%02d] %5lu file=%s, line=%d, number=%d, address=%08lX\n",
lcl->tm_hour,lcl->tm_min,lcl->tm_sec,
m->order,m->file,m->line,m->num,(unsigned long)m->addr);
}
#else
sprintf(buf,"%5lu file=%s, line=%d, number=%d, address=%08lX\n", sprintf(buf,"%5lu file=%s, line=%d, number=%d, address=%08lX\n",
m->order,m->file,m->line,m->num,(unsigned long)m->addr); m->order,m->file,m->line,m->num,(unsigned long)m->addr);
#endif
BIO_puts(l->bio,buf); BIO_puts(l->bio,buf);
l->chunks++; l->chunks++;
l->bytes+=m->num; l->bytes+=m->num;