libatomic: use 'values' for atomic load/store

[model-checker.git] / threads.cc

diff --git a/threads.cc b/threads.cc
index 456414d5b3200ec1ca8b7603834e78c761910b76..917090fb71500665009e1c5d4d0e50d3de729e06 100644 (file)
--- a/threads.cc
+++ b/threads.cc
@@ -12,12 +12,12 @@
 
 static void * stack_allocate(size_t size)
 {
-       return malloc(size);
+       return userMalloc(size);
 }
 
 static void stack_free(void *stack)
 {
-       free(stack);
+       userFree(stack);
 }
 
 Thread * thread_current(void)
@@ -63,6 +63,14 @@ void Thread::complete()
        }
 }
 
+void * Thread::operator new(size_t size) {
+       return userMalloc(size);
+}
+
+void Thread::operator delete(void *ptr) {
+       userFree(ptr);
+}
+
 Thread::Thread(thrd_t *t, void (*func)(), void *a) {
        int ret;
 
@@ -113,11 +121,11 @@ static int thread_system_next(void)
        Thread *curr, *next;
 
        curr = thread_current();
-       model->check_current_action();
        if (curr) {
-               if (curr->get_state() == THREAD_READY)
+               if (curr->get_state() == THREAD_READY) {
+                       model->check_current_action();
                        model->scheduler->add_thread(curr);
-               else if (curr->get_state() == THREAD_RUNNING)
+               } else if (curr->get_state() == THREAD_RUNNING)
                        /* Stopped while running; i.e., completed */
                        curr->complete();
                else