Changeset 18961094


Ignore:
Timestamp:
06/25/14 00:24:20 (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:
9594cf9
Parents:
aa5a642
Message:

Removes the DEDICATED HASHER option, since this is always automatically inferred from the settings.

Files:
4 edited

Legend:

Unmodified
Added
Removed
  • lib/libtrace.h.in

    red81f74 r18961094  
    32583258          TRACE_DROP_OUT_OF_ORDER,
    32593259         
    3260           /**
    3261            * If set to true (i.e. 1) the trace starts a dedicated hasher thread
    3262            */
    3263           TRACE_OPTION_USE_DEDICATED_HASHER,
    32643260          TRACE_OPTION_USE_SLIDING_WINDOW_BUFFER,
    32653261
  • lib/trace_parallel.c

    raa5a642 r18961094  
    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;
    19081902                case TRACE_OPTION_USE_SLIDING_WINDOW_BUFFER:
    19091903                        if (*((int *) value))
  • tools/traceanon/traceanon_parallel.c

    rfac8c46 r18961094  
    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);
    382381        //trace_parallel_config(trace, TRACE_OPTION_USE_SLIDING_WINDOW_BUFFER, &i);
    383382        i = 2;
  • tools/tracestats/tracestats_parallel.c

    rfac8c46 r18961094  
    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);
    232231        //trace_parallel_config(trace, TRACE_OPTION_USE_SLIDING_WINDOW_BUFFER, &option);
Note: See TracChangeset for help on using the changeset viewer.