Changeset 135e3f6

Timestamp:

10/01/15 17:29:38 (5 years ago)

Author:

Shane Alcock <salcock@…>

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:

01619eb

Parents:

2e9df89

Message:

Add usleep for first packet in all parallel tests

This ensures that the processing and reporting threads will still be
running when our test tries to pause them. Without this, our tests will
sometimes fail because we call pause on a trace that is finished (i.e. not
started).

Started noticing this with gcc 5.1.1, so might be due to better compiler
optimisations?

Location:

test

Files:

• test-format-parallel-hasher.c (modified) (1 diff)
• test-format-parallel-reporter.c (modified) (1 diff)
• test-format-parallel-singlethreaded-hasher.c (modified) (3 diffs)
• test-format-parallel-singlethreaded.c (modified) (1 diff)
• test-format-parallel-stressthreads.c (modified) (2 diffs)
• test-format-parallel.c (modified) (1 diff)

test/test-format-parallel-hasher.c

@@ -164 +164 @@
         assert(*magic == 0xabcdef);
 
+        if (storage->count == 0)
+                usleep(100000);
         storage->count ++;
         count ++;

test/test-format-parallel-reporter.c

@@ -164 +164 @@
         assert(*magic == 0xabcdef);
 
+        if (storage->count == 0)
+                usleep(100000);
         storage->count ++;
         count ++;

test/test-format-parallel-singlethreaded-hasher.c

@@ -154 +154 @@
         uint32_t *magic = (uint32_t *)global;
         static __thread int count = 0;
-        int a,*b,c=0;
+        int a,*b,c=10;
 
         assert(storage != NULL);
@@ -164 +164 @@
         assert(*magic == 0xabcdef);
 
+        if (storage->count == 0)
+                usleep(100000);
         storage->count ++;
         count ++;
@@ -176 +178 @@
         // Do some work to even out the load on cores
         b = &c;
-        for (a = 0; a < 10000000; a++) {
+        for (a = 0; a < 50000000; a++) {
                 c += a**b;
         }

test/test-format-parallel-singlethreaded.c

@@ -162 +162 @@
         assert(*magic == 0xabcdef);
 
+        if (storage->count == 0)
+                usleep(100000);
         storage->count ++;
         count ++;

test/test-format-parallel-stressthreads.c

@@ -130 +130 @@
         threadcounter->threads ++;
         threadcounter->packets += res->value.sint;
-        printf("%d\n", res->value.sint);
+        //printf("%d\n", res->value.sint);
 }
 
@@ -162 +162 @@
         assert(*magic == 0xabcdef);
 
+        if (storage->count == 0)
+                usleep(100000);
         storage->count ++;
         count ++;

test/test-format-parallel.c

@@ -162 +162 @@
         assert(*magic == 0xabcdef);
 
+        if (storage->count == 0)
+                usleep(100000);
         storage->count ++;
         count ++;