remove some of that HTTPCacheInfo->crap

diff --git a/src/comm.cc b/src/comm.cc
index 35276acc561ed238f6106cc1d925a47ab7aaa291..61b335503864a6dae151f74474a212e3c00e613c 100644 (file)
--- a/src/comm.cc
+++ b/src/comm.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: comm.cc,v 1.168 1997/06/20 00:00:11 wessels Exp $
+ * $Id: comm.cc,v 1.169 1997/06/20 05:08:30 wessels Exp $
  *
  * DEBUG: section 5     Socket Functions
  * AUTHOR: Harvest Derived
@@ -444,8 +444,8 @@ commSetTimeout(int fd, int timeout, PF * handler, void *data)
 {
     FD_ENTRY *fde;
     debug(5, 3) ("commSetTimeout: FD %d timeout %d\n", fd, timeout);
-    if (fd < 0 || fd > Squid_MaxFD)
-       fatal_dump("commSetTimeout: bad FD");
+    assert(fd >= 0);
+    assert(fd < Squid_MaxFD);
     fde = &fd_table[fd];
     if (timeout < 0) {
        fde->timeout_handler = NULL;
@@ -457,11 +457,10 @@ commSetTimeout(int fd, int timeout, PF * handler, void *data)
        if (fde->timeout > 0 && (int) (fde->timeout - squid_curtime) < timeout)
            return fde->timeout;
     }
+    assert(handler || fde->timeout_handler);
     if (handler || data) {
        fde->timeout_handler = handler;
        fde->timeout_data = data;
-    } else if (fde->timeout_handler == NULL) {
-       debug_trap("commSetTimeout: setting timeout, but no handler");
     }
     return fde->timeout = squid_curtime + (time_t) timeout;
 }
@@ -580,15 +579,12 @@ comm_close(int fd)
 {
     FD_ENTRY *fde = NULL;
     debug(5, 5) ("comm_close: FD %d\n", fd);
-    if (fd < 0)
-       fatal_dump("comm_close: bad FD");
-    if (fd >= Squid_MaxFD)
-       fatal_dump("comm_close: bad FD");
+    assert(fd >= 0);
+    assert(fd < Squid_MaxFD);
     fde = &fd_table[fd];
     if (!fde->open)
        return;
-    if (fd_table[fd].type == FD_FILE)
-       fatal_dump("comm_close: not a SOCKET");
+    assert(fd_table[fd].type =! FD_FILE);
     fde->open = 0;
     CommWriteStateCallbackAndFree(fd, COMM_ERROR);
     commCallCloseHandlers(fd);
@@ -876,8 +872,7 @@ comm_poll(time_t sec)
            if (errno == EINTR)
                continue;
            debug(5, 0) ("comm_poll: poll failure: %s\n", xstrerror());
-           if (errno == EINVAL)
-               fatal_dump("Poll returned EINVAL");
+           assert(errno != EINVAL);
            return COMM_ERROR;
            /* NOTREACHED */
        }
