Changeset a360b61


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

Legend:

Unmodified
Added
Removed
  • lib/libtrace.h.in

    red81f74 r9594cf9  
    32573257          */
    32583258          TRACE_DROP_OUT_OF_ORDER,
    3259          
    3260           /**
    3261            * If set to true (i.e. 1) the trace starts a dedicated hasher thread
    3262            */
    3263           TRACE_OPTION_USE_DEDICATED_HASHER,
    3264           TRACE_OPTION_USE_SLIDING_WINDOW_BUFFER,
    32653259
    32663260          /**
  • lib/libtrace_int.h

    r5ba34eb r9594cf9  
    197197// Reduce reads all queues with same key
    198198#define REDUCE_STEPPING 0x10
    199 
    200 #define PERPKT_USE_SLIDING_WINDOW 0x20
    201199
    202200/**
  • lib/trace_parallel.c

    raa5a642 r9594cf9  
    11751175        // If we are using a hasher start it
    11761176        // If single threaded we don't need a hasher
    1177         if (libtrace->perpkt_thread_count > 1 && (libtrace->hasher || libtrace->hasher_thread.type == THREAD_HASHER)) {
     1177        if (libtrace->perpkt_thread_count > 1 && libtrace->hasher && libtrace->hasher_type != HASHER_HARDWARE) {
    11781178                libtrace_thread_t *t = &libtrace->hasher_thread;
    11791179                t->trace = libtrace;
     
    19001900                                libtrace->reducer_flags &= ~REDUCE_ORDERED;
    19011901                        return 1;
    1902                 case TRACE_OPTION_USE_DEDICATED_HASHER:
    1903                         if (*((int *) value))
    1904                                 libtrace->hasher_thread.type = THREAD_HASHER;
    1905                         else
    1906                                 libtrace->hasher_thread.type = THREAD_EMPTY;
    1907                         return 1;
    1908                 case TRACE_OPTION_USE_SLIDING_WINDOW_BUFFER:
    1909                         if (*((int *) value))
    1910                                 libtrace->reducer_flags |= PERPKT_USE_SLIDING_WINDOW;
    1911                         else
    1912                                 libtrace->reducer_flags &= ~PERPKT_USE_SLIDING_WINDOW;
    1913                         return 1;
    19141902                case TRACE_OPTION_TRACETIME:
    19151903                        if(*((int *) value))
  • tools/traceanon/traceanon_parallel.c

    rfac8c46 r9594cf9  
    379379        trace_parallel_config(trace, TRACE_OPTION_SEQUENTIAL, &i);
    380380        //trace_parallel_config(trace, TRACE_OPTION_SET_PERPKT_BUFFER_SIZE, &i);
    381         //trace_parallel_config(trace, TRACE_OPTION_USE_DEDICATED_HASHER, &i);
    382         //trace_parallel_config(trace, TRACE_OPTION_USE_SLIDING_WINDOW_BUFFER, &i);
    383381        i = 2;
    384382        trace_parallel_config(trace, TRACE_OPTION_SET_PERPKT_THREAD_COUNT, &i);
  • tools/tracestats/tracestats_parallel.c

    rfac8c46 r9594cf9  
    228228        int option = 2;
    229229        //option = 10000;
    230         trace_parallel_config(trace, TRACE_OPTION_USE_DEDICATED_HASHER, &option);
    231230        trace_set_hasher(trace, HASHER_CUSTOM, &rand_hash, NULL);
    232         //trace_parallel_config(trace, TRACE_OPTION_USE_SLIDING_WINDOW_BUFFER, &option);
    233231        option = 2;
    234232        trace_parallel_config(trace, TRACE_OPTION_SET_PERPKT_THREAD_COUNT, &option);
Note: See TracChangeset for help on using the changeset viewer.