Changeset 59ef093

Timestamp:

06/25/14 02:04:40 (7 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:

3296252

Parents:

a360b61

Message:

Adds more tests

• Test hashing function is used
• Test single threaded path works
• Stress test with 100 threads
• Test hash+singlethreaded works

Additionally fixes some bugs/compile warnings and removes some verbose debug printing

Files:

• lib/hash_toeplitz.c (modified) (1 diff)
• lib/trace_parallel.c (modified) (5 diffs)
• test/Makefile (modified) (1 diff)
• test/do-tests-parallel.sh (modified) (1 diff)
• test/test-format-parallel-hasher.c (added)
• test/test-format-parallel-singlethreaded-hasher.c (added)
• test/test-format-parallel-singlethreaded.c (added)
• test/test-format-parallel-stressthreads.c (added)
• test/test-format-parallel.c (modified) (1 diff)

lib/hash_toeplitz.c

@@ -10 +10 @@
 #include <stdlib.h>
 #include <time.h>
-
+#include <stdio.h>
+ 
 static inline uint8_t get_bit(uint8_t byte, size_t num) {
         return byte & (0x80>>num);

lib/trace_parallel.c

@@ -222 +222 @@
  */
 static void trace_thread_pause(libtrace_t *trace) {
-        printf("Pausing thread #%d\n", get_thread_table_num(trace));
+        //printf("Pausing thread #%d\n", get_thread_table_num(trace));
         trace_make_results_packets_safe(trace);
         assert(pthread_mutex_lock(&trace->libtrace_lock) == 0);
@@ -233 +233 @@
         pthread_cond_broadcast(&trace->perpkt_cond);
         assert(pthread_mutex_unlock(&trace->libtrace_lock) == 0);
-        printf("Releasing thread #%d\n", get_thread_table_num(trace));
+        //printf("Releasing thread #%d\n", get_thread_table_num(trace));
 }
 
@@ -1068 +1068 @@
                 /* We don't care about which core a packet goes to */
                 ret = trace_pread_packet_first_in_first_served(libtrace, packet);
-        } /* else if (libtrace->reducer_flags & PERPKT_USE_SLIDING_WINDOW) {
-                ret = trace_pread_packet_sliding_window(libtrace, packet);
-        } else {
+        } /* else {
                 ret = trace_pread_packet_hash_locked(libtrace, packet);
         }*/
@@ -1165 +1163 @@
                 fprintf(stderr, "WARNING deadlocks may occur and extra memory allocating buffer sizes (packet_freelist_size) mismatched\n");
 
-        libtrace->started=true; // Before we start the threads otherwise we could have issues
+        libtrace->started = true; // Before we start the threads otherwise we could have issues
         libtrace->state = STATE_RUNNING;
         /* Disable signals - Pthread signal handling */
@@ -1503 +1501 @@
                 fprintf(stderr, "Waiting to join with the hasher\n");
                 pthread_join(libtrace->hasher_thread.tid, NULL);
-                fprintf(stderr, "Joined with with the hasher\n");
+                fprintf(stderr, "Joined with the hasher\n");
                 libtrace->hasher_thread.state = THREAD_FINISHED;
         }

test/Makefile

@@ -11 +11 @@
 LDLIBS = -L$(PREFIX)/lib/.libs -L$(PREFIX)/libpacketdump/.libs -ltrace -lpacketdump 
 
-BINS_DATASTRUCT = test-datastruct-vector test-datastruct-deque test-datastruct-ringbuffer
+BINS_DATASTRUCT = test-datastruct-vector test-datastruct-deque \
+        test-datastruct-ringbuffer
+BINS_PARALLEL = test-format-parallel test-format-parallel-hasher \
+        test-format-parallel-singlethreaded test-format-parallel-stressthreads \
+        test-format-parallel-singlethreaded-hasher
 
 BINS = test-pcap-bpf test-event test-time test-dir test-wireless test-errors \
-        test-plen test-autodetect $(BINS_DATASTRUCT)
+        test-plen test-autodetect $(BINS_DATASTRUCT) $(BINS_PARALLEL)
 
 .PHONY: all clean distclean install depend test
 
-all: $(BINS) test-drops test-format test-format-parallel test-decode test-decode2 test-write test-convert test-convert2
+all: $(BINS) test-drops test-format test-decode test-decode2 test-write test-convert test-convert2
 
 clean:
-        $(RM) $(BINS) $(OBJS) test-format test-format-parallel test-decode test-convert \
+        $(RM) $(BINS) $(OBJS) test-format test-decode test-convert \
         test-decode2 test-write test-drops test-convert2
 
 distclean:
-        $(RM) $(BINS) $(OBJS) test-format test-format-parallel test-decode test-convert test-drops test-convert2
+        $(RM) $(BINS) $(OBJS) test-format test-decode test-convert test-drops test-convert2
 
 install:

test/do-tests-parallel.sh

@@ -20 +20 @@
 echo \* Read erf
 do_test ./test-format-parallel erf
-do_test ./test-decode erf
 
 echo \* Read pcap
 do_test ./test-format-parallel pcap
-do_test ./test-decode pcap
 
 echo \* Read pcapfile
 do_test ./test-format-parallel pcapfile
-do_test ./test-decode pcapfile
 
 echo \* Read pcapfilens
 do_test ./test-format-parallel pcapfilens
-do_test ./test-decode pcapfilens
 
 echo \* Read legacyatm
 do_test ./test-format-parallel legacyatm
-do_test ./test-decode legacyatm
 
 echo \* Read legacyeth
 do_test ./test-format-parallel legacyeth
-do_test ./test-decode legacyeth
 
 echo \* Read legacypos
 do_test ./test-format-parallel legacypos
-do_test ./test-decode legacypos
 
 echo \* Read tsh
 do_test ./test-format-parallel tsh
-do_test ./test-decode tsh
 
 echo \* Read rawerf
 do_test ./test-format-parallel rawerf 
-do_test ./test-decode rawerf
 
+echo \* Read testing hasher function
+do_test ./test-format-parallel-hasher erf
+
+echo \* Read testing single-threaded datapath
+do_test ./test-format-parallel-singlethreaded erf
+
+echo \* Read testing single-threaded hasher datapath
+do_test ./test-format-parallel-singlethreaded-hasher erf
+
+echo \* Read stress testing with 100 threads
+do_test ./test-format-parallel-stressthreads erf
 
 echo

test/test-format-parallel.c

@@ -115 +115 @@
 
         if (pkt) {
-                int a,*b,c;
+                int a,*b,c=0;
                 assert(tls != NULL);
                 assert(!seen_stop_message);