/* 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;
return(ret);
}
-static APP_INFO *remove_info()
+static APP_INFO *pop_info()
{
APP_INFO tmp;
APP_INFO *ret = NULL;
#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();
}
return(ret);
}
-int CRYPTO_add_info_(const char *file, int line, const char *info)
+int CRYPTO_push_info_(const char *info, const char *file, int line)
{
APP_INFO *ami, *amim;
int ret=0;
if (is_MemCheck_on())
{
- MemCheck_off();
+ MemCheck_off(); /* obtains CRYPTO_LOCK_MALLOC2 */
if ((ami = (APP_INFO *)Malloc(sizeof(APP_INFO))) == NULL)
{
#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();
}
ami->next=amim;
}
err:
- MemCheck_on();
+ MemCheck_on(); /* releases CRYPTO_LOCK_MALLOC2 */
}
return(ret);
}
-int CRYPTO_remove_info(void)
+int CRYPTO_pop_info(void)
{
int ret=0;
- if (is_MemCheck_on()) /* _must_ be true, or something went severly wrong */
+ if (is_MemCheck_on()) /* _must_ be true, or something went severely wrong */
{
- MemCheck_off();
- CRYPTO_w_lock(CRYPTO_LOCK_MALLOC);
+ MemCheck_off(); /* obtains CRYPTO_LOCK_MALLOC2 */
- ret=(remove_info() != NULL);
+ ret=(pop_info() != NULL);
- CRYPTO_w_unlock(CRYPTO_LOCK_MALLOC);
- MemCheck_on();
+ MemCheck_on(); /* releases CRYPTO_LOCK_MALLOC2 */
}
return(ret);
}
if (is_MemCheck_on()) /* _must_ be true */
{
- MemCheck_off();
- CRYPTO_w_lock(CRYPTO_LOCK_MALLOC);
+ MemCheck_off(); /* obtains CRYPTO_LOCK_MALLOC2 */
- while(remove_info() != NULL)
+ while(pop_info() != NULL)
ret++;
- CRYPTO_w_unlock(CRYPTO_LOCK_MALLOC);
- MemCheck_on();
+ MemCheck_on(); /* releases CRYPTO_LOCK_MALLOC2 */
}
return(ret);
}
if (is_MemCheck_on())
{
- MemCheck_off();
+ MemCheck_off(); /* obtains CRYPTO_LOCK_MALLOC2 */
if ((m=(MEM *)Malloc(sizeof(MEM))) == NULL)
{
Free(addr);
- MemCheck_on();
+ MemCheck_on(); /* releases CRYPTO_LOCK_MALLOC2 */
return;
}
- CRYPTO_w_lock(CRYPTO_LOCK_MALLOC);
if (mh == NULL)
{
if ((mh=lh_new(mem_hash,mem_cmp)) == NULL)
Free(mm);
}
err:
- CRYPTO_w_unlock(CRYPTO_LOCK_MALLOC);
- MemCheck_on();
+ MemCheck_on(); /* releases CRYPTO_LOCK_MALLOC2 */
}
break;
}
Free(mp);
}
- MemCheck_on();
+ MemCheck_on(); /* releases CRYPTO_LOCK_MALLOC2 */
}
break;
case 1:
if (is_MemCheck_on())
{
- MemCheck_off();
- CRYPTO_w_lock(CRYPTO_LOCK_MALLOC);
+ MemCheck_off(); /* obtains CRYPTO_LOCK_MALLOC2 */
m.addr=addr1;
mp=(MEM *)lh_delete(mh,(char *)&m);
lh_insert(mh,(char *)mp);
}
- CRYPTO_w_unlock(CRYPTO_LOCK_MALLOC);
- MemCheck_on();
+ MemCheck_on(); /* releases CRYPTO_LOCK_MALLOC2 */
}
break;
}
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;
ami_cnt++;
memset(buf,'>',ami_cnt);
sprintf(buf + ami_cnt,
- "thread=%lu, file=%s, line=%d, info=\"",
+ " thread=%lu, file=%s, line=%d, info=\"",
amip->thread, amip->file, amip->line);
buf_len=strlen(buf);
info_len=strlen(amip->info);
amip = amip->next;
}
+ while(amip && amip->thread == ti);
+
#ifdef LEVITTE_DEBUG
if (amip)
{