Changeset 68d3308

Timestamp:

01/16/15 15:28:18 (6 years ago)

Author:

Shane Alcock <salcock@…>

Branches:

4.0.1-hotfixes, cachetimestamps, develop, dpdk-ndag, etsilive, 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:

18bf317, 3fc3267, 4bd6393

Parents:

21f3226

Message:

Fix bug in DAG memory hole flush

As reported by Dan Collins, the recent fix to ensure the DAG memory
hole is properly flushed did not account for the case where the hole
was already empty. As a result, 'top' was not initialised properly and
DAG captures wouldn't work.

Should solve Issue #12.

File:

• lib/format_dag25.c (modified) (1 diff)

lib/format_dag25.c

@@ -616 +616 @@
 
         /* Should probably flush the memory hole now */
-        while (starttop - bottom > 0) {
+        top = starttop;
+        while (starttop - bottom > 0) {
                 bottom += (starttop - bottom);
                 top = dag_advance_stream(FORMAT_DATA->device->fd,