Changes in tests/concurrent/clib.c [a5e7233:bb662027]

File:

• tests/concurrent/clib.c (modified) (6 diffs)

tests/concurrent/clib.c

@@ +1 @@
+#include <clib/cfathread.h>
+
 #include <stdio.h>
 #include <stdlib.h>
-#include <clib/cfathread.h>
-#include <bits/defs.hfa>
-
-extern "C" {
-void _exit(int status);
-}
 
 thread_local struct drand48_data buffer = { 0 };
@@ -19 +15 @@
 cfathread_t volatile blocked[blocked_size];
 
-void * Worker( void * ) {
+void Worker( cfathread_t this ) {
         for(int i = 0; i < 1000; i++) {
                 int idx = myrand() % blocked_size;
@@ -26 +22 @@
                         cfathread_unpark( thrd );
                 } else {
-                        cfathread_t thrd = __atomic_exchange_n(&blocked[idx], cfathread_self(), __ATOMIC_SEQ_CST);
+                        cfathread_t thrd = __atomic_exchange_n(&blocked[idx], this, __ATOMIC_SEQ_CST);
                         cfathread_unpark( thrd );
                         cfathread_park();
@@ -32 +28 @@
         }
         printf("Done\n");
-        return NULL;
 }
 
 volatile bool stop;
-void * Unparker( void * ) {
+void Unparker( cfathread_t this ) {
         while(!stop) {
                 int idx = myrand() % blocked_size;
@@ -47 +42 @@
         }
         printf("Done Unparker\n");
-        return NULL;
 }
 
@@ -57 +51 @@
         }
 
-        cfathread_cluster_t cl = cfathread_cluster_self();
-
-        cfathread_cluster_add_worker( cl, NULL, NULL, NULL );
-        cfathread_cluster_add_worker( cl, NULL, NULL, NULL );
-        cfathread_cluster_add_worker( cl, NULL, NULL, NULL );
-
-        cfathread_attr_t attr;
-        cfathread_attr_init(&attr);
-        cfathread_attr_setcluster(&attr, cl);
-
-        cfathread_t u;
-        cfathread_create( &u, &attr, Unparker, NULL );
+        cfathread_setproccnt( 4 );
+        cfathread_t u = cfathread_create( Unparker );
         {
                 cfathread_t t[20];
                 for(int i = 0; i < 20; i++) {
-                        cfathread_create( &t[i], &attr, Worker, NULL );
+                        t[i] = cfathread_create( Worker );
                 }
                 for(int i = 0; i < 20; i++) {
-                        cfathread_join( t[i], NULL );
+                        cfathread_join( t[i] );
                 }
         }
         stop = true;
-        cfathread_join(u, NULL);
-        cfathread_attr_destroy(&attr);
-        fflush(stdout);
-        _exit(0);
+        cfathread_join(u);
+        cfathread_setproccnt( 1 );
 }