Changeset f0e8bd6 for lib/trace_parallel.c

Timestamp:

08/19/14 19:36:48 (7 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:

50b1bee

Parents:

5b4d121

Message:

Fixes reporter function bug.
Links configuration option for threads via the configuration struct.

File:

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

lib/trace_parallel.c

@@ -1510 +1510 @@
                 libtrace->config.hasher_queue_size = 1000;
 
-        if (libtrace->perpkt_thread_count <= 0) {
+        if (libtrace->config.perpkt_threads <= 0) {
                 // TODO add BSD support
                 libtrace->perpkt_thread_count = sysconf(_SC_NPROCESSORS_ONLN);
@@ -1516 +1516 @@
                         // Lets just use one
                         libtrace->perpkt_thread_count = 1;
+        } else {
+                libtrace->perpkt_thread_count = libtrace->config.perpkt_threads;
         }
 
@@ -2065 +2067 @@
 
         libtrace_result_set_key_value(&res, key, value);
+
         /*
         if (count == 1)
@@ -2074 +2077 @@
                 printf("My vector size is %d\n", libtrace_deque_get_size(&t->deque));
         count = (count+1)%1000;*/
+
         if (libtrace->reporter_flags & (REDUCE_SEQUENTIAL | REDUCE_ORDERED)) {
                 if (libtrace_deque_get_size(&t->deque) >= libtrace->config.reporter_thold) {
@@ -2140 +2144 @@
                 while ((live_count == libtrace->perpkt_thread_count) || (live_count &&
                                 ((flags & REDUCE_SEQUENTIAL && min_key == libtrace->expected_key) ||
-                                libtrace->state == STATE_JOINED))) {
+                                trace_finished(libtrace)))) {
                         /* Get the minimum queue and then do stuff */
                         libtrace_result_t r;
@@ -2224 +2228 @@
                         return trace_set_hasher(libtrace, (enum hasher_types) *((int *) value), NULL, NULL);
                 case TRACE_OPTION_SET_PERPKT_THREAD_COUNT:
-                        libtrace->perpkt_thread_count = *((int *) value);
+                        libtrace->config.perpkt_threads = *((int *) value);
                         return 1;
                 case TRACE_DROP_OUT_OF_ORDER: