X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=pthread.cc;h=b5fb7ce964200750a108412c63041de7cea56c3d;hb=4d1d81928c3688fbcfb96ee68eab70e73f7771e5;hp=d48d34b0291fd3d41328fabddc973810508bf4ff;hpb=d55f961768e13c12ab9d7b6a4f7f1490748f18c5;p=c11tester.git

diff --git a/pthread.cc b/pthread.cc
index d48d34b0..b5fb7ce9 100644
--- a/pthread.cc
+++ b/pthread.cc
@@ -12,27 +12,7 @@
 /* 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) {
@@ -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);
@@ -115,7 +101,7 @@ int pthread_mutex_lock(pthread_mutex_t *p_mutex) {
 	if (m != NULL) {
 		m->lock();
 	} else {
-		printf("ah\n");
+		return 1;
 	}
 
 	return 0;
@@ -140,6 +126,7 @@ int pthread_mutex_unlock(pthread_mutex_t *p_mutex) {
 		m->unlock();
 	} else {
 		printf("try to unlock an untracked pthread_mutex\n");
+		return 1;
 	}
 
 	return 0;
@@ -149,22 +136,29 @@ int pthread_mutex_timedlock (pthread_mutex_t *__restrict p_mutex,
 														 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
 
-/*
-        ModelExecution *execution = model->get_execution();
-        if (!execution->mutex_map.contains(p_mutex)) {
-                pthread_mutex_init(p_mutex, NULL);
-        }
-        cdsc::snapmutex *m = execution->mutex_map.get(p_mutex);
-
-        if (m != NULL) {
-                m->lock();
-        } else {
-                printf("something is wrong with pthread_mutex_timedlock\n");
-        }
-
-        printf("pthread_mutex_timedlock is called. It is currently implemented as a normal lock operation without no timeout\n");
- */
-	return 0;
+	if (!model) {
+		snapshot_system_init(10000, 1024, 1024, 40000);
+		model = new ModelChecker();
+		model->startChecker();
+	}
+
+	ModelExecution *execution = model->get_execution();
+
+	/* to protect the case where PTHREAD_MUTEX_INITIALIZER is used
+	   instead of pthread_mutex_init, or where *p_mutex is not stored
+	   in the execution->mutex_map for some reason. */
+	if (!execution->getMutexMap()->contains(p_mutex)) {
+		pthread_mutex_init(p_mutex, NULL);
+	}
+
+	cdsc::snapmutex *m = execution->getMutexMap()->get(p_mutex);
+
+	if (m != NULL) {
+		m->lock();
+		return 0;
+	}
+
+	return 1;
 }
 
 pthread_t pthread_self() {
@@ -200,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) )