Changeset df65c0c

Timestamp:

Mar 12, 2021, 4:31:04 PM (4 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

41ca6fa, e867b44

Parents:

a1538cd

Message:

Fixed test after change to C api.

File:

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

tests/concurrent/clib.c

@@ +1 @@
+#include <stdio.h>
+#include <stdlib.h>
 #include <clib/cfathread.h>
 
-#include <stdio.h>
-#include <stdlib.h>
+extern "C" {
+void _exit(int status);
+}
 
 thread_local struct drand48_data buffer = { 0 };
@@ -15 +18 @@
 cfathread_t volatile blocked[blocked_size];
 
-void Worker( cfathread_t this ) {
+void * Worker( void * ) {
         for(int i = 0; i < 1000; i++) {
                 int idx = myrand() % blocked_size;
@@ -22 +25 @@
                         cfathread_unpark( thrd );
                 } else {
-                        cfathread_t thrd = __atomic_exchange_n(&blocked[idx], this, __ATOMIC_SEQ_CST);
+                        cfathread_t thrd = __atomic_exchange_n(&blocked[idx], cfathread_self(), __ATOMIC_SEQ_CST);
                         cfathread_unpark( thrd );
                         cfathread_park();
@@ -28 +31 @@
         }
         printf("Done\n");
+        return NULL;
 }
 
 volatile bool stop;
-void Unparker( cfathread_t this ) {
+void * Unparker( void * ) {
         while(!stop) {
                 int idx = myrand() % blocked_size;
@@ -42 +46 @@
         }
         printf("Done Unparker\n");
+        return NULL;
 }
 
@@ -51 +56 @@
         }
 
-        cfathread_setproccnt( 4 );
-        cfathread_t u = cfathread_create( Unparker );
+        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_t u;
+        cfathread_create( &u, NULL, Unparker, NULL );
         {
                 cfathread_t t[20];
                 for(int i = 0; i < 20; i++) {
-                        t[i] = cfathread_create( Worker );
+                        cfathread_create( &t[i], NULL, Worker, NULL );
                 }
                 for(int i = 0; i < 20; i++) {
-                        cfathread_join( t[i] );
+                        cfathread_join( t[i], NULL );
                 }
         }
         stop = true;
-        cfathread_join(u);
-        cfathread_setproccnt( 1 );
+        cfathread_join(u, NULL);
+        fflush(stdout);
+        _exit(0);
 }