@@ -1372,8 +1367,7 @@ comm_write(int fd, char *buf, int size, CWCB * handler, void *handler_data, FREE
     CommWriteStateData *state = NULL;
     debug(5, 5) ("comm_write: FD %d: sz %d: hndl %p: data %p.\n",
        fd, size, handler, handler_data);
-    if (fd_table[fd].rwstate)
-       fatal_dump("comm_write: comm_write is already active");
+    assert(fd_table[fd].rwstate == NULL);
     state = xcalloc(1, sizeof(CommWriteStateData));
     state->buf = buf;
     state->size = size;

diff --git a/src/fd.cc b/src/fd.cc
index aeb92464ed50d46e27cd0f911830401f73b97294..ab7363e1f46caca9b61b2744c70d0dfc05fc1500 100644 (file)
--- a/src/fd.cc
+++ b/src/fd.cc
@@ -24,10 +24,8 @@ fd_close(int fd)
 {
     FD_ENTRY *fde = &fd_table[fd];
     if (fde->type == FD_FILE) {
-       if (fde->read_handler)
-           fatal_dump("file_close: read_handler present");
-       if (fde->write_handler)
-           fatal_dump("file_close: write_handler present");
+       assert(fde->read_handler == NULL);
+       assert(fde->write_handler == NULL);
     }
     fdUpdateBiggest(fd, fde->open = FD_CLOSE);
     memset(fde, '\0', sizeof(FD_ENTRY));
@@ -58,12 +56,11 @@ fd_bytes(int fd, int len, unsigned int type)
     FD_ENTRY *fde = &fd_table[fd];
     if (len < 0)
        return;
+    assert (type == FD_READ || type == FD_WRITE);
     if (type == FD_READ)
        fde->bytes_read += len;
-    else if (type == FD_WRITE)
-       fde->bytes_written += len;
     else
-       fatal_dump("fd_bytes: bad type");
+       fde->bytes_written += len;
 }
 
 void

diff --git a/src/stat.cc b/src/stat.cc
index 72a9a6961ac78f339aa3f11989fe4fed13c4a84f..a1fa9fc629bd099dc50be25f3bd62e3157777b5c 100644 (file)
--- a/src/stat.cc
+++ b/src/stat.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: stat.cc,v 1.143 1997/06/18 00:20:04 wessels Exp $
+ * $Id: stat.cc,v 1.144 1997/06/20 05:08:32 wessels Exp $
  *
  * DEBUG: section 18    Cache Manager Statistics
  * AUTHOR: Harvest Derived
@@ -134,35 +134,23 @@ extern int fileno_stack_count;
 static const char *describeStatuses _PARAMS((const StoreEntry *));
 static const char *describeFlags _PARAMS((const StoreEntry *));
 static const char *describeTimestamps _PARAMS((const StoreEntry *));
-static void dummyhandler _PARAMS((cacheinfo *, StoreEntry *));
-static void info_get _PARAMS((const cacheinfo *, StoreEntry *));
 static FILE_WALK_HD logReadEndHandler;
-static void log_clear _PARAMS((cacheinfo *, StoreEntry *));
-static void log_disable _PARAMS((cacheinfo *, StoreEntry *));
-static void log_enable _PARAMS((cacheinfo *, StoreEntry *));
-static void log_get_start _PARAMS((const cacheinfo *, StoreEntry *));
-static void log_status_get _PARAMS((const cacheinfo *, StoreEntry *));
-static void parameter_get _PARAMS((const cacheinfo *, StoreEntry *));
 static void proto_count _PARAMS((cacheinfo *, protocol_t, log_type));
 static void proto_newobject _PARAMS((cacheinfo *, protocol_t, int, int));
 static void proto_purgeobject _PARAMS((cacheinfo *, protocol_t, int));
 static void proto_touchobject _PARAMS((cacheinfo *, protocol_t, int));
-static void server_list _PARAMS((const cacheinfo *, StoreEntry *));
 static FILE_WALK_HD squidReadEndHandler;
-static void squid_get_start _PARAMS((const cacheinfo *, StoreEntry *));
 static void statFiledescriptors _PARAMS((StoreEntry *));
-static void stat_get _PARAMS((const cacheinfo *, const char *req, StoreEntry *));
 static void stat_io_get _PARAMS((StoreEntry *));
-static void stat_objects_get _PARAMS((const cacheinfo *, StoreEntry *, int vm_or_not));
+static void stat_objects_get _PARAMS((StoreEntry *, int vm_or_not));
 static void stat_utilization_get _PARAMS((cacheinfo *, StoreEntry *, const char *desc));
-static int cache_size_get _PARAMS((const cacheinfo *));
 static FILE_WALK_LHD logReadHandler;
 static FILE_WALK_LHD squidReadHandler;
 static int memoryAccounted _PARAMS((void));
 
-#ifdef UNUSED_CODE
-static int mallinfoTotal _PARAMS((void));
-#endif
+static int LogfileStatus;
+static int LogfileFD;
+static char *LogfileName;
 
 #ifdef XMALLOC_STATISTICS
 static void info_get_mallstat _PARAMS((int, int, StoreEntry *));
@@ -293,21 +281,6 @@ stat_io_get(StoreEntry * sentry)
     storeAppendPrintf(sentry, close_bracket);
 }
 
