Changeset d994324 for lib/combiner_unordered.c

Timestamp:

09/17/14 13:45:29 (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:

9e429e8

Parents:

2498008

Message:

Remove anything to do with the combiner from set configuration and removes any options/storage related to these such as the next expected packet.

Instead this is done using trace_set_combiner now, and the for the built-in combiners.h header. This is a lot more flexible and allows the users to specify there own combiner, and any number of options for it.

File:

• lib/combiner_unordered.c (modified) (2 diffs)

lib/combiner_unordered.c

@@ -51 +51 @@
 }
 
-const libtrace_combine_t combiner_unordered = {
+DLLEXPORT const libtrace_combine_t combiner_unordered = {
     init_combiner,      /* initialise */
         destroy,                /* destroy */
@@ -59 +59 @@
     read,                       /* pause */
     NULL,                       /* queues */
-    0                           /* opts */
+    {0}                         /* opts */
 };