Changeset 694823f

Timestamp:

02/19/15 13:09:30 (6 years ago)

Author:

Richard Sanger <rsangerarj@…>

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:

92020b8

Parents:

e4f27d1

Message:

Fix issue with retriving stats from a closed parallel trace.
Remove some DPDK debug code.

Location:

lib

Files:

• format_dpdk.c (modified) (1 diff)
• trace.c (modified) (2 diffs)

lib/format_dpdk.c

@@ -1367 +1367 @@
     fprintf(stderr, "Link status is %d %d %d\n", (int) link_info.link_status,
             (int) link_info.link_duplex, (int) link_info.link_speed);
-        struct rte_eth_rss_reta reta_conf = {0};
-        reta_conf.mask_lo = ~reta_conf.mask_lo;
-        reta_conf.mask_hi = ~reta_conf.mask_hi;
-        int qew = rte_eth_dev_rss_reta_query(format_data->port, &reta_conf);
-        fprintf(stderr, "err=%d", qew);
-        for (i = 0; i < ETH_RSS_RETA_NUM_ENTRIES; i++) {
-                fprintf(stderr, "[%d] = %d\n", i, (int)reta_conf.reta[i]);
-        }
-
 #endif
 

lib/trace.c

@@ -2046 +2046 @@
         assert(stat->magic == LIBTRACE_STAT_MAGIC && "Please use"
                "trace_create_statistics() to allocate statistics");
-        stat->reserved1 = 0;
-        stat->reserved2 = 0;
-#define X(x) stat->x ##_valid = 0;
-        LIBTRACE_STAT_FIELDS;
-#undef X
+
+        /* If the trace has paused or finished get the cached results */
         if (trace->state == STATE_PAUSED ||
             trace->state == STATE_FINSHED ||
@@ -2057 +2054 @@
                         *stat = *trace->stats;
                 return stat;
-        } else if (trace->format->get_statistics) {
+        }
+
+        stat->reserved1 = 0;
+        stat->reserved2 = 0;
+#define X(x) stat->x ##_valid = 0;
+        LIBTRACE_STAT_FIELDS;
+#undef X
+        if (trace->format->get_statistics) {
                 trace->format->get_statistics(trace, stat);
                 ret = trace_get_accepted_packets(trace);