merging stuff...made need to clean up some stuff...but need to push it somewhere...

[c11tester.git] / userprog.c

diff --git a/userprog.c b/userprog.c
index d24af11ce830556bf3b55b7423036f604fc31354..0948f0bc395a5d103963e99d81592ac6e2307072 100644 (file)
--- a/userprog.c
+++ b/userprog.c
@@ -2,19 +2,26 @@
 
 #include "libthreads.h"
 #include "libatomic.h"
+#include "librace.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);
-               switch (i % 4) {
+       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  ) {
                case 1:
-                       atomic_load(obj);
+                       ret = atomic_load(obj);
+                       printf("Read value: %d\n", ret);
                        break;
-               case 3:
-                       atomic_store(obj, i);
+               case 0:
+                       atomic_store(obj, i + 1);
+                       printf("Write value: %d\n", i + 1);
                        break;
                }
        }
@@ -22,14 +29,16 @@ static void a(atomic_int *obj)
 
 void user_main()
 {
-       struct thread t1, t2;
+       thrd_t t1, t2;
        atomic_int obj;
 
-       printf("Thread %d creating 2 threads\n", thread_current()->id);
-       thread_create(&t1, (void (*)())&a, &obj);
-       thread_create(&t2, (void (*)())&a, &obj);
+       atomic_init(&obj, 0);
+
+       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("Thread %d is finished\n", thread_current()->id);
+       thrd_join(t1);
+       thrd_join(t2);
+       printf("Thread %d is finished\n", thrd_current());
 }