Changeset f8613e4

Timestamp:

12/12/16 15:56:26 (4 years ago)

Author:

GitHub <noreply@…>

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:

47c4490

Parents:

5e3f16c (diff), adb2c4c (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.

git-author:

Shane Alcock <salcock@…> (12/12/16 15:56:26)

git-committer:

GitHub <noreply@…> (12/12/16 15:56:26)

Message:

Merge pull request #41 from wanduow/remove_packet_locks

Remove mutex in the packet path, which limits performance

File:

• lib/trace.c (modified) (6 diffs)

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);