memory leaks

diff --git a/src/asn.cc b/src/asn.cc
index ff8273eec1445dba32b3f69a8a5edf05670bfa1f..7dd5bf0973deb2a53f248d8b4be49eb4528ae45a 100644 (file)
--- a/src/asn.cc
+++ b/src/asn.cc
@@ -1,5 +1,5 @@
 /*
- * $Id: asn.cc,v 1.49 1998/09/21 06:49:39 wessels Exp $
+ * $Id: asn.cc,v 1.50 1998/10/21 06:54:18 wessels Exp $
  *
  * DEBUG: section 53    AS Number handling
  * AUTHOR: Duane Wessels, Kostas Anagnostakis
@@ -148,8 +148,10 @@ void
 asnInit(void)
 {
     extern int max_keylen;
+    static int inited = 0;
     max_keylen = 40;
-    rn_init();
+    if (0 == inited++)
+        rn_init();
     rn_inithead((void **) &AS_tree_head, 8);
     asnAclInitialize(Config.aclList);
     cachemgrRegister("asndb", "AS Number Database", asnStats, 0, 1);

diff --git a/src/event.cc b/src/event.cc
index b199dc7ce891101054ce66c8b9e8f68c7c1b156e..a8c2899f077c000b57ce4e6aa1196cba39f168d1 100644 (file)
--- a/src/event.cc
+++ b/src/event.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: event.cc,v 1.22 1998/07/22 20:37:17 wessels Exp $
+ * $Id: event.cc,v 1.23 1998/10/21 06:54:21 wessels Exp $
  *
  * DEBUG: section 41    Event Processing
  * AUTHOR: Henrik Nordstrom
@@ -174,3 +174,15 @@ eventDump(StoreEntry * sentry)
        e = e->next;
     }
 }
+
+void
+eventFreeMemory(void)
+{
+    struct ev_entry *event;
+    while ((event = tasks)) {
+       if (NULL != event->arg)
+           cbdataUnlock(event->arg);
+       xfree(event);
+    }
+    tasks = NULL;
+}

diff --git a/src/main.cc b/src/main.cc
index e6fbe95cacfe1e6e81b0522db19b98e658c6304e..3452e85ad1bb09341eee610c02d4ca016e21c844 100644 (file)
--- a/src/main.cc
+++ b/src/main.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: main.cc,v 1.273 1998/10/10 14:57:41 wessels Exp $
+ * $Id: main.cc,v 1.274 1998/10/21 06:54:19 wessels Exp $
  *
  * DEBUG: section 1     Startup and Main Loop
  * AUTHOR: Harvest Derived
@@ -723,6 +723,7 @@ SquidShutdown(void *unused)
     clientdbFreeMemory();
     httpHeaderCleanModule();
     statFreeMemory();
+    eventFreeMemory();
 #endif
     memClean();
 #if !XMALLOC_TRACE

diff --git a/src/protos.h b/src/protos.h
index 1265d1cabae1f622d3188b15d0af5228787d643c..8ab9fe0801816a92e3aff130403e431de7d26969 100644 (file)
--- a/src/protos.h
+++ b/src/protos.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: protos.h,v 1.281 1998/10/17 04:34:11 rousskov Exp $
+ * $Id: protos.h,v 1.282 1998/10/21 06:54:20 wessels Exp $
  *
  *
  * SQUID Internet Object Cache  http://squid.nlanr.net/Squid/
@@ -107,7 +107,7 @@ extern int cbdataValid(const void *p);
 extern void cbdataDump(StoreEntry *);
 
 extern void clientdbInit(void);
-extern void clientdbUpdate(struct in_addr, log_type, protocol_t, size_t);
+extern void clientdbUpdate(struct in_addr, log_type, protocol_t, size_t, request_flags);
 extern int clientdbCutoffDenied(struct in_addr);
 extern void clientdbDump(StoreEntry *);
 extern void clientdbFreeMemory(void);
@@ -213,6 +213,7 @@ extern void eventRun(void);
 extern time_t eventNextTime(void);
 extern void eventDelete(EVH * func, void *arg);
 extern void eventInit(void);
+extern void eventFreeMemory(void);
 
 extern void fd_close(int fd);
 extern void fd_open(int fd, unsigned int type, const char *);