open swapout fd debugging

diff --git a/src/stat.cc b/src/stat.cc
index 8992d3f6378b93e78067e042a9199a502b413257..0ff01c10c82d324d60035b3debf51b54b9458a07 100644 (file)
--- a/src/stat.cc
+++ b/src/stat.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: stat.cc,v 1.240 1998/04/16 17:18:53 wessels Exp $
+ * $Id: stat.cc,v 1.241 1998/04/20 21:41:22 wessels Exp $
  *
  * DEBUG: section 18    Cache Manager Statistics
  * AUTHOR: Harvest Derived
@@ -121,6 +121,7 @@ static void statCountersInitSpecial(StatCounters *);
 static void statCountersClean(StatCounters *);
 static void statCountersCopy(StatCounters * dest, const StatCounters * orig);
 static double statMedianSvc(int, int);
+static void statStoreEntry(StoreEntry * s, StoreEntry * e);
 static OBJH stat_io_get;
 static OBJH stat_objects_get;
 static OBJH stat_vmobjects_get;
@@ -132,6 +133,7 @@ static OBJH statDigestBlob;
 static OBJH statAvg5min;
 static OBJH statAvg60min;
 static OBJH statUtilization;
+static OBJH storeDebugFD;
 
 #ifdef XMALLOC_STATISTICS
 static void info_get_mallstat(int, int, StoreEntry *);
@@ -304,44 +306,29 @@ describeTimestamps(const StoreEntry * entry)
     return buf;
 }
 
-/* process objects list */
 static void
-statObjects(StoreEntry * sentry, int vm_or_not)
+statStoreEntry(StoreEntry * s, StoreEntry * e)
 {
-    StoreEntry *entry = NULL;
-    StoreEntry *next = NULL;
-    MemObject *mem;
-    int N = 0;
+    MemObject *mem = e->mem_obj;
     int i;
     struct _store_client *sc;
-    next = (StoreEntry *) hash_first(store_table);
-    while ((entry = next) != NULL) {
-       next = (StoreEntry *) hash_next(store_table);
-       mem = entry->mem_obj;
-       if (vm_or_not && mem == NULL)
-           continue;
-       if ((++N & 0xFF) == 0) {
-           debug(18, 3) ("statObjects:  Processed %d objects...\n", N);
-       }
-       storeBuffer(sentry);
-       storeAppendPrintf(sentry, "KEY %s\n", storeKeyText(entry->key));
-       if (mem)
-           storeAppendPrintf(sentry, "\t%s %s\n",
-               RequestMethodStr[mem->method], mem->log_url);
-       storeAppendPrintf(sentry, "\t%s\n", describeStatuses(entry));
-       storeAppendPrintf(sentry, "\t%s\n", describeFlags(entry));
-       storeAppendPrintf(sentry, "\t%s\n", describeTimestamps(entry));
-       storeAppendPrintf(sentry, "\t%d locks, %d clients, %d refs\n",
-           (int) entry->lock_count,
-           storePendingNClients(entry),
-           (int) entry->refcount);
-       storeAppendPrintf(sentry, "\tSwap File %#08X\n",
-           entry->swap_file_number);
-       if (mem == NULL)
-           continue;
-       storeAppendPrintf(sentry, "\tinmem_lo: %d\n", (int) mem->inmem_lo);
-       storeAppendPrintf(sentry, "\tinmem_hi: %d\n", (int) mem->inmem_hi);
-       storeAppendPrintf(sentry, "\tswapout: %d bytes done, %d queued, FD %d\n",
+    storeAppendPrintf(s, "KEY %s\n", storeKeyText(e->key));
+    if (mem)
+       storeAppendPrintf(s, "\t%s %s\n",
+           RequestMethodStr[mem->method], mem->log_url);
+    storeAppendPrintf(s, "\t%s\n", describeStatuses(e));
+    storeAppendPrintf(s, "\t%s\n", describeFlags(e));
+    storeAppendPrintf(s, "\t%s\n", describeTimestamps(e));
+    storeAppendPrintf(s, "\t%d locks, %d clients, %d refs\n",
+       (int) e->lock_count,
+       storePendingNClients(e),
+       (int) e->refcount);
+    storeAppendPrintf(s, "\tSwap File %#08X\n",
+       e->swap_file_number);
+    if (mem != NULL) {
+       storeAppendPrintf(s, "\tinmem_lo: %d\n", (int) mem->inmem_lo);
+       storeAppendPrintf(s, "\tinmem_hi: %d\n", (int) mem->inmem_hi);
+       storeAppendPrintf(s, "\tswapout: %d bytes done, %d queued, FD %d\n",
            (int) mem->swapout.done_offset,
            (int) mem->swapout.queue_offset,
            mem->swapout.fd);
@@ -349,18 +336,54 @@ statObjects(StoreEntry * sentry, int vm_or_not)
            sc = &mem->clients[i];
            if (sc->callback_data == NULL)
                continue;
-           storeAppendPrintf(sentry, "\tClient #%d\n", i);
-           storeAppendPrintf(sentry, "\t\tcopy_offset: %d\n",
+           storeAppendPrintf(s, "\tClient #%d\n", i);
+           storeAppendPrintf(s, "\t\tcopy_offset: %d\n",
                (int) sc->copy_offset);
-           storeAppendPrintf(sentry, "\t\tseen_offset: %d\n",
+           storeAppendPrintf(s, "\t\tseen_offset: %d\n",
                (int) sc->seen_offset);
-           storeAppendPrintf(sentry, "\t\tcopy_size: %d\n",
+           storeAppendPrintf(s, "\t\tcopy_size: %d\n",
                (int) sc->copy_size);
-           storeAppendPrintf(sentry, "\t\tswapin_fd: %d\n",
+           storeAppendPrintf(s, "\t\tswapin_fd: %d\n",
                (int) sc->swapin_fd);
        }
-       storeAppendPrintf(sentry, "\n");
-       storeBufferFlush(sentry);
+    }
+    storeAppendPrintf(s, "\n");
+}
+
+/* process objects list */
+static void
+statObjects(StoreEntry * sentry, int vm_or_not)
+{
+    StoreEntry *entry = NULL;
+    StoreEntry *next = NULL;
+    int N = 0;
+    next = (StoreEntry *) hash_first(store_table);
+    while ((entry = next) != NULL) {
+       next = (StoreEntry *) hash_next(store_table);
+       if (vm_or_not && entry->mem_obj == NULL)
+           continue;
+       if ((++N & 0xFF) == 0) {
+           debug(18, 3) ("statObjects:  Processed %d objects...\n", N);
+       }
+       statStoreEntry(sentry, entry);
+    }
+}
+
+static void
+storeDebugFD(StoreEntry *s)
+{
+    StoreEntry *entry = NULL;
+    StoreEntry *next = NULL;
+    MemObject *mem;
+    next = (StoreEntry *) hash_first(store_table);
+    while ((entry = next) != NULL) {
+       next = (StoreEntry *) hash_next(store_table);
+       mem = entry->mem_obj;
+       if (!mem)
+               continue;
+       if (mem->swapout.fd < 0)
+               continue;
+       statStoreEntry(s, entry);
     }
 }
 
@@ -812,6 +835,9 @@ statInit(void)
        "Display cache metrics graphically",
        statGraphDump, 0);
 #endif
+    cachemgrRegister("debug-openfd",
+        "Debugging Open Swapout FDs",
+        storeDebugFD, 0);
 }
 
 static void