Changeset 59ef093
- Timestamp:
- 06/25/14 02:04:40 (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:
- 3296252
- Parents:
- a360b61
- Files:
-
- 4 added
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
lib/hash_toeplitz.c
r5ba34eb r59ef093 10 10 #include <stdlib.h> 11 11 #include <time.h> 12 12 #include <stdio.h> 13 13 14 static inline uint8_t get_bit(uint8_t byte, size_t num) { 14 15 return byte & (0x80>>num); -
lib/trace_parallel.c
r9594cf9 r59ef093 222 222 */ 223 223 static void trace_thread_pause(libtrace_t *trace) { 224 printf("Pausing thread #%d\n", get_thread_table_num(trace));224 //printf("Pausing thread #%d\n", get_thread_table_num(trace)); 225 225 trace_make_results_packets_safe(trace); 226 226 assert(pthread_mutex_lock(&trace->libtrace_lock) == 0); … … 233 233 pthread_cond_broadcast(&trace->perpkt_cond); 234 234 assert(pthread_mutex_unlock(&trace->libtrace_lock) == 0); 235 printf("Releasing thread #%d\n", get_thread_table_num(trace));235 //printf("Releasing thread #%d\n", get_thread_table_num(trace)); 236 236 } 237 237 … … 1068 1068 /* We don't care about which core a packet goes to */ 1069 1069 ret = trace_pread_packet_first_in_first_served(libtrace, packet); 1070 } /* else if (libtrace->reducer_flags & PERPKT_USE_SLIDING_WINDOW) { 1071 ret = trace_pread_packet_sliding_window(libtrace, packet); 1072 } else { 1070 } /* else { 1073 1071 ret = trace_pread_packet_hash_locked(libtrace, packet); 1074 1072 }*/ … … 1165 1163 fprintf(stderr, "WARNING deadlocks may occur and extra memory allocating buffer sizes (packet_freelist_size) mismatched\n"); 1166 1164 1167 libtrace->started =true; // Before we start the threads otherwise we could have issues1165 libtrace->started = true; // Before we start the threads otherwise we could have issues 1168 1166 libtrace->state = STATE_RUNNING; 1169 1167 /* Disable signals - Pthread signal handling */ … … 1503 1501 fprintf(stderr, "Waiting to join with the hasher\n"); 1504 1502 pthread_join(libtrace->hasher_thread.tid, NULL); 1505 fprintf(stderr, "Joined with withthe hasher\n");1503 fprintf(stderr, "Joined with the hasher\n"); 1506 1504 libtrace->hasher_thread.state = THREAD_FINISHED; 1507 1505 } -
test/Makefile
r014f733 r59ef093 11 11 LDLIBS = -L$(PREFIX)/lib/.libs -L$(PREFIX)/libpacketdump/.libs -ltrace -lpacketdump 12 12 13 BINS_DATASTRUCT = test-datastruct-vector test-datastruct-deque test-datastruct-ringbuffer 13 BINS_DATASTRUCT = test-datastruct-vector test-datastruct-deque \ 14 test-datastruct-ringbuffer 15 BINS_PARALLEL = test-format-parallel test-format-parallel-hasher \ 16 test-format-parallel-singlethreaded test-format-parallel-stressthreads \ 17 test-format-parallel-singlethreaded-hasher 14 18 15 19 BINS = test-pcap-bpf test-event test-time test-dir test-wireless test-errors \ 16 test-plen test-autodetect $(BINS_DATASTRUCT) 20 test-plen test-autodetect $(BINS_DATASTRUCT) $(BINS_PARALLEL) 17 21 18 22 .PHONY: all clean distclean install depend test 19 23 20 all: $(BINS) test-drops test-format test- format-parallel test-decode test-decode2 test-write test-convert test-convert224 all: $(BINS) test-drops test-format test-decode test-decode2 test-write test-convert test-convert2 21 25 22 26 clean: 23 $(RM) $(BINS) $(OBJS) test-format test- format-parallel test-decode test-convert \27 $(RM) $(BINS) $(OBJS) test-format test-decode test-convert \ 24 28 test-decode2 test-write test-drops test-convert2 25 29 26 30 distclean: 27 $(RM) $(BINS) $(OBJS) test-format test- format-parallel test-decode test-convert test-drops test-convert231 $(RM) $(BINS) $(OBJS) test-format test-decode test-convert test-drops test-convert2 28 32 29 33 install: -
test/do-tests-parallel.sh
r014f733 r59ef093 20 20 echo \* Read erf 21 21 do_test ./test-format-parallel erf 22 do_test ./test-decode erf23 22 24 23 echo \* Read pcap 25 24 do_test ./test-format-parallel pcap 26 do_test ./test-decode pcap27 25 28 26 echo \* Read pcapfile 29 27 do_test ./test-format-parallel pcapfile 30 do_test ./test-decode pcapfile31 28 32 29 echo \* Read pcapfilens 33 30 do_test ./test-format-parallel pcapfilens 34 do_test ./test-decode pcapfilens35 31 36 32 echo \* Read legacyatm 37 33 do_test ./test-format-parallel legacyatm 38 do_test ./test-decode legacyatm39 34 40 35 echo \* Read legacyeth 41 36 do_test ./test-format-parallel legacyeth 42 do_test ./test-decode legacyeth43 37 44 38 echo \* Read legacypos 45 39 do_test ./test-format-parallel legacypos 46 do_test ./test-decode legacypos47 40 48 41 echo \* Read tsh 49 42 do_test ./test-format-parallel tsh 50 do_test ./test-decode tsh51 43 52 44 echo \* Read rawerf 53 45 do_test ./test-format-parallel rawerf 54 do_test ./test-decode rawerf55 46 47 echo \* Read testing hasher function 48 do_test ./test-format-parallel-hasher erf 49 50 echo \* Read testing single-threaded datapath 51 do_test ./test-format-parallel-singlethreaded erf 52 53 echo \* Read testing single-threaded hasher datapath 54 do_test ./test-format-parallel-singlethreaded-hasher erf 55 56 echo \* Read stress testing with 100 threads 57 do_test ./test-format-parallel-stressthreads erf 56 58 57 59 echo -
test/test-format-parallel.c
r014f733 r59ef093 115 115 116 116 if (pkt) { 117 int a,*b,c ;117 int a,*b,c=0; 118 118 assert(tls != NULL); 119 119 assert(!seen_stop_message);
Note: See TracChangeset
for help on using the changeset viewer.