Changeset 9d00fb13

Timestamp:

11/14/17 14:32:21 (3 years ago)

Author:

Shane Alcock <salcock@…>

Branches:

cachetimestamps, develop, dpdk-ndag, etsilive, master, rc-4.0.2, rc-4.0.3, rc-4.0.4, ringdecrementfix, ringperformance

Children:

31da9bb, e26bd1a

Parents:

5732e9b (diff), 7e09388 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'ndag_format' into develop

Location:

lib

Files:

• Makefile.am (modified) (1 diff)
• format_erf.c (modified) (1 diff)
• format_ndag.c (added)
• format_ndag.h (added)
• libtrace.h.in (modified) (4 diffs)
• libtrace_int.h (modified) (1 diff)
• trace.c (modified) (1 diff)
• trace_parallel.c (modified) (1 diff)

lib/Makefile.am

@@ -62 +62 @@
                 protocols_transport.c protocols.h protocols_ospf.c \
                 protocols_application.c \
-                $(DAGSOURCE) format_erf.h \
+                $(DAGSOURCE) format_erf.h format_ndag.c format_ndag.h \
                 $(BPFJITSOURCE) \
                 libtrace_arphrd.h \

lib/format_erf.c

@@ -126 +126 @@
 static int erf_get_padding(const libtrace_packet_t *packet)
 {
-        if (packet->trace->format->type==TRACE_FORMAT_ERF) {
+        if (packet->trace->format->type==TRACE_FORMAT_ERF ||
+                        packet->trace->format->type == TRACE_FORMAT_NDAG ||
+                        packet->trace->format->type == TRACE_FORMAT_RAWERF) {
                 dag_record_t *erfptr = (dag_record_t *)packet->header;
                 switch((erfptr->type & 0x7f)) {

lib/libtrace.h.in

@@ -393 +393 @@
         TRACE_FORMAT_DPDK     =17, /**< The Intel Data Plane Development Kit format */
         TRACE_FORMAT_PCAPNG     =18,    /**< PCAP-NG trace file */
+        TRACE_FORMAT_NDAG       =19,    /**< DAG multicast over a network */
 };
 
@@ -1399 +1400 @@
         X(dropped) \
         X(captured) \
+        X(missing) \
         X(errors)
 
@@ -1417 +1419 @@
          * was alloc'd by us. We can easily decrease the no. bits without
          * problems as long as we update any asserts as needed */
-        LT_BITFIELD64 reserved1: 26; /**< Bits reserved for future fields */
+        LT_BITFIELD64 reserved1: 25; /**< Bits reserved for future fields */
         LT_BITFIELD64 reserved2: 24; /**< Bits reserved for future fields */
         LT_BITFIELD64 magic: 8; /**< A number stored against the format to
@@ -1469 +1471 @@
          */
         uint64_t captured;
+
+        /** The number of packets (or aggregated records) that have been
+         *  lost between the original capture device and the current input
+         *  trace.
+         *
+         *  @note Only relevant for input formats that use a network to
+         *  transfer live captured packets from one host to another (e.g.
+         *  nDAG).
+         */
+        uint64_t missing;
 
         /** The number of packets that have been discarded by the network card

lib/libtrace_int.h

@@ -1276 +1276 @@
 /** Constructor for the ATM Header format module */
 void atmhdr_constructor(void);
+/** Constructor for the network DAG format module */
+void ndag_constructor(void);
 #ifdef HAVE_BPF
 /** Constructor for the BPF format module */

lib/trace.c

@@ -147 +147 @@
                 pcapng_constructor();
                 rt_constructor();
+                ndag_constructor();
 #ifdef HAVE_DAG
                 dag_constructor();

lib/trace_parallel.c

@@ -1747 +1747 @@
         /* Try start the format - we prefer parallel over single threaded, as
          * these formats should support messages better */
+
         if (trace_supports_parallel(libtrace) &&
             !trace_has_dedicated_hasher(libtrace)) {