From 45982c4b01e1d038e3b164215dc5bff8191c0c6c Mon Sep 17 00:00:00 2001
From: Patrick Pelissier <patrick.pelissier@gmail.com>
Date: Sat, 17 Feb 2018 11:06:28 +0100
Subject: [PATCH] Improve test suite

---
 tests/test-mgenint.c | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/tests/test-mgenint.c b/tests/test-mgenint.c
index b6760d04..d672edb5 100644
--- a/tests/test-mgenint.c
+++ b/tests/test-mgenint.c
@@ -22,9 +22,12 @@
 */
 #include <stdio.h>
 #include "m-mutex.h"
+#include "m-atomic.h"
 
 #include "m-genint.h"
 
+#define MAX_N 256
+
 static void test(size_t n)
 {
   genint_t s;
@@ -48,16 +51,23 @@ static void test(size_t n)
   genint_clear(s);
 }
 
+/*******************************************************/
+
 genint_t global;
+atomic_bool tab[MAX_N];
 
 static void conso(void *p)
 {
   size_t n = *(size_t*)p;
   for(int i = 0; i < 100000; i++) {
     unsigned int j = genint_pop(global);
-    assert (j == -1U || j < n);
-    if (j != -1U)
+    if (j != -1U) {
+      assert (j < n);
+      assert (atomic_load(&tab[j]) == false);
+      atomic_store(&tab[j], true);
+      atomic_store(&tab[j], false);
       genint_push(global, j);
+    }
   }
 }
 
@@ -66,7 +76,9 @@ static void test2(size_t n)
   m_thread_t idx[4];
 
   genint_init(global, n);
-
+  for(int i = 0; i < MAX_N; i++)
+    atomic_init(&tab[i], false);
+  
   for(int i = 0; i < 4; i++) {
     m_thread_create (idx[i], conso, (void*)&n);
   }
@@ -79,10 +91,10 @@ static void test2(size_t n)
 
 int main(void)
 {
-  for(size_t n = 1; n < 256; n++) {
+  for(size_t n = 1; n < MAX_N; n++) {
     test(n);
   }
-  for(size_t n = 1; n < 256; n+=17) {
+  for(size_t n = 1; n < MAX_N; n+=17) {
     test2(n);
   }
   exit(0);