Changeset 07de3c6 for lib

Timestamp:

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

7e09388

Parents:

eb70703

Message:

Why count the number of buffers available every time?

Surely it is much more efficient to just have a counter that
gets modified each time a buffer is filled or empty...

File:

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

lib/format_ndag.c

@@ -64 +64 @@
         uint64_t recordcount;
 
+        int bufavail;
+
         struct mmsghdr mmsgbufs[RECV_BATCH_SIZE];
 } streamsock_t;
@@ -598 +600 @@
                  * move on. */
                 ssock->savedsize[nr] = 0;
+                ssock->bufavail ++;
+
+                assert(ssock->bufavail > 0 && ssock->bufavail <= ENCAP_BUFFERS);
                 nr ++;
                 if (nr == ENCAP_BUFFERS) {
@@ -688 +693 @@
         ssock->monitorptr = mon;
         ssock->saved = (char **)malloc(sizeof(char *) * ENCAP_BUFFERS);
+        ssock->bufavail = ENCAP_BUFFERS;
         ssock->startidle = 0;
 
@@ -767 +773 @@
 }
 
-static void init_receivers(streamsock_t *ssock, int required) {
+static int init_receivers(streamsock_t *ssock, int required) {
 
         int wind = ssock->nextwriteind;
@@ -773 +779 @@
 
         for (i = 0; i < required; i++) {
+                if (i >= RECV_BATCH_SIZE) {
+                        break;
+                }
+
                 ssock->mmsgbufs[i].msg_len = 0;
                 ssock->mmsgbufs[i].msg_hdr.msg_iov->iov_base = ssock->saved[wind];
@@ -780 +790 @@
                 wind ++;
         }
-}
-
-static int count_receivers(streamsock_t *ssock) {
-
-        int wind = ssock->nextwriteind;
-        int i;
-        int avail = 0;
-
-        for (i = 0; i < RECV_BATCH_SIZE; i++) {
-                if (wind == ENCAP_BUFFERS) {
-                        wind = 0;
-                }
-
-                if (ssock->savedsize[wind] != 0) {
-                        /* No more empty buffers */
-                        break;
-                }
-
-                avail ++;
-                wind ++;
-        }
-
-        return avail;
+
+        return i;
 }
 
@@ -830 +819 @@
         ssock->savedsize[index] = msglen;
         ssock->nextwriteind ++;
+        ssock->bufavail --;
+
+        assert(ssock->bufavail >= 0);
 
         if (ssock->nextwriteind >= ENCAP_BUFFERS) {
@@ -876 +868 @@
                 int *gottime, recvstream_t *rt) {
 
-        int avail, ret, ndagstat, i;
+        int ret, ndagstat, i, avail;
         int toret = 0;
 
@@ -883 +875 @@
         }
 
-        avail = count_receivers(ssock);
-
-        if (avail == 0) {
+        if (ssock->bufavail == 0) {
                 /* All buffers were full, so something must be
                  * available. */
@@ -891 +881 @@
         }
 
-        if (avail < RECV_BATCH_SIZE / 2) {
+        if (ssock->bufavail < RECV_BATCH_SIZE / 2) {
                 return 1;
         }
 
-        init_receivers(ssock, avail);
+        avail = init_receivers(ssock, ssock->bufavail);
 
         ret = recvmmsg(ssock->sock, ssock->mmsgbufs, avail,