Changeset 9594cf9


Ignore:
Timestamp:
06/25/14 01:36:21 (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:
a360b61
Parents:
18961094
Message:

Remove sliding window option, this was very complicated to ensure thread safety. For now its best left out.

Files:
5 edited

Legend:

Unmodified
Added
Removed
  • lib/libtrace.h.in

    r18961094 r9594cf9  
    32573257          */
    32583258          TRACE_DROP_OUT_OF_ORDER,
    3259          
    3260           TRACE_OPTION_USE_SLIDING_WINDOW_BUFFER,
    32613259
    32623260          /**
  • 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

    r18961094 r9594cf9  
    19001900                                libtrace->reducer_flags &= ~REDUCE_ORDERED;
    19011901                        return 1;
    1902                 case TRACE_OPTION_USE_SLIDING_WINDOW_BUFFER:
    1903                         if (*((int *) value))
    1904                                 libtrace->reducer_flags |= PERPKT_USE_SLIDING_WINDOW;
    1905                         else
    1906                                 libtrace->reducer_flags &= ~PERPKT_USE_SLIDING_WINDOW;
    1907                         return 1;
    19081902                case TRACE_OPTION_TRACETIME:
    19091903                        if(*((int *) value))
  • tools/traceanon/traceanon_parallel.c

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

    r18961094 r9594cf9  
    229229        //option = 10000;
    230230        trace_set_hasher(trace, HASHER_CUSTOM, &rand_hash, NULL);
    231         //trace_parallel_config(trace, TRACE_OPTION_USE_SLIDING_WINDOW_BUFFER, &option);
    232231        option = 2;
    233232        trace_parallel_config(trace, TRACE_OPTION_SET_PERPKT_THREAD_COUNT, &option);
Note: See TracChangeset for help on using the changeset viewer.