Changeset 5798dc6 for lib/format_dag25.c

Timestamp:

09/05/07 10:18:58 (14 years ago)

Author:

Shane Alcock <salcock@…>

Branches:

4.0.1-hotfixes, cachetimestamps, develop, dpdk-ndag, etsilive, getfragoff, help, libtrace4, master, ndag_format, pfring, rc-4.0.1, rc-4.0.2, rc-4.0.3, rc-4.0.4, ringdecrementfix, ringperformance, ringtimestampfixes

Children:

9c6005f

Parents:

52656ed

Message:

• Changed DAG 2.5 code to force it to call dag_advance_stream if it has read 4MB without doing so. This is to ensure that the processed records get freed regularly.
• Changed a couple of internal functions in format_dag24 to be static, which fixes some warnings
• Changed the wording of the configure message that checks for DAG2.4 after failing to find DAG 2.5 or later to make it obvious that we aren't trying to do the same thing twice (and getting inconsistent results!)

File:

• lib/format_dag25.c (modified) (5 diffs)

lib/format_dag25.c

@@ -78 +78 @@
         uint8_t *bottom;
         uint8_t *top;
+        uint32_t processed;
 };
 
@@ -177 +178 @@
                 bottom -= diff;
         } while (diff != 0);
-
+        FORMAT_DATA->top = NULL;
+        FORMAT_DATA->bottom = NULL;
+        FORMAT_DATA->processed = 0;
+        
         return 0;
 }
@@ -239 +243 @@
 static int dag_available(libtrace_t *libtrace) {
         uint32_t diff = FORMAT_DATA->top - FORMAT_DATA->bottom;
-        if (diff >= dag_record_size)
+        /* If we've processed more than 4MB of data since we last called
+         * dag_advance_stream, then we should call it again to allow the 
+         * space occupied by that 4MB to be released */
+        if (diff >= dag_record_size && FORMAT_DATA->processed < 4 * 1024 * 1024)
                 return diff;
         FORMAT_DATA->top = dag_advance_stream(FORMAT_DATA->fd, 
@@ -248 +255 @@
                 return -1;
         }
+        FORMAT_DATA->processed = 0;
         diff = FORMAT_DATA->top - FORMAT_DATA->bottom;
         return diff;
@@ -264 +272 @@
                 return NULL;
         FORMAT_DATA->bottom += size;
+        FORMAT_DATA->processed += size;
         return erfptr;
 }