Typo...

[openssl.git] / crypto / mem_dbg.c

diff --git a/crypto/mem_dbg.c b/crypto/mem_dbg.c
index 4bddbe07b2a9a03a080bc5fa22f2a16c610ae0d1..6068dcc806296531eeba073de55a717d3c939823 100644 (file)
--- a/crypto/mem_dbg.c
+++ b/crypto/mem_dbg.c
@@ -65,7 +65,12 @@
 #include <openssl/lhash.h>
 #include "cryptlib.h"
 
 #include <openssl/lhash.h>
 #include "cryptlib.h"
 

-/* State CRYPTO_MEM_CHECK_ON exists only temporarily when the library
+static int mh_mode=CRYPTO_MEM_CHECK_OFF;
+/* The state changes to CRYPTO_MEM_CHECK_ON | CRYPTO_MEM_CHECK_ENABLE
+ * when the application asks for it (usually after library initialisation
+ * for which no book-keeping is desired).
+ *
+ * State CRYPTO_MEM_CHECK_ON exists only temporarily when the library

  * thinks that certain allocations should not be checked (e.g. the data
  * structures used for memory checking).  It is not suitable as an initial
  * state: the library will unexpectedly enable memory checking when it
  * thinks that certain allocations should not be checked (e.g. the data
  * structures used for memory checking).  It is not suitable as an initial
  * state: the library will unexpectedly enable memory checking when it


@@ -74,27 +79,34 @@
  *
  * State CRYPTO_MEM_CHECK_ENABLE without ..._ON makes no sense whatsoever.
  */
  *
  * State CRYPTO_MEM_CHECK_ENABLE without ..._ON makes no sense whatsoever.
  */

-static int mh_mode=CRYPTO_MEM_CHECK_OFF;
-static unsigned long disabling_thread = 0;
-

 
 

-static unsigned long order=0;
+static unsigned long order = 0; /* number of memory requests */
+static LHASH *mh=NULL; /* hash-table of memory requests (address as key) */

 
 

-static LHASH *amih=NULL;

 
 typedef struct app_mem_info_st
 
 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
+ *   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;
        const char *file;
        int line;
        const char *info;
        {       
        unsigned long thread;
        const char *file;
        int line;
        const char *info;

-       struct app_mem_info_st *next;
+       struct app_mem_info_st *next; /* tail of thread's stack */

        int references;
        } APP_INFO;
 
        int references;
        } APP_INFO;
 

-static LHASH *mh=NULL;
+static LHASH *amih=NULL; /* hash-table with those app_mem_info_st's
+                          * that are at the top of their thread's stack
+                          * (with `thread' as key) */

 
 typedef struct mem_st
 
 typedef struct mem_st

+/* memory-block description */

        {
        char *addr;
        int num;
        {
        char *addr;
        int num;


@@ -106,30 +118,17 @@ typedef struct mem_st
        APP_INFO *app_info;
        } MEM;
 
        APP_INFO *app_info;
        } MEM;
 

-
-#ifdef CRYPTO_MDEBUG_ALL
-# ifndef CRYPTO_MDEBUG_TIME
-#  define CRYPTO_MDEBUG_TIME
-# endif
-# ifndef CRYPTO_MDEBUG_THREAD
-#  define CRYPTO_MDEBUG_THREAD
-# endif
-#endif
-
-/* Get defaults that will depend on some macros defined elsewhere */
-#ifdef CRYPTO_MDEBUG_TIME
-#define DEF_V_CRYPTO_MDEBUG_TIME V_CRYPTO_MDEBUG_TIME
-#else
-#define DEF_V_CRYPTO_MDEBUG_TIME 0
+static long options =             /* extra information to be recorded */
+#if defined(CRYPTO_MDEBUG_TIME) || defined(CRYPTO_MDEBUG_ALL)
+       V_CRYPTO_MDEBUG_TIME |

 #endif
 #endif

