Changeset 119

Timestamp:

11.12.2005 14:41:27 (3 years ago)

Author:

tibob

Message:

• Optimized the check on dump time (closes #9)

Location:

trunk/source

Files:

• init.c (modified) (3 diffs)
• ipfm.c (modified) (2 diffs)
• pcap.c (modified) (2 diffs)

trunk/source/init.c

@@ -68 +68 @@
 extern FILE *yyin;
 extern int yyfailed;
+extern time_t NextDumpGlobal;
 
 struct OptionsType Options;
@@ -346 +347 @@
   struct AllLogsType *pNextLog;
 
+/* NextDumpGlobal check will at least be done within next
+   DEFAULT_OPTIONS_DUMPINTERVAL */
+  NextDumpGlobal = time(NULL) + DEFAULT_OPTIONS_DUMPINTERVAL;
+  
   pPrevLog = NULL;
-  for (pTempLog = pAllLogs; NULL != pTempLog; pTempLog = pNextLog)
-  {
+  for (pTempLog = pAllLogs; NULL != pTempLog; pTempLog = pNextLog) {
     pNextLog = pTempLog->Next;
-    if (NULL == pTempLog->Filter)
+    if (NULL == pTempLog->Filter) {
       /* wipe this entry out*/
-    {
       if (pTempLog->LogFile) {
         xfree (pTempLog->LogFile);
@@ -364 +367 @@
 
       xfree (pTempLog);
+
     } else {
-      /* this entry is kept, adjust NextClear */
+      /* this entry is kept */
+      pPrevLog = pTempLog;
+
+      /* make latest initialisations */
       pTempLog->NextClear = pTempLog->NextDump + pTempLog->DumpInterval * (pTempLog->ClearCounter - 1);
 
-      pPrevLog = pTempLog;
+      if (NextDumpGlobal > pTempLog->NextDump) {
+        NextDumpGlobal = pTempLog->NextDump;
+      }
     }
   }

trunk/source/ipfm.c

@@ -60 +60 @@
 extern int run_as_daemon;
 extern struct OptionsType Options;
+time_t NextDumpGlobal=0;
 
 int main(int argc, char *argv[]) {
@@ -121 +122 @@
 
     /* Well that's an approximation. I should perhaps use an alarm() */
-    for (pTempLog = pAllLogs; NULL != pTempLog; pTempLog = pTempLog->Next) {
-/* DEBUG_MSG("time %d nextdump %d delta %d\n", time(NULL), pTempLog->NextDump, pTempLog->NextDump - time(NULL));*/
-      if (time(NULL) > pTempLog->NextDump) {
-        data_dump(pTempLog);
-        /* Check if we have to clear the logs as well */
-        if (0 != pTempLog->ClearInterval) {
-          pTempLog->ClearCounter--;
-          if (0 >= pTempLog->ClearCounter) {
-            data_clear(pTempLog);
-            pTempLog->PrevClear = pTempLog->NextDump;
-            pTempLog->NextClear = pTempLog->NextDump + pTempLog->ClearInterval * pTempLog->DumpInterval;
-            pTempLog->ClearCounter = pTempLog->ClearInterval;
+    if (NextDumpGlobal < time(NULL)) {
+      /* NextDumpGlobal check will at least be done within next
+         DEFAULT_OPTIONS_DUMPINTERVAL */
+      NextDumpGlobal = time(NULL) + DEFAULT_OPTIONS_DUMPINTERVAL;
+      for (pTempLog = pAllLogs; NULL != pTempLog; pTempLog = pTempLog->Next) {
+      DEBUG_MSG("time %d nextdump %d delta %d\n", time(NULL), pTempLog->NextDump, pTempLog->NextDump - time(NULL));
+        if (time(NULL) > pTempLog->NextDump) {
+          data_dump(pTempLog);
+          /* Check if we have to clear the logs as well */
+          if (0 != pTempLog->ClearInterval) {
+            pTempLog->ClearCounter--;
+            if (0 >= pTempLog->ClearCounter) {
+              data_clear(pTempLog);
+              pTempLog->PrevClear = pTempLog->NextDump;
+              pTempLog->NextClear = pTempLog->NextDump +
+                            pTempLog->ClearInterval * pTempLog->DumpInterval;
+              pTempLog->ClearCounter = pTempLog->ClearInterval;
+            }
+          }
+          pTempLog->PrevDump = pTempLog->NextDump;
+          pTempLog->NextDump += pTempLog->DumpInterval;
+          /* Set NextDumpGlobal to the right time */
+          if (NextDumpGlobal > pTempLog->NextDump) {
+            NextDumpGlobal = pTempLog->NextDump;
           }
         }
-        pTempLog->PrevDump = pTempLog->NextDump;
-        pTempLog->NextDump += pTempLog->DumpInterval;
       }
     }

trunk/source/pcap.c

@@ -241 +241 @@
 }
 
-u_char *getnextippkt()
-{
+u_char *getnextippkt() {
   /* these are allocated by pcap (I think they are saved in pcap_global_descriptor allocated by me...) */
   struct pcap_pkthdr *header;
@@ -256 +255 @@
   for (;;) {
     pcap_result = pcap_next_ex(pcap_global_descriptor, &header, (const u_char **) &packet);
-    /*    DEBUG_MSG("pcap_next_ex returned %i\n", pcap_result); */
+    DEBUG_MSG("pcap_next_ex returned %i\n", pcap_result);
     switch (pcap_result) {
       case 1:
         /* A packet was received, nothing to do! */
-        /* DEBUG_MSG("packet time/length/size %i %i %i\n", header->ts, header->caplen, header->len); */
+        DEBUG_MSG("packet time/length/size %i %i %i\n", header->ts, header->caplen, header->len);
         break;
       case 0:
         /* pcap_next_ex reached a time out, check if there is someting to dump and if not, continue */
-        /* FIXME: ungly code duplication here! */
+        /* FIXME: ugly code duplication here! */
         /* handle HUP signal */
         if (SigHup) {