Remove promises

[c11tester.git] / test / userprog.c

diff --git a/test/userprog.c b/test/userprog.c
index 645dc3095a366abeb79c976d6d456b6381760a17..415eb24805b3e758deea6d65a378962a48d14cce 100644 (file)
--- a/test/userprog.c
+++ b/test/userprog.c
@@ -1,38 +1,43 @@
 #include <stdio.h>
+#include <threads.h>
+#include <stdatomic.h>
 
-#include "libthreads.h"
 #include "librace.h"
-#include "stdatomic.h"
 
 atomic_int x;
 atomic_int y;
+int z;
 
 static void a(void *obj)
 {
        int r1=atomic_load_explicit(&y, memory_order_relaxed);
        atomic_store_explicit(&x, r1, memory_order_relaxed);
-       printf("r1=%u\n",r1);
+//     z = 1;
+       printf("r1=%d\n",r1);
 }
 
 static void b(void *obj)
 {
        int r2=atomic_load_explicit(&x, memory_order_relaxed);
        atomic_store_explicit(&y, 42, memory_order_relaxed);
-       printf("r2=%u\n",r2);
+//     z = 2;
+       printf("r2=%d\n",r2);
 }
 
-void user_main()
+int user_main(int argc, char **argv)
 {
        thrd_t t1, t2;
 
-       atomic_init(&x, 0);
+       atomic_init(&x, 30);
        atomic_init(&y, 0);
 
-       printf("Thread %d: creating 2 threads\n", thrd_current());
+       printf("Main thread: creating 2 threads\n");
        thrd_create(&t1, (thrd_start_t)&a, NULL);
        thrd_create(&t2, (thrd_start_t)&b, NULL);
 
        thrd_join(t1);
        thrd_join(t2);
-       printf("Thread %d is finished\n", thrd_current());
+       printf("Main thread is finished\n");
+
+       return 0;
 }