Changeset a360b61
- Timestamp:
- 06/25/14 01:37:32 (7 years ago)
- 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. - Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
lib/libtrace.h.in
red81f74 r9594cf9 3257 3257 */ 3258 3258 TRACE_DROP_OUT_OF_ORDER, 3259 3260 /**3261 * If set to true (i.e. 1) the trace starts a dedicated hasher thread3262 */3263 TRACE_OPTION_USE_DEDICATED_HASHER,3264 TRACE_OPTION_USE_SLIDING_WINDOW_BUFFER,3265 3259 3266 3260 /** -
lib/libtrace_int.h
r5ba34eb r9594cf9 197 197 // Reduce reads all queues with same key 198 198 #define REDUCE_STEPPING 0x10 199 200 #define PERPKT_USE_SLIDING_WINDOW 0x20201 199 202 200 /** -
lib/trace_parallel.c
raa5a642 r9594cf9 1175 1175 // If we are using a hasher start it 1176 1176 // 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) { 1178 1178 libtrace_thread_t *t = &libtrace->hasher_thread; 1179 1179 t->trace = libtrace; … … 1900 1900 libtrace->reducer_flags &= ~REDUCE_ORDERED; 1901 1901 return 1; 1902 case TRACE_OPTION_USE_DEDICATED_HASHER:1903 if (*((int *) value))1904 libtrace->hasher_thread.type = THREAD_HASHER;1905 else1906 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 else1912 libtrace->reducer_flags &= ~PERPKT_USE_SLIDING_WINDOW;1913 return 1;1914 1902 case TRACE_OPTION_TRACETIME: 1915 1903 if(*((int *) value)) -
tools/traceanon/traceanon_parallel.c
rfac8c46 r9594cf9 379 379 trace_parallel_config(trace, TRACE_OPTION_SEQUENTIAL, &i); 380 380 //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);383 381 i = 2; 384 382 trace_parallel_config(trace, TRACE_OPTION_SET_PERPKT_THREAD_COUNT, &i); -
tools/tracestats/tracestats_parallel.c
rfac8c46 r9594cf9 228 228 int option = 2; 229 229 //option = 10000; 230 trace_parallel_config(trace, TRACE_OPTION_USE_DEDICATED_HASHER, &option);231 230 trace_set_hasher(trace, HASHER_CUSTOM, &rand_hash, NULL); 232 //trace_parallel_config(trace, TRACE_OPTION_USE_SLIDING_WINDOW_BUFFER, &option);233 231 option = 2; 234 232 trace_parallel_config(trace, TRACE_OPTION_SET_PERPKT_THREAD_COUNT, &option);
Note: See TracChangeset
for help on using the changeset viewer.