ofproto-dpif-xlate: Don't consider mirrors used when excluded by VLAN.

[cascardo/ovs.git] / tests / test-atomic.c

diff --git a/tests/test-atomic.c b/tests/test-atomic.c
index 50b3b7a..efc5053 100644 (file)
--- a/tests/test-atomic.c
+++ b/tests/test-atomic.c
@@ -16,6 +16,7 @@
 
 #include <config.h>
 #undef NDEBUG
+#include "fatal-signal.h"
 #include "ovs-atomic.h"
 #include "ovstest.h"
 #include "ovs-thread.h"
@@ -184,13 +185,14 @@ static ATOMIC(struct atomic_aux *) paux = ATOMIC_VAR_INIT(NULL);
 static struct atomic_aux *auxes = NULL;
 
 #define ATOMIC_ITEM_COUNT 1000000
+#define        DURATION 5000
 
 static void *
 atomic_consumer(void * arg1 OVS_UNUSED)
 {
     struct atomic_aux *old_aux = NULL;
     uint64_t count;
-    long long int stop_time = time_msec() + 1000;
+    long long int stop_time = time_msec() + DURATION;
 
     do {
         struct atomic_aux *aux;
@@ -262,7 +264,7 @@ atomic_reader(void *aux_)
     uint64_t count;
     uint64_t data;
     long long int now = time_msec();
-    long long int stop_time = now + 1000;
+    long long int stop_time = now + DURATION;
 
     do {
         /* Non-synchronized add. */
@@ -300,7 +302,7 @@ atomic_writer(void *aux_)
     uint64_t data;
     size_t i;
     long long int now = time_msec();
-    long long int stop_time = now + 1000;
+    long long int stop_time = now + DURATION;
 
     for (i = 0; i < ATOMIC_ITEM_COUNT; i++) {
         /* Wait for the reader to be done with the data. */
@@ -413,6 +415,7 @@ test_atomic_seq_cst(void)
 static void
 test_atomic_main(int argc OVS_UNUSED, char *argv[] OVS_UNUSED)
 {
+    fatal_signal_init();
     test_atomic_plain();
     test_atomic_relaxed();
     test_atomic_consume();