Changeset b54e2da

Timestamp:

03/12/15 15:51:29 (6 years ago)

Author:

Richard Sanger <rsangerarj@…>

Branches:

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

Children:

6a6e6a8

Parents:

2330f32

Message:

Fix bug in pausing trace

Packets were incorrectly being sent in tracetime in some cases.

File:

• lib/trace_parallel.c (modified) (3 diffs)

lib/trace_parallel.c

@@ -376 +376 @@
  * @param packet A pointer to the packet storage, which may be set to null upon
  *               return, or a packet to be finished.
+ * @param tracetime If true packets are delayed to match with tracetime
  * @return 0 is successful, otherwise if playing back in tracetime
  *         READ_MESSAGE(-2) can be returned in which case the packet is not sent.
@@ -414 +415 @@
  * upon return this is updated
  * @param offset [in,out] The offset into the array, upon return this is updated
+ * @param tracetime If true packets are delayed to match with tracetime
  * @return 0 is successful, otherwise if playing back in tracetime
  *         READ_MESSAGE(-2) can be returned in which case the packet is not sent.
@@ -484 +486 @@
                                         store_first_packet(trace, packet, t);
                                 }
-                                ASSERT_RET(dispatch_packet(trace, t, &packet, 1), == 0);
+                                ASSERT_RET(dispatch_packet(trace, t, &packet, false), == 0);
                                 if (packet == NULL)
                                         libtrace_ocache_alloc(&trace->packet_freelist, (void **) &packet, 1, 1);