Changeset eb70703

Timestamp:

11/14/17 11:31:09 (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:

07de3c6

Parents:

5d8280a

Message:

Only initialise mmsgbufs when we're actually going to use them.

Previous change meant that we aren't going to be actually calling
recvmmsg so stop wasting time repeatedly initialising buffers that
aren't going to be used.

Also moved initialisation of mmsgbuf fields that do not change
out of the per-packet path so we don't end up repeatedly setting
values to the same thing that they were before.

File:

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

lib/format_ndag.c

@@ -698 +698 @@
                 ssock->mmsgbufs[i].msg_hdr.msg_iov = (struct iovec *)
                                 malloc(sizeof(struct iovec));
+                ssock->mmsgbufs[i].msg_hdr.msg_name = ssock->srcaddr->ai_addr;
+                ssock->mmsgbufs[i].msg_hdr.msg_namelen = ssock->srcaddr->ai_addrlen;
+                ssock->mmsgbufs[i].msg_hdr.msg_control = NULL;
+                ssock->mmsgbufs[i].msg_hdr.msg_controllen = 0;
+                ssock->mmsgbufs[i].msg_hdr.msg_flags = 0;
+                ssock->mmsgbufs[i].msg_len = 1;
         }
 
@@ -761 +767 @@
 }
 
-static int init_receivers(streamsock_t *ssock) {
+static void init_receivers(streamsock_t *ssock, int required) {
+
+        int wind = ssock->nextwriteind;
+        int i;
+
+        for (i = 0; i < required; i++) {
+                ssock->mmsgbufs[i].msg_len = 0;
+                ssock->mmsgbufs[i].msg_hdr.msg_iov->iov_base = ssock->saved[wind];
+                ssock->mmsgbufs[i].msg_hdr.msg_iov->iov_len = ENCAP_BUFSIZE;
+                ssock->mmsgbufs[i].msg_hdr.msg_iovlen = 1;
+
+                wind ++;
+        }
+}
+
+static int count_receivers(streamsock_t *ssock) {
 
         int wind = ssock->nextwriteind;
@@ -776 +797 @@
                         break;
                 }
-
-                ssock->mmsgbufs[i].msg_len = 0;
-                ssock->mmsgbufs[i].msg_hdr.msg_name = ssock->srcaddr->ai_addr;
-                ssock->mmsgbufs[i].msg_hdr.msg_namelen = ssock->srcaddr->ai_addrlen;
-                ssock->mmsgbufs[i].msg_hdr.msg_iov->iov_base = ssock->saved[wind];
-                ssock->mmsgbufs[i].msg_hdr.msg_iov->iov_len = ENCAP_BUFSIZE;
-                ssock->mmsgbufs[i].msg_hdr.msg_iovlen = 1;
-                ssock->mmsgbufs[i].msg_hdr.msg_control = NULL;
-                ssock->mmsgbufs[i].msg_hdr.msg_controllen = 0;
-                ssock->mmsgbufs[i].msg_hdr.msg_flags = 0;
 
                 avail ++;
@@ -872 +883 @@
         }
 
-        avail = init_receivers(ssock);
+        avail = count_receivers(ssock);
 
         if (avail == 0) {
@@ -883 +894 @@
                 return 1;
         }
+
+        init_receivers(ssock, avail);
 
         ret = recvmmsg(ssock->sock, ssock->mmsgbufs, avail,