-#ifdef CRYPTO_MDEBUG_THREAD
-#define DEF_V_CRYPTO_MDEBUG_THREAD V_CRYPTO_MDEBUG_THREAD
-#else
-#define DEF_V_CRYPTO_MDEBUG_THREAD 0
+#if defined(CRYPTO_MDEBUG_THREAD) || defined(CRYPTO_MDEBUG_ALL)
+       V_CRYPTO_MDEBUG_THREAD |

 #endif
 #endif

+       0;

 
 

-static int options = DEF_V_CRYPTO_MDEBUG_TIME | DEF_V_CRYPTO_MDEBUG_THREAD;

 
 

+static unsigned long disabling_thread = 0;

 
 int CRYPTO_mem_ctrl(int mode)
        {
 
 int CRYPTO_mem_ctrl(int mode)
        {


@@ -157,8 +156,8 @@ int CRYPTO_mem_ctrl(int mode)
                                {
                                /* Long-time lock CRYPTO_LOCK_MALLOC2 must not be claimed while
                                 * we're holding CRYPTO_LOCK_MALLOC, or we'll deadlock if
                                {
                                /* Long-time lock CRYPTO_LOCK_MALLOC2 must not be claimed while
                                 * we're holding CRYPTO_LOCK_MALLOC, or we'll deadlock if

-                                * somebody else holds CRYPTO_LOCK_MALLOC2 (and cannot release it
-                                * because we block entry to this function).
+                                * somebody else holds CRYPTO_LOCK_MALLOC2 (and cannot release
+                                * it because we block entry to this function).

                                 * Give them a chance, first, and then claim the locks in
                                 * appropriate order (long-time lock first).
                                 */
                                 * Give them a chance, first, and then claim the locks in
                                 * appropriate order (long-time lock first).
                                 */


@@ -193,7 +192,7 @@ int CRYPTO_mem_ctrl(int mode)
        return(ret);
        }
 
        return(ret);
        }
 

-int CRYPTO_mem_check_on(void)
+int CRYPTO_is_mem_check_on(void)

        {
        int ret = 0;
 
        {
        int ret = 0;
 


@@ -210,12 +209,12 @@ int CRYPTO_mem_check_on(void)
        }       
 
 
        }       
 
 

-void CRYPTO_dbg_set_options(int bits)
+void CRYPTO_dbg_set_options(long bits)

        {
        options = bits;
        }
 
        {
        options = bits;
        }
 

-int CRYPTO_dbg_get_options()
+long CRYPTO_dbg_get_options()

        {
        return options;
        }
        {
        return options;
        }


@@ -237,7 +236,7 @@ static unsigned long mem_hash(MEM *a)
 
 static int app_info_cmp(APP_INFO *a, APP_INFO *b)
        {
 
 static int app_info_cmp(APP_INFO *a, APP_INFO *b)
        {

-       return(a->thread - b->thread);
+       return(a->thread != b->thread);

        }
 
 static unsigned long app_info_hash(APP_INFO *a)
        }
 
 static unsigned long app_info_hash(APP_INFO *a)


@@ -250,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;


@@ -270,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();
                                }


@@ -287,14 +286,14 @@ static APP_INFO *remove_info()
        return(ret);
        }
 
        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())
                {
        {
        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)
                        {
 
                if ((ami = (APP_INFO *)Malloc(sizeof(APP_INFO))) == NULL)
                        {


@@ -323,7 +322,7 @@ int CRYPTO_add_info(const char *file, int line, const char *info)
 #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();
                                }


@@ -331,23 +330,23 @@ int CRYPTO_add_info(const char *file, int line, const char *info)
                        ami->next=amim;
                        }
  err:
                        ami->next=amim;
                        }
  err:

-               MemCheck_on();
+               MemCheck_on(); /* releases CRYPTO_LOCK_MALLOC2 */

                }
 
        return(ret);
        }
 
                }
 
        return(ret);
        }
 

-int CRYPTO_remove_info(void)
+int CRYPTO_pop_info(void)

        {
        int ret=0;
 
        {
        int ret=0;
 

-       if (is_MemCheck_on())
+       if (is_MemCheck_on()) /* _must_ be true, or something went severely wrong */

                {
                {

-               MemCheck_off();
+               MemCheck_off(); /* obtains CRYPTO_LOCK_MALLOC2 */

 
 

-               ret=(remove_info() != NULL);
+               ret=(pop_info() != NULL);

 
 

-               MemCheck_on();
+               MemCheck_on(); /* releases CRYPTO_LOCK_MALLOC2 */

                }
        return(ret);
        }
                }
        return(ret);
        }


@@ -356,14 +355,14 @@ int CRYPTO_remove_all_info(void)
        {
        int ret=0;
 
        {
        int ret=0;
 

-       if (is_MemCheck_on())
+       if (is_MemCheck_on()) /* _must_ be true */

                {
                {

-               MemCheck_off();
+               MemCheck_off(); /* obtains CRYPTO_LOCK_MALLOC2 */

 
 

-               while(remove_info() != NULL)
+               while(pop_info() != NULL)

                        ret++;
 
                        ret++;
 

-               MemCheck_on();
+               MemCheck_on(); /* releases CRYPTO_LOCK_MALLOC2 */

                }
        return(ret);
        }
                }
        return(ret);
        }


@@ -386,11 +385,11 @@ void CRYPTO_dbg_malloc(void *addr, int num, const char *file, int line,
 
                if (is_MemCheck_on())
                        {
 
                if (is_MemCheck_on())
                        {

-                       MemCheck_off();
+                       MemCheck_off(); /* obtains CRYPTO_LOCK_MALLOC2 */

                        if ((m=(MEM *)Malloc(sizeof(MEM))) == NULL)
                                {
                                Free(addr);
                        if ((m=(MEM *)Malloc(sizeof(MEM))) == NULL)
                                {
                                Free(addr);

-                               MemCheck_on();
+                               MemCheck_on(); /* releases CRYPTO_LOCK_MALLOC2 */

                                return;
                                }
                        if (mh == NULL)
                                return;
                                }
                        if (mh == NULL)


@@ -449,7 +448,7 @@ void CRYPTO_dbg_malloc(void *addr, int num, const char *file, int line,
                                Free(mm);
                                }
                err:
                                Free(mm);
                                }
                err:

-                       MemCheck_on();
+                       MemCheck_on(); /* releases CRYPTO_LOCK_MALLOC2 */

                        }
                break;
                }
                        }
                break;
                }


@@ -485,7 +484,7 @@ void CRYPTO_dbg_free(void *addr, int before_p)
                                Free(mp);
                                }
 
                                Free(mp);
                                }
 

-                       MemCheck_on();
+                       MemCheck_on(); /* releases CRYPTO_LOCK_MALLOC2 */

                        }
                break;
        case 1:
                        }
                break;
        case 1:


@@ -519,7 +518,7 @@ void CRYPTO_dbg_realloc(void *addr1, void *addr2, int num,
 
                if (is_MemCheck_on())
                        {
 
                if (is_MemCheck_on())
                        {

-                       MemCheck_off();
+                       MemCheck_off(); /* obtains CRYPTO_LOCK_MALLOC2 */

 
                        m.addr=addr1;
                        mp=(MEM *)lh_delete(mh,(char *)&m);
 
                        m.addr=addr1;
                        mp=(MEM *)lh_delete(mh,(char *)&m);


@@ -536,7 +535,7 @@ void CRYPTO_dbg_realloc(void *addr1, void *addr2, int num,
                                lh_insert(mh,(char *)mp);
                                }
 
                                lh_insert(mh,(char *)mp);
                                }
 

-                       MemCheck_on();
+                       MemCheck_on(); /* releases CRYPTO_LOCK_MALLOC2 */

                        }
                break;
                }
                        }
                break;
                }


@@ -593,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;


@@ -603,7 +604,7 @@ static void print_leak(MEM *m, MEM_LEAK *l)
                ami_cnt++;
                memset(buf,'>',ami_cnt);
                sprintf(buf + ami_cnt,
                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->thread, amip->file, amip->line);
                buf_len=strlen(buf);
                info_len=strlen(amip->info);


@@ -623,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 in backtrace!!!!\n");

                abort();
                }
 #endif
                abort();
                }
 #endif