Changeset 694823f


Ignore:
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:
2 edited

Legend:

Unmodified
Added
Removed
  • lib/format_dpdk.c

    r5ab626a r694823f  
    13671367    fprintf(stderr, "Link status is %d %d %d\n", (int) link_info.link_status,
    13681368            (int) link_info.link_duplex, (int) link_info.link_speed);
    1369         struct rte_eth_rss_reta reta_conf = {0};
    1370         reta_conf.mask_lo = ~reta_conf.mask_lo;
    1371         reta_conf.mask_hi = ~reta_conf.mask_hi;
    1372         int qew = rte_eth_dev_rss_reta_query(format_data->port, &reta_conf);
    1373         fprintf(stderr, "err=%d", qew);
    1374         for (i = 0; i < ETH_RSS_RETA_NUM_ENTRIES; i++) {
    1375                 fprintf(stderr, "[%d] = %d\n", i, (int)reta_conf.reta[i]);
    1376         }
    1377 
    13781369#endif
    13791370
  • lib/trace.c

    r5ab626a r694823f  
    20462046        assert(stat->magic == LIBTRACE_STAT_MAGIC && "Please use"
    20472047               "trace_create_statistics() to allocate statistics");
    2048         stat->reserved1 = 0;
    2049         stat->reserved2 = 0;
    2050 #define X(x) stat->x ##_valid = 0;
    2051         LIBTRACE_STAT_FIELDS;
    2052 #undef X
     2048
     2049        /* If the trace has paused or finished get the cached results */
    20532050        if (trace->state == STATE_PAUSED ||
    20542051            trace->state == STATE_FINSHED ||
     
    20572054                        *stat = *trace->stats;
    20582055                return stat;
    2059         } else if (trace->format->get_statistics) {
     2056        }
     2057
     2058        stat->reserved1 = 0;
     2059        stat->reserved2 = 0;
     2060#define X(x) stat->x ##_valid = 0;
     2061        LIBTRACE_STAT_FIELDS;
     2062#undef X
     2063        if (trace->format->get_statistics) {
    20602064                trace->format->get_statistics(trace, stat);
    20612065                ret = trace_get_accepted_packets(trace);
Note: See TracChangeset for help on using the changeset viewer.