Changeset fac8c46 for lib/data-struct/message_queue.c

Timestamp:

05/20/14 03:25:13 (8 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:

82facc5

Parents:

a5662447

Message:

Tidies up the pausing so that it now works as expected and a trace can easily be paused and restarted.
Ensures that packets will not be lost if pause is called on a file, any queued packets will be read (a message is sent allowing the user to drop these packets if they are unwanted).
Differentiates packets from other results in the queues to the reducer/reporter and makes a copy of the packets in result queues when pausing

• this is needed to ensure that bad memory isn't referenced if a zero-copy trace is paused by closing sockets/associated data like in the case of ring:.

Fixed up the re-starting of traces which hadn't been finished to account for different configurations.
Adds a 'state' to libtrace to handle the state of parallel traces, rather than hacking around the existing 'started' boolean. Also provides two levels of checks for consistency if the trace is using existing that are checking started.

Various other bug fixes and tidy ups.

File:

• lib/data-struct/message_queue.c (modified) (2 diffs)

lib/data-struct/message_queue.c

@@ -18 +18 @@
 inline void libtrace_message_queue_init(libtrace_message_queue_t *mq, size_t message_len)
 {
+        assert(message_len);
         assert(pipe(mq->pipefd) != -1);
         mq->message_count = 0;
@@ -43 +44 @@
 {
         int ret;
+        assert(mq->message_len);
         assert(write(mq->pipefd[1], message, mq->message_len) == (int) mq->message_len);
         // Update after we've written