Bug fix

[c11tester.git] / pthread.cc

diff --git a/pthread.cc b/pthread.cc
index 715f6f6adf8332556a93e4759e03b98994448daf..b5fb7ce964200750a108412c63041de7cea56c3d 100644 (file)
--- a/pthread.cc
+++ b/pthread.cc
@@ -12,30 +12,10 @@
 /* global "model" object */
 #include "model.h"
 #include "execution.h"
-extern "C" {
-int nanosleep(const struct timespec *rqtp, struct timespec *rmtp);
-}
-
-int nanosleep(const struct timespec *rqtp, struct timespec *rmtp) {
-       if (model) {
-               uint64_t time = rqtp->tv_sec * 1000000000 + rqtp->tv_nsec;
-               struct timespec currtime;
-               clock_gettime(CLOCK_MONOTONIC, &currtime);
-               uint64_t lcurrtime = currtime.tv_sec * 1000000000 + currtime.tv_nsec;
-               model->switch_to_master(new ModelAction(THREAD_SLEEP, std::memory_order_seq_cst, time, lcurrtime));
-               if (rmtp != NULL) {
-                       clock_gettime(CLOCK_MONOTONIC, &currtime);
-                       uint64_t lendtime = currtime.tv_sec * 1000000000 + currtime.tv_nsec;
-                       uint64_t elapsed = lendtime - lcurrtime;
-                       rmtp->tv_sec = elapsed / 1000000000;
-                       rmtp->tv_nsec = elapsed - rmtp->tv_sec * 1000000000;
-               }
-       }
-       return 0;
-}
+#include <errno.h>
 
 int pthread_create(pthread_t *t, const pthread_attr_t * attr,
-        pthread_start_t start_routine, void * arg) {
+                                                                        pthread_start_t start_routine, void * arg) {
        if (!model) {
                snapshot_system_init(10000, 1024, 1024, 40000);
                model = new ModelChecker();
@@ -72,6 +52,12 @@ int pthread_detach(pthread_t t) {
        return 0;
 }
 
+/* Take care of both pthread_yield and c++ thread yield */
+int sched_yield() {
+       model->switch_to_master(new ModelAction(THREAD_YIELD, std::memory_order_seq_cst, thread_current(), VALUE_NONE));
+       return 0;
+}
+
 void pthread_exit(void *value_ptr) {
        Thread * th = thread_current();
        th->set_pthread_return(value_ptr);
@@ -147,7 +133,7 @@ int pthread_mutex_unlock(pthread_mutex_t *p_mutex) {
 }
 
 int pthread_mutex_timedlock (pthread_mutex_t *__restrict p_mutex,
-        const struct timespec *__restrict abstime) {
+                                                                                                                const struct timespec *__restrict abstime) {
 // timedlock just gives the option of giving up the lock, so return and let the scheduler decide which thread goes next
 
        if (!model) {
@@ -169,11 +155,10 @@ int pthread_mutex_timedlock (pthread_mutex_t *__restrict p_mutex,
 
        if (m != NULL) {
                m->lock();
-       } else {
-               return 1;
+               return 0;
        }
 
-       return 0;
+       return 1;
 }
 
 pthread_t pthread_self() {
@@ -209,7 +194,7 @@ int pthread_cond_wait(pthread_cond_t *p_cond, pthread_mutex_t *p_mutex) {
 }
 
 int pthread_cond_timedwait(pthread_cond_t *p_cond,
-       pthread_mutex_t *p_mutex, const struct timespec *abstime) {
+                                                                                                        pthread_mutex_t *p_mutex, const struct timespec *abstime) {
        ModelExecution *execution = model->get_execution();
 
        if ( !execution->getCondMap()->contains(p_cond) )