Changeset 89e2ff7 for lib

Timestamp:

11/25/16 11:18:42 (4 years ago)

Author:

Richard Sanger <rsanger@…>

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:

e3b6476

Parents:

caf7841

Message:

Fix trace_interrupt() with busy traces

Trace interrupt is now checked in the read loop, which also means
it works with trace files.

Fixes #36

Location:

lib

Files:

• trace.c (modified) (1 diff)
• trace_parallel.c (modified) (3 diffs)

lib/trace.c

@@ -921 +921 @@
                         size_t ret;
                         int filtret;
+                        if (libtrace_halt)
+                                return 0;
                         /* Store the trace we are reading from into the packet opaque 
                          * structure */

lib/trace_parallel.c

@@ -788 +788 @@
                 assert(packet);
 
-                if (libtrace_halt) {
-                        packet->error = 0;
-                        break;
-                }
-
                 // Check for messages that we expect MESSAGE_DO_PAUSE, (internal messages only)
                 if (libtrace_message_queue_try_get(&t->messages, &message) != LIBTRACE_MQ_FAILED) {
@@ -892 +887 @@
         /* Read nb_packets */
         for (i = 0; i < nb_packets; ++i) {
-                if (libtrace_halt) {
-                        break;
-                }
                 packets[i]->error = trace_read_packet(libtrace, packets[i]);
 
@@ -1707 +1699 @@
         libtrace->perpkt_threads = NULL;
         /* Set a global which says we are using a parallel trace. This is
-         * for backwards compatability due to changes when destroying packets */
+         * for backwards compatibility due to changes when destroying packets */
         libtrace_parallel = 1;