changes

[c11tester.git] / userprog.c

diff --git a/userprog.c b/userprog.c
index c27c701591115f9ec903c6a771263bfc3b1bef98..6d8b57bec5a532b77cfa257585089c3519fba4d8 100644 (file)
--- a/userprog.c
+++ b/userprog.c
@@ -1,29 +1,48 @@
 #include <stdio.h>
+#include <stdlib.h>
 
 #include "libthreads.h"
-#include "libatomic.h"
+#include "librace.h"
+#include "stdatomic.h"
 
 static void a(atomic_int *obj)
 {
        int i;
+       int ret;
 
-       for (i = 0; i < 10; i++) {
-               printf("Thread %d, loop %d\n", thread_current()->id, i);
-               if (i % 2)
-                       atomic_load(obj);
+       store_32(&i, 10);
+       printf("load 32 yields: %d\n", load_32(&i));
+
+       for (i = 0; i < 2; i++) {
+               printf("Thread %d, loop %d\n", thrd_current(), i);
+               switch (i % 2) {
+               case 1:
+                       ret = atomic_load(obj);
+                       printf("Read value: %d\n", ret);
+                       break;
+               case 0:
+                       atomic_store(obj, i + 1);
+                       printf("Write value: %d\n", i + 1);
+                       break;
+               }
        }
 }
 
 void user_main()
 {
-       struct thread t1, t2;
-       atomic_int obj;
+       thrd_t t1, t2;
+       atomic_int *obj;
+
+       obj = malloc(sizeof(*obj));
+
+       atomic_init(obj, 0);
 
-       printf("%s() creating 2 threads\n", __func__);
-       thread_create(&t1, &a, &obj);
-       thread_create(&t2, &a, &obj);
+       printf("Thread %d: creating 2 threads\n", thrd_current());
+       thrd_create(&t1, (thrd_start_t)&a, obj);
+       thrd_create(&t2, (thrd_start_t)&a, obj);
 
-       thread_join(&t1);
-       thread_join(&t2);
-       printf("%s() is finished\n", __func__);
+       thrd_join(t1);
+       thrd_join(t2);
+       free(obj);
+       printf("Thread %d is finished\n", thrd_current());
 }