added event list to cachemgr outputs

diff --git a/src/event.cc b/src/event.cc
index 979c83987e731a12584252c47168697f2c1e2bab..1bb98b0d551cba183770877060cb58156bb77d2e 100644 (file)
--- a/src/event.cc
+++ b/src/event.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: event.cc,v 1.9 1997/11/05 05:29:23 wessels Exp $
+ * $Id: event.cc,v 1.10 1998/03/23 22:37:10 wessels Exp $
  *
  * DEBUG: section 41    Event Processing
  * AUTHOR: Henrik Nordstrom
@@ -41,6 +41,7 @@ struct ev_entry {
 };
 
 static struct ev_entry *tasks = NULL;
+static OBJH eventDump;
 
 void
 eventAdd(const char *name, EVH * func, void *arg, time_t when)
@@ -105,3 +106,25 @@ eventNextTime(void)
        return (time_t) 10;
     return tasks->when - squid_curtime;
 }
+
+void
+eventInit(void)
+{
+    cachemgrRegister("events",
+       "Event Queue",
+       eventDump, 0);
+}
+
+static void
+eventDump(StoreEntry * sentry)
+{
+    struct ev_entry *e = tasks;
+    storeAppendPrintf(sentry, "%s\t%s\n",
+       "Operation",
+       "Next Execution");
+    while (e != NULL) {
+       storeAppendPrintf(sentry, "%s\t%d seconds\n",
+           e->name, e->when - squid_curtime);
+       e = e->next;
+    }
+}

diff --git a/src/main.cc b/src/main.cc
index 2d92e090d80a71ce4843f4ff96e7d04f86b8d1a0..7f1dfee48044f260ddce55c56cc3b94a57793985 100644 (file)
--- a/src/main.cc
+++ b/src/main.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: main.cc,v 1.237 1998/03/17 05:12:36 wessels Exp $
+ * $Id: main.cc,v 1.238 1998/03/23 22:37:11 wessels Exp $
  *
  * DEBUG: section 1     Startup and Main Loop
  * AUTHOR: Harvest Derived
@@ -480,6 +480,7 @@ mainInitialize(void)
        do_mallinfo = 1;
        mimeInit(Config.mimeTablePathname);
        pconnInit();
+       eventInit();
     }
     serverConnectionsOpen();
     if (theOutIcpConnection >= 0 && (!Config2.Accel.on || Config.onoff.accel_with_proxy))

diff --git a/src/protos.h b/src/protos.h
index 0c7b9d4b2f7d4a9f5718dc227106f97722affaef..beece5e6d811e810dc64aaf57633dc7183729f9c 100644 (file)
--- a/src/protos.h
+++ b/src/protos.h
@@ -158,6 +158,7 @@ extern void eventAdd(const char *name, EVH * func, void *arg, time_t when);
 extern void eventRun(void);
 extern time_t eventNextTime(void);
 extern void eventDelete(EVH * func, void *arg);
+extern void eventInit(void);
 
 extern void fd_close(int fd);
 extern void fd_open(int fd, unsigned int type, const char *);