Changeset 8fa0167

Timestamp:

11/01/17 14:22:38 (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:

aa7db84

Parents:

6e16301

Message:

Fix bad placement of FD_ZERO.

Also increment 'missing' by the total sequence number gap, not
1 each time the gap is non-zero.

File:

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

lib/format_ndag.c

@@ -653 +653 @@
         availsocks = 0;
 
+        FD_ZERO(&allgroups);
         for (i = 0; i < rt->sourcecount; i ++) {
                 if (read_required(rt->sources[i])) {
@@ -678 +679 @@
          * sockets.
          */
-        FD_ZERO(&allgroups);
         if (select(maxfd + 1, &allgroups, NULL, NULL, &timeout) < 0) {
                 fprintf(stderr, "Error waiting to receive records: %s\n",
@@ -745 +745 @@
                         if (ntohl(rt->sources[i].encaphdr->seqno) !=
                                         rt->sources[i].expectedseq) {
-                                rt->missing_records += 1;
+                                /* TODO deal with wrapping */
+                                rt->missing_records += (ntohl(rt->sources[i].encaphdr->seqno) - rt->sources[i].expectedseq);
                         }
                 }