-
-/* return total bytes of all registered and known objects.
- * may not reflect the retrieving object....
- * something need to be done here to get more accurate cache size */
-static int
-cache_size_get(const cacheinfo * obj)
-{
-    int size = 0;
-    protocol_t proto_id;
-    /* sum all size, exclude total */
-    for (proto_id = PROTO_NONE; proto_id < PROTO_MAX; proto_id++)
-       size += obj->proto_stat_data[proto_id].kb.now;
-    return size;
-}
-
 static const char *
 describeStatuses(const StoreEntry * entry)
 {
@@ -382,7 +355,7 @@ describeTimestamps(const StoreEntry * entry)
 
 /* process objects list */
 static void
-stat_objects_get(const cacheinfo * obj, StoreEntry * sentry, int vm_or_not)
+stat_objects_get(StoreEntry * sentry, int vm_or_not)
 {
     StoreEntry *entry = NULL;
     MemObject *mem;
@@ -412,14 +385,14 @@ stat_objects_get(const cacheinfo * obj, StoreEntry * sentry, int vm_or_not)
 
 
 /* process a requested object into a manager format */
-static void
-stat_get(const cacheinfo * obj, const char *req, StoreEntry * sentry)
+void
+stat_get(const char *req, StoreEntry * sentry)
 {
 
     if (strcmp(req, "objects") == 0) {
-       stat_objects_get(obj, sentry, 0);
+       stat_objects_get(sentry, 0);
     } else if (strcmp(req, "vm_objects") == 0) {
-       stat_objects_get(obj, sentry, 1);
+       stat_objects_get(sentry, 1);
     } else if (strcmp(req, "ipcache") == 0) {
        stat_ipcache_get(sentry);
     } else if (strcmp(req, "fqdncache") == 0) {
@@ -448,12 +421,12 @@ stat_get(const cacheinfo * obj, const char *req, StoreEntry * sentry)
 
 
 /* generate logfile status information */
-static void
-log_status_get(const cacheinfo * obj, StoreEntry * sentry)
+void
+log_status_get(StoreEntry * sentry)
 {
-    if (obj->logfile_status == LOG_ENABLE) {
+    if (LogfileStatus == LOG_ENABLE) {
        storeAppendPrintf(sentry, "{\"Logfile is Enabled. Filename: %s\"}\n",
-           obj->logfilename);
+           LogfileName);
     } else {
        storeAppendPrintf(sentry, "{\"Logfile is Disabled.\"}\n");
     }
@@ -483,22 +456,22 @@ logReadEndHandler(int fd, int errflag_unused, void *data)
 }
 
 /* start converting logfile to processed format */
-static void
-log_get_start(const cacheinfo * obj, StoreEntry * sentry)
+void
+log_get_start(StoreEntry * sentry)
 {
     log_read_data_t *data = NULL;
     int fd;
 
-    if (obj->logfile_status == LOG_DISABLE) {
+    if (LogfileStatus == LOG_DISABLE) {
        /* Manufacture status when logging is disabled */
-       log_status_get(obj, sentry);
+       log_status_get(sentry);
        storeComplete(sentry);
        return;
     }
-    fd = file_open(obj->logfilename, O_RDONLY, NULL, NULL);
+    fd = file_open(LogfileName, O_RDONLY, NULL, NULL);
     if (fd < 0) {
        debug(50, 0) ("Cannot open logfile: %s: %s\n",
-           obj->logfilename, xstrerror());
+           LogfileName, xstrerror());
        return;
     }
     data = xcalloc(1, sizeof(log_read_data_t));
@@ -536,8 +509,8 @@ squidReadEndHandler(int fd_unused, int errflag_unused, void *data)
 
 
 /* start convert squid.conf file to processed format */
-static void
-squid_get_start(const cacheinfo * obj, StoreEntry * sentry)
+void
+squid_get_start(StoreEntry * sentry)
 {
     squid_read_data_t *data;
 
@@ -548,15 +521,8 @@ squid_get_start(const cacheinfo * obj, StoreEntry * sentry)
     file_walk(data->fd, squidReadEndHandler, data, squidReadHandler, data);
 }
 
-
-static void
-dummyhandler(cacheinfo * obj, StoreEntry * sentry)
-{
-    storeAppendPrintf(sentry, "{ \"Not_Implemented_yet.\"}\n");
-}
-
-static void
-server_list(const cacheinfo * obj, StoreEntry * sentry)
+void
+server_list(StoreEntry * sentry)
 {
     peer *e = NULL;
     struct _domain_ping *d = NULL;
@@ -685,22 +651,8 @@ memoryAccounted(void)
                  meta_data.misc;
 }
 
-#ifdef UNUSED_CODE
-static int
-mallinfoTotal(void)
-{
-    int total = 0;
-#if HAVE_MALLINFO
-    struct mallinfo mp;
-    mp = mallinfo();
-    total = mp.arena;
-#endif
-    return total;
-}
-#endif
-
-static void
-info_get(const cacheinfo * obj, StoreEntry * sentry)
+void
+info_get(StoreEntry * sentry)
 {
     const char *tod = NULL;
     float f;
@@ -931,8 +883,8 @@ info_get(const cacheinfo * obj, StoreEntry * sentry)
     storeAppendPrintf(sentry, close_bracket);
 }
 
-static void
-parameter_get(const cacheinfo * obj, StoreEntry * sentry)
+void
+parameter_get(StoreEntry * sentry)
 {
     storeAppendPrintf(sentry, open_bracket);
     storeAppendPrintf(sentry,
@@ -1078,7 +1030,7 @@ log_append(const cacheinfo * obj,
     int tt = 0;
 #endif
 
-    if (obj->logfile_status != LOG_ENABLE)
+    if (LogfileStatus != LOG_ENABLE)
        return;
 
     if (Config.Log.log_fqdn)
@@ -1151,7 +1103,7 @@ log_append(const cacheinfo * obj,
        safe_free(erep);
     }
 #endif /* LOG_FULL_HEADERS */
-    x = file_write(obj->logfile_fd,
+    x = file_write(LogfileFD,
        xstrdup(tmp),
        strlen(tmp),
        NULL,
@@ -1161,50 +1113,40 @@ log_append(const cacheinfo * obj,
        debug(18, 1) ("log_append: File write failed.\n");
 }
 
-static void
-log_enable(cacheinfo * obj, StoreEntry * sentry)
+void
+log_enable(StoreEntry * sentry)
 {
-    if (obj->logfile_status == LOG_DISABLE) {
-       obj->logfile_status = LOG_ENABLE;
-
+    if (LogfileStatus == LOG_DISABLE) {
+       LogfileStatus = LOG_ENABLE;
        /* open the logfile */
-       obj->logfile_fd = file_open(obj->logfilename, O_WRONLY | O_CREAT, NULL, NULL);
-       if (obj->logfile_fd == DISK_ERROR) {
-           debug(18, 0) ("Cannot open logfile: %s\n", obj->logfilename);
-           obj->logfile_status = LOG_DISABLE;
+       LogfileFD = file_open(LogfileName, O_WRONLY | O_CREAT, NULL, NULL);
+       if (LogfileFD == DISK_ERROR) {
+           debug(18, 0) ("Cannot open logfile: %s\n", LogfileName);
+           LogfileStatus = LOG_DISABLE;
        }
     }
-    /* at the moment, store one char to make a storage manager happy */
-    storeAppendPrintf(sentry, " ");
 }
 
-static void
-log_disable(cacheinfo * obj, StoreEntry * sentry)
+void
+log_disable(StoreEntry * sentry)
 {
-    if (obj->logfile_status == LOG_ENABLE)
-       file_close(obj->logfile_fd);
-
-    obj->logfile_status = LOG_DISABLE;
-    /* at the moment, store one char to make a storage manager happy */
-    storeAppendPrintf(sentry, " ");
+    if (LogfileStatus == LOG_ENABLE)
+       file_close(LogfileFD);
+    LogfileStatus = LOG_DISABLE;
 }
 
-
-
-static void
-log_clear(cacheinfo * obj, StoreEntry * sentry)
+void
+log_clear(StoreEntry * sentry)
 {
     /* what should be done here. Erase file ??? or move it to another name?  At the moment, just erase it.  bug here need to be fixed. what if there are still data in memory. Need flush here */
-    if (obj->logfile_status == LOG_ENABLE)
-       file_close(obj->logfile_fd);
-
-    unlink(obj->logfilename);
-
+    if (LogfileStatus == LOG_ENABLE)
+       file_close(LogfileFD);
+    unlink(LogfileName);
     /* reopen it anyway */
-    obj->logfile_fd = file_open(obj->logfilename, O_WRONLY | O_CREAT, NULL, NULL);
-    if (obj->logfile_fd == DISK_ERROR) {
-       debug(18, 0) ("Cannot open logfile: %s\n", obj->logfilename);
-       obj->logfile_status = LOG_DISABLE;
+    LogfileFD = file_open(LogfileName, O_WRONLY | O_CREAT, NULL, NULL);
+    if (LogfileFD == DISK_ERROR) {
+       debug(18, 0) ("Cannot open logfile: %s\n", LogfileName);
+       LogfileStatus = LOG_DISABLE;
     }
     /* at the moment, store one char to make a storage manager happy */
     storeAppendPrintf(sentry, " ");
@@ -1278,34 +1220,21 @@ stat_init(cacheinfo ** object, const char *logfilename)
 
     debug(18, 5) ("stat_init: Initializing...\n");
     obj = xcalloc(1, sizeof(cacheinfo));
-    obj->stat_get = stat_get;
-    obj->info_get = info_get;
-    obj->cache_size_get = cache_size_get;
-    obj->log_get_start = log_get_start;
-    obj->log_status_get = log_status_get;
-    obj->log_append = log_append;
-    obj->log_clear = log_clear;
-    obj->log_enable = log_enable;
-    obj->log_disable = log_disable;
-    obj->logfile_status = LOG_ENABLE;
-    obj->squid_get_start = squid_get_start;
-    obj->parameter_get = parameter_get;
-    obj->server_list = server_list;
     if (logfilename) {
-       memset(obj->logfilename, '\0', SQUID_MAXPATHLEN);
-       xstrncpy(obj->logfilename, logfilename, SQUID_MAXPATHLEN);
-       obj->logfile_fd = file_open(obj->logfilename, O_WRONLY | O_CREAT, NULL, NULL);
-       if (obj->logfile_fd == DISK_ERROR) {
-           debug(50, 0) ("%s: %s\n", obj->logfilename, xstrerror());
+       memset(LogfileName, '\0', SQUID_MAXPATHLEN);
+       xstrncpy(LogfileName, logfilename, SQUID_MAXPATHLEN);
+       LogfileFD = file_open(LogfileName, O_WRONLY | O_CREAT, NULL, NULL);
+       if (LogfileFD == DISK_ERROR) {
+           debug(50, 0) ("%s: %s\n", LogfileName, xstrerror());
            fatal("Cannot open logfile.");
        }
     }
+    obj->log_append = log_append;
     obj->proto_id = urlParseProtocol;
     obj->proto_newobject = proto_newobject;
     obj->proto_purgeobject = proto_purgeobject;
     obj->proto_touchobject = proto_touchobject;
     obj->proto_count = proto_count;
-    obj->NotImplement = dummyhandler;
     for (i = PROTO_NONE; i <= PROTO_MAX; i++) {
        switch (i) {
        case PROTO_HTTP:
@@ -1355,7 +1284,7 @@ stat_rotate_log(void)
     char *fname = NULL;
     struct stat sb;
 
-    if ((fname = HTTPCacheInfo->logfilename) == NULL)
+    if ((fname = LogfileName) == NULL)
        return;
 #ifdef S_ISREG
     if (stat(fname, &sb) == 0)
@@ -1379,11 +1308,11 @@ stat_rotate_log(void)
     }
     /* Close and reopen the log.  It may have been renamed "manually"
      * before HUP'ing us. */
-    file_close(HTTPCacheInfo->logfile_fd);
-    HTTPCacheInfo->logfile_fd = file_open(fname, O_WRONLY | O_CREAT, NULL, NULL);
-    if (HTTPCacheInfo->logfile_fd == DISK_ERROR) {
+    file_close(LogfileFD);
+    LogfileFD = file_open(fname, O_WRONLY | O_CREAT, NULL, NULL);
+    if (LogfileFD == DISK_ERROR) {
        debug(18, 0) ("stat_rotate_log: Cannot open logfile: %s\n", fname);
-       HTTPCacheInfo->logfile_status = LOG_DISABLE;
+       LogfileStatus = LOG_DISABLE;
        fatal("Cannot open logfile.");
     }
 }
@@ -1391,5 +1320,5 @@ stat_rotate_log(void)
 void
 statCloseLog(void)
 {
-    file_close(HTTPCacheInfo->logfile_fd);
+    file_close(LogfileFD);
 }