projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Support assembler for Mingw32.
[oweals/openssl.git]
/
crypto
/
mem_dbg.c
diff --git
a/crypto/mem_dbg.c
b/crypto/mem_dbg.c
index b80fcea44f2e88a810cb0b8ce7ec9a959d81d7c8..14770c073377df6bc107b5ac89c197d38c89d286 100644
(file)
--- a/
crypto/mem_dbg.c
+++ b/
crypto/mem_dbg.c
@@
-88,9
+88,9
@@
typedef struct app_mem_info_st
/* For application-defined information (static C-string `info')
* to be displayed in memory leak list.
* Each thread has its own stack. For applications, there is
/* For application-defined information (static C-string `info')
* to be displayed in memory leak list.
* Each thread has its own stack. For applications, there is
- * CRYPTO_
add
_info("...") to push an entry,
- * CRYPTO_
remove_info()
to pop an entry,
- * CRYPTO_remove_all_info() to pop all entries.
+ * CRYPTO_
push
_info("...") to push an entry,
+ * CRYPTO_
pop_info()
to pop an entry,
+ * CRYPTO_remove_all_info()
to pop all entries.
*/
{
unsigned long thread;
*/
{
unsigned long thread;
@@
-214,7
+214,7
@@
void CRYPTO_dbg_set_options(long bits)
options = bits;
}
options = bits;
}
-long CRYPTO_dbg_get_options()
+long CRYPTO_dbg_get_options(
void
)
{
return options;
}
{
return options;
}
@@
-249,7
+249,7
@@
static unsigned long app_info_hash(APP_INFO *a)
return(ret);
}
return(ret);
}
-static APP_INFO *
remove
_info()
+static APP_INFO *
pop
_info()
{
APP_INFO tmp;
APP_INFO *ret = NULL;
{
APP_INFO tmp;
APP_INFO *ret = NULL;
@@
-257,7
+257,7
@@
static APP_INFO *remove_info()
if (amih != NULL)
{
tmp.thread=CRYPTO_thread_id();
if (amih != NULL)
{
tmp.thread=CRYPTO_thread_id();
- if ((ret=(APP_INFO *)lh_delete(amih,
(char *)
&tmp)) != NULL)
+ if ((ret=(APP_INFO *)lh_delete(amih,&tmp)) != NULL)
{
APP_INFO *next=ret->next;
{
APP_INFO *next=ret->next;
@@
-269,7
+269,7
@@
static APP_INFO *remove_info()
#ifdef LEVITTE_DEBUG
if (ret->thread != tmp.thread)
{
#ifdef LEVITTE_DEBUG
if (ret->thread != tmp.thread)
{
- fprintf(stderr, "
remove
_info(): deleted info has other thread ID (%lu) than the current thread (%lu)!!!!\n",
+ fprintf(stderr, "
pop
_info(): deleted info has other thread ID (%lu) than the current thread (%lu)!!!!\n",
ret->thread, tmp.thread);
abort();
}
ret->thread, tmp.thread);
abort();
}
@@
-286,7
+286,7
@@
static APP_INFO *remove_info()
return(ret);
}
return(ret);
}
-int CRYPTO_
add
_info_(const char *info, const char *file, int line)
+int CRYPTO_
push
_info_(const char *info, const char *file, int line)
{
APP_INFO *ami, *amim;
int ret=0;
{
APP_INFO *ami, *amim;
int ret=0;
@@
-322,7
+322,7
@@
int CRYPTO_add_info_(const char *info, const char *file, int line)
#ifdef LEVITTE_DEBUG
if (ami->thread != amim->thread)
{
#ifdef LEVITTE_DEBUG
if (ami->thread != amim->thread)
{
- fprintf(stderr, "CRYPTO_
add
_info(): previous info has other thread ID (%lu) than the current thread (%lu)!!!!\n",
+ fprintf(stderr, "CRYPTO_
push
_info(): previous info has other thread ID (%lu) than the current thread (%lu)!!!!\n",
amim->thread, ami->thread);
abort();
}
amim->thread, ami->thread);
abort();
}
@@
-336,7
+336,7
@@
int CRYPTO_add_info_(const char *info, const char *file, int line)
return(ret);
}
return(ret);
}
-int CRYPTO_
remove
_info(void)
+int CRYPTO_
pop
_info(void)
{
int ret=0;
{
int ret=0;
@@
-344,7
+344,7
@@
int CRYPTO_remove_info(void)
{
MemCheck_off(); /* obtains CRYPTO_LOCK_MALLOC2 */
{
MemCheck_off(); /* obtains CRYPTO_LOCK_MALLOC2 */
- ret=(
remove
_info() != NULL);
+ ret=(
pop
_info() != NULL);
MemCheck_on(); /* releases CRYPTO_LOCK_MALLOC2 */
}
MemCheck_on(); /* releases CRYPTO_LOCK_MALLOC2 */
}
@@
-359,7
+359,7
@@
int CRYPTO_remove_all_info(void)
{
MemCheck_off(); /* obtains CRYPTO_LOCK_MALLOC2 */
{
MemCheck_off(); /* obtains CRYPTO_LOCK_MALLOC2 */
- while(
remove
_info() != NULL)
+ while(
pop
_info() != NULL)
ret++;
MemCheck_on(); /* releases CRYPTO_LOCK_MALLOC2 */
ret++;
MemCheck_on(); /* releases CRYPTO_LOCK_MALLOC2 */
@@
-592,9
+592,11
@@
static void print_leak(MEM *m, MEM_LEAK *l)
amip=m->app_info;
ami_cnt=0;
amip=m->app_info;
ami_cnt=0;
- if (amip)
- ti=amip->thread;
- while(amip && amip->thread == ti)
+ if (!amip)
+ return;
+ ti=amip->thread;
+
+ do
{
int buf_len;
int info_len;
{
int buf_len;
int info_len;
@@
-622,10
+624,12
@@
static void print_leak(MEM *m, MEM_LEAK *l)
amip = amip->next;
}
amip = amip->next;
}
+ while(amip && amip->thread == ti);
+
#ifdef LEVITTE_DEBUG
if (amip)
{
#ifdef LEVITTE_DEBUG
if (amip)
{
- fprintf(stderr, "Thread switch detected i backtrace!!!!\n");
+ fprintf(stderr, "Thread switch detected i
n
backtrace!!!!\n");
abort();
}
#endif
abort();
}
#endif
@@
-657,21
+661,29
@@
void CRYPTO_mem_leaks(BIO *b)
#endif
}
#endif
}
-static void (*mem_cb)()=NULL;
+union void_fn_to_char_u
+ {
+ char *char_p;
+ void (*fn_p)();
+ };
static void cb_leak(MEM *m, char *cb)
{
static void cb_leak(MEM *m, char *cb)
{
- void (*mem_callback)()=(void (*)())cb;
- mem_callback(m->order,m->file,m->line,m->num,m->addr);
+ union void_fn_to_char_u mem_callback;
+
+ mem_callback.char_p=cb;
+ mem_callback.fn_p(m->order,m->file,m->line,m->num,m->addr);
}
void CRYPTO_mem_leaks_cb(void (*cb)())
{
}
void CRYPTO_mem_leaks_cb(void (*cb)())
{
+ union void_fn_to_char_u mem_cb;
+
if (mh == NULL) return;
CRYPTO_w_lock(CRYPTO_LOCK_MALLOC2);
if (mh == NULL) return;
CRYPTO_w_lock(CRYPTO_LOCK_MALLOC2);
- mem_cb=cb;
- lh_doall_arg(mh,(void (*)())cb_leak,
(char *)mem_cb
);
- mem_cb=NULL;
+ mem_cb
.fn_p
=cb;
+ lh_doall_arg(mh,(void (*)())cb_leak,
mem_cb.char_p
);
+ mem_cb
.char_p
=NULL;
CRYPTO_w_unlock(CRYPTO_LOCK_MALLOC2);
}
CRYPTO_w_unlock(CRYPTO_LOCK_MALLOC2);
}