Changeset 9d00fb13
- Timestamp:
- 11/14/17 14:32:21 (3 years ago)
- 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. - Location:
- lib
- Files:
-
- 2 added
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
lib/Makefile.am
red5b2ce rea75ec2 62 62 protocols_transport.c protocols.h protocols_ospf.c \ 63 63 protocols_application.c \ 64 $(DAGSOURCE) format_erf.h \64 $(DAGSOURCE) format_erf.h format_ndag.c format_ndag.h \ 65 65 $(BPFJITSOURCE) \ 66 66 libtrace_arphrd.h \ -
lib/format_erf.c
ree6e802 r0317e3c 126 126 static int erf_get_padding(const libtrace_packet_t *packet) 127 127 { 128 if (packet->trace->format->type==TRACE_FORMAT_ERF) { 128 if (packet->trace->format->type==TRACE_FORMAT_ERF || 129 packet->trace->format->type == TRACE_FORMAT_NDAG || 130 packet->trace->format->type == TRACE_FORMAT_RAWERF) { 129 131 dag_record_t *erfptr = (dag_record_t *)packet->header; 130 132 switch((erfptr->type & 0x7f)) { -
lib/libtrace.h.in
red5b2ce rea75ec2 393 393 TRACE_FORMAT_DPDK =17, /**< The Intel Data Plane Development Kit format */ 394 394 TRACE_FORMAT_PCAPNG =18, /**< PCAP-NG trace file */ 395 TRACE_FORMAT_NDAG =19, /**< DAG multicast over a network */ 395 396 }; 396 397 … … 1399 1400 X(dropped) \ 1400 1401 X(captured) \ 1402 X(missing) \ 1401 1403 X(errors) 1402 1404 … … 1417 1419 * was alloc'd by us. We can easily decrease the no. bits without 1418 1420 * problems as long as we update any asserts as needed */ 1419 LT_BITFIELD64 reserved1: 2 6; /**< Bits reserved for future fields */1421 LT_BITFIELD64 reserved1: 25; /**< Bits reserved for future fields */ 1420 1422 LT_BITFIELD64 reserved2: 24; /**< Bits reserved for future fields */ 1421 1423 LT_BITFIELD64 magic: 8; /**< A number stored against the format to … … 1469 1471 */ 1470 1472 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; 1471 1483 1472 1484 /** The number of packets that have been discarded by the network card -
lib/libtrace_int.h
red5b2ce rea75ec2 1276 1276 /** Constructor for the ATM Header format module */ 1277 1277 void atmhdr_constructor(void); 1278 /** Constructor for the network DAG format module */ 1279 void ndag_constructor(void); 1278 1280 #ifdef HAVE_BPF 1279 1281 /** Constructor for the BPF format module */ -
lib/trace.c
red5b2ce rea75ec2 147 147 pcapng_constructor(); 148 148 rt_constructor(); 149 ndag_constructor(); 149 150 #ifdef HAVE_DAG 150 151 dag_constructor(); -
lib/trace_parallel.c
red5b2ce rea75ec2 1747 1747 /* Try start the format - we prefer parallel over single threaded, as 1748 1748 * these formats should support messages better */ 1749 1749 1750 if (trace_supports_parallel(libtrace) && 1750 1751 !trace_has_dedicated_hasher(libtrace)) {
Note: See TracChangeset
for help on using the changeset viewer.