Changeset 7e09388

Timestamp:

11/14/17 13:58:01 (3 years ago)

Author:

Shane Alcock <salcock@…>

Branches:

cachetimestamps, develop, dpdk-ndag, etsilive, master, ndag_format, rc-4.0.2, rc-4.0.3, rc-4.0.4, ringdecrementfix, ringperformance

Children:

9d00fb13

Parents:

07de3c6

Message:

Fix silly bug where we weren't checking for buf index wrapping.

Also removed redundant check for (bufavail == 0) -- the following
check will catch it anyway.

File:

• lib/format_ndag.c (modified) (3 diffs)

lib/format_ndag.c

@@ -709 +709 @@
                 ssock->mmsgbufs[i].msg_hdr.msg_controllen = 0;
                 ssock->mmsgbufs[i].msg_hdr.msg_flags = 0;
-                ssock->mmsgbufs[i].msg_len = 1;
+                ssock->mmsgbufs[i].msg_len = 0;
         }
 
@@ -781 +781 @@
                 if (i >= RECV_BATCH_SIZE) {
                         break;
+                }
+
+                if (wind >= ENCAP_BUFFERS) {
+                        wind = 0;
                 }
 
@@ -875 +879 @@
         }
 
-        if (ssock->bufavail == 0) {
-                /* All buffers were full, so something must be
-                 * available. */
-                return 1;
-        }
-
+        /* Plenty of full buffers, just use the packets in those */
         if (ssock->bufavail < RECV_BATCH_SIZE / 2) {
                 return 1;