Changeset 4edb310 for lib

Timestamp:

01/05/17 13:32:38 (4 years ago)

Author:

Shane Alcock <salcock@…>

Branches:

4.0.1-hotfixes, cachetimestamps, develop, dpdk-ndag, etsilive, master, ndag_format, rc-4.0.1, rc-4.0.2, rc-4.0.3, rc-4.0.4, ringdecrementfix, ringperformance, ringtimestampfixes

Children:

2d4e055

Parents:

cff1819 (diff), 47c4490 (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 'develop' of ​https://github.com/wanduow/libtrace into develop

Location:

lib

Files:

• format_linux_ring.c (modified) (5 diffs)
• trace.c (modified) (6 diffs)
• trace_parallel.c (modified) (1 diff)

lib/format_linux_ring.c

@@ -447 +447 @@
 #ifdef HAVE_NETPACKET_PACKET_H
 #define LIBTRACE_MIN(a,b) ((a)<(b) ? (a) : (b))
+/* We use TP_STATUS_LIBTRACE to ensure we don't loop back on ourself
+ * and read the same packet twice if an old packet has not yet been freed */
+#define TP_STATUS_LIBTRACE 0xFFFFFFFF
+
 inline static int linuxring_read_stream(libtrace_t *libtrace,
                                         libtrace_packet_t *packet,
@@ -470 +474 @@
          * ready for consumption.
          */
-        while (!(header->tp_status & TP_STATUS_USER)) {
+        while (!(header->tp_status & TP_STATUS_USER) ||
+               header->tp_status == TP_STATUS_LIBTRACE) {
+                if ((ret=is_halted(libtrace)) != -1)
+                        return ret;
                 pollset[0].fd = stream->fd;
                 pollset[0].events = POLLIN;
@@ -509 +516 @@
                         }
                 } else {
-                        /* Poll timed out - check if we should exit */
-                        if ((ret=is_halted(libtrace)) != -1)
-                                return ret;
+                        /* Poll timed out - check if we should exit on next loop */
                         continue;
                 }
@@ -518 +523 @@
         packet->buffer = header;
         packet->trace = libtrace;
+        header->tp_status = TP_STATUS_LIBTRACE;
 
         /* If a snaplen was configured, automatically truncate the packet to
@@ -574 +580 @@
         /* Fetch the current frame */
         header = GET_CURRENT_BUFFER(FORMAT_DATA_FIRST);
-        if (header->tp_status & TP_STATUS_USER) {
+        if (header->tp_status & TP_STATUS_USER &&
+            header->tp_status != TP_STATUS_LIBTRACE) {
                 /* We have a frame waiting */
                 event.size = trace_read_packet(libtrace, packet);

lib/trace.c

@@ -550 +550 @@
 
         /* Finish the last packet we read - for backwards compatibility */
-        if (libtrace->last_packet)
+        if (!libtrace_parallel && libtrace->last_packet)
                 trace_fin_packet(libtrace->last_packet);
         assert(libtrace->last_packet == NULL);
@@ -697 +697 @@
 
         /* Finish any the last packet we read - for backwards compatibility */
-        if (libtrace->last_packet) {
+        if (!libtrace_parallel && libtrace->last_packet) {
                 trace_fin_packet(libtrace->last_packet);
         }
@@ -837 +837 @@
                 packet->trace->format->fin_packet(packet);
         }
-        if (packet->trace && packet->trace->last_packet == packet)
+        if (!libtrace_parallel && packet->trace &&
+             packet->trace->last_packet == packet) {
                 packet->trace->last_packet = NULL;
+        }
         
         if (packet->buf_control == TRACE_CTRL_PACKET && packet->buffer) {
@@ -868 +870 @@
 
                 if (packet->trace) {
-                        pthread_mutex_lock(&packet->trace->libtrace_lock);
-                        if (packet->trace->last_packet == packet)
-                                packet->trace->last_packet = NULL;
-                        pthread_mutex_unlock(&packet->trace->libtrace_lock);
+                        if (!libtrace_parallel && packet->trace->last_packet == packet)
+                                packet->trace->last_packet = NULL;
                 }
 
@@ -960 +960 @@
                         ++libtrace->accepted_packets;
                         ++libtrace->sequence_number;
-                        if (packet->trace == libtrace)
+                        if (!libtrace_parallel && packet->trace == libtrace)
                                 libtrace->last_packet = packet;
 
@@ -1003 +1003 @@
 
         packet->trace = trace;
-        pthread_mutex_lock(&trace->libtrace_lock);
-        trace->last_packet = packet;
-        pthread_mutex_unlock(&trace->libtrace_lock);
+        if (!libtrace_parallel)
+                trace->last_packet = packet;
         /* Clear packet cache */
         trace_clear_cache(packet);

lib/trace_parallel.c

@@ -1733 +1733 @@
                 if (libtrace->perpkt_thread_count > 1)
                         libtrace->pread = trace_pread_packet_first_in_first_served;
+                        /* Don't wait for a burst of packets if the format is
+                         * live as this could block ring based formats and
+                         * introduces delay. */
+                        if (libtrace->format->info.live) {
+                                libtrace->config.burst_size = 1;
+                        }
                 else
                         /* Use standard read_packet */