Changeset a360b61

Timestamp:

06/25/14 01:37:32 (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:

59ef093

Parents:

aa5a642 (diff), 9594cf9 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'TidyConfiguration?' into develop

Files:

• lib/libtrace.h.in (modified) (1 diff)
• lib/libtrace_int.h (modified) (1 diff)
• lib/trace_parallel.c (modified) (2 diffs)
• tools/traceanon/traceanon_parallel.c (modified) (1 diff)
• tools/tracestats/tracestats_parallel.c (modified) (1 diff)

lib/libtrace.h.in

@@ -3257 +3257 @@
           */
           TRACE_DROP_OUT_OF_ORDER,
-          
-          /**
-           * If set to true (i.e. 1) the trace starts a dedicated hasher thread
-           */
-          TRACE_OPTION_USE_DEDICATED_HASHER,
-          TRACE_OPTION_USE_SLIDING_WINDOW_BUFFER,
 
           /**

lib/libtrace_int.h

@@ -197 +197 @@
 // Reduce reads all queues with same key
 #define REDUCE_STEPPING 0x10
-
-#define PERPKT_USE_SLIDING_WINDOW 0x20
 
 /**

lib/trace_parallel.c

@@ -1175 +1175 @@
         // If we are using a hasher start it
         // If single threaded we don't need a hasher
-        if (libtrace->perpkt_thread_count > 1 && (libtrace->hasher || libtrace->hasher_thread.type == THREAD_HASHER)) {
+        if (libtrace->perpkt_thread_count > 1 && libtrace->hasher && libtrace->hasher_type != HASHER_HARDWARE) {
                 libtrace_thread_t *t = &libtrace->hasher_thread;
                 t->trace = libtrace;
@@ -1900 +1900 @@
                                 libtrace->reducer_flags &= ~REDUCE_ORDERED;
                         return 1;
-                case TRACE_OPTION_USE_DEDICATED_HASHER:
-                        if (*((int *) value))
-                                libtrace->hasher_thread.type = THREAD_HASHER;
-                        else
-                                libtrace->hasher_thread.type = THREAD_EMPTY;
-                        return 1;
-                case TRACE_OPTION_USE_SLIDING_WINDOW_BUFFER:
-                        if (*((int *) value))
-                                libtrace->reducer_flags |= PERPKT_USE_SLIDING_WINDOW;
-                        else
-                                libtrace->reducer_flags &= ~PERPKT_USE_SLIDING_WINDOW;
-                        return 1;
                 case TRACE_OPTION_TRACETIME:
                         if(*((int *) value))

tools/traceanon/traceanon_parallel.c

@@ -379 +379 @@
         trace_parallel_config(trace, TRACE_OPTION_SEQUENTIAL, &i);
         //trace_parallel_config(trace, TRACE_OPTION_SET_PERPKT_BUFFER_SIZE, &i);
-        //trace_parallel_config(trace, TRACE_OPTION_USE_DEDICATED_HASHER, &i);
-        //trace_parallel_config(trace, TRACE_OPTION_USE_SLIDING_WINDOW_BUFFER, &i);
         i = 2;
         trace_parallel_config(trace, TRACE_OPTION_SET_PERPKT_THREAD_COUNT, &i);

tools/tracestats/tracestats_parallel.c

@@ -228 +228 @@
         int option = 2;
         //option = 10000;
-        trace_parallel_config(trace, TRACE_OPTION_USE_DEDICATED_HASHER, &option);
         trace_set_hasher(trace, HASHER_CUSTOM, &rand_hash, NULL);
-        //trace_parallel_config(trace, TRACE_OPTION_USE_SLIDING_WINDOW_BUFFER, &option);
         option = 2;
         trace_parallel_config(trace, TRACE_OPTION_SET_PERPKT_THREAD_COUNT, &option);