handling xrealloc added, logging starts by default from main()

diff --git a/lib/util.c b/lib/util.c
index b1a201cf52eb5c3f152e05e76ba45942641883e9..7ec46bd5d1e8c6c39ec8b87548a3df8c5029e5fd 100644 (file)
--- a/lib/util.c
+++ b/lib/util.c
@@ -1,6 +1,6 @@
 
 /*
- * $Id: util.c,v 1.50 1998/02/27 07:29:35 kostas Exp $
+ * $Id: util.c,v 1.51 1998/02/27 09:07:25 kostas Exp $
  *
  * DEBUG: 
  * AUTHOR: Harvest Derived
@@ -515,7 +515,7 @@ xfree(void *s)
     if (s != NULL)
        free(s);
 #if MEM_GEN_TRACE
-       if (tracefp)
+       if (tracefp && s)
     fprintf(tracefp,"f:%p\n",s);
 #endif
 }
@@ -570,6 +570,10 @@ xrealloc(void *s, size_t sz)
 #endif
 #if XMALLOC_TRACE
     xmalloc_show_trace(p, 1);
+#endif
+#if MEM_GEN_TRACE
+       if (tracefp) /* new ptr, old ptr, new size */
+               fprintf(tracefp, "r:%p:%p:%d\n",p,s,sz);
 #endif
     return (p);
 }

diff --git a/src/main.cc b/src/main.cc
index 521b4699a12c5bc6a27a8e273a004db4d5f4d305..2243acb55ce24a125040572af36d3e0ac3249f47 100644 (file)
--- a/src/main.cc
+++ b/src/main.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: main.cc,v 1.229 1998/02/27 07:24:56 kostas Exp $
+ * $Id: main.cc,v 1.230 1998/02/27 09:07:24 kostas Exp $
  *
  * DEBUG: section 1     Startup and Main Loop
  * AUTHOR: Harvest Derived
@@ -429,7 +429,9 @@ mainInitialize(void)
 
     _db_init(Config.Log.log, Config.debugOptions);
     fd_open(fileno(debug_log), FD_LOG, Config.Log.log);
-
+#if MEM_GEN_TRACE
+    log_trace_init("/tmp/squid.alloc");
+#endif
     debug(1, 0) ("Starting Squid Cache version %s for %s...\n",
        version_string,
        CONFIG_HOST_TYPE);