Changeset ea75ec2


Ignore:
Timestamp:
10/31/17 17:21:31 (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:
6e16301
Parents:
9cdbedb
Message:

Add new format for receiving and parsing nDAG records

Also added new statistic: missing_records -- this tracks records
that have gone missing between the original capture device and
the current processing host (i.e. lost on the network between the
two). Useful for nDAG as there is a distinction between packets
dropped by the DAG and packets that were not received by the nDAG
client.

Location:
lib
Files:
2 added
5 edited

Legend:

Unmodified
Added
Removed
  • lib/Makefile.am

    red5b2ce rea75ec2  
    6262                protocols_transport.c protocols.h protocols_ospf.c \
    6363                protocols_application.c \
    64                 $(DAGSOURCE) format_erf.h \
     64                $(DAGSOURCE) format_erf.h format_ndag.c format_ndag.h \
    6565                $(BPFJITSOURCE) \
    6666                libtrace_arphrd.h \
  • lib/libtrace.h.in

    red5b2ce rea75ec2  
    393393        TRACE_FORMAT_DPDK     =17, /**< The Intel Data Plane Development Kit format */
    394394        TRACE_FORMAT_PCAPNG     =18,    /**< PCAP-NG trace file */
     395        TRACE_FORMAT_NDAG       =19,    /**< DAG multicast over a network */
    395396};
    396397
     
    13991400        X(dropped) \
    14001401        X(captured) \
     1402        X(missing) \
    14011403        X(errors)
    14021404
     
    14171419         * was alloc'd by us. We can easily decrease the no. bits without
    14181420         * problems as long as we update any asserts as needed */
    1419         LT_BITFIELD64 reserved1: 26; /**< Bits reserved for future fields */
     1421        LT_BITFIELD64 reserved1: 25; /**< Bits reserved for future fields */
    14201422        LT_BITFIELD64 reserved2: 24; /**< Bits reserved for future fields */
    14211423        LT_BITFIELD64 magic: 8; /**< A number stored against the format to
     
    14691471         */
    14701472        uint64_t captured;
     1473
     1474        /** The number of packets (or aggregated records) that have been
     1475         *  lost between the original capture device and the current input
     1476         *  trace.
     1477         *
     1478         *  @note Only relevant for input formats that use a network to
     1479         *  transfer live captured packets from one host to another (e.g.
     1480         *  nDAG).
     1481         */
     1482        uint64_t missing;
    14711483
    14721484        /** The number of packets that have been discarded by the network card
  • lib/libtrace_int.h

    red5b2ce rea75ec2  
    12761276/** Constructor for the ATM Header format module */
    12771277void atmhdr_constructor(void);
     1278/** Constructor for the network DAG format module */
     1279void ndag_constructor(void);
    12781280#ifdef HAVE_BPF
    12791281/** Constructor for the BPF format module */
  • lib/trace.c

    red5b2ce rea75ec2  
    147147                pcapng_constructor();
    148148                rt_constructor();
     149                ndag_constructor();
    149150#ifdef HAVE_DAG
    150151                dag_constructor();
  • lib/trace_parallel.c

    red5b2ce rea75ec2  
    17471747        /* Try start the format - we prefer parallel over single threaded, as
    17481748         * these formats should support messages better */
     1749
    17491750        if (trace_supports_parallel(libtrace) &&
    17501751            !trace_has_dedicated_hasher(libtrace)) {
Note: See TracChangeset for help on using the changeset viewer.