X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=pthread.cc;h=b5fb7ce964200750a108412c63041de7cea56c3d;hp=c96777488ee8cae08c20dcf88ab98d4c20e5caf3;hb=da918c450a8fb8524ed99da0a35a7e417eb85777;hpb=e9e6aaed0177ca95f216a59a284464262c835c3c

diff --git a/pthread.cc b/pthread.cc
index c9677748..b5fb7ce9 100644
--- a/pthread.cc
+++ b/pthread.cc
@@ -8,11 +8,11 @@
 
 #include "mutex.h"
 #include <condition_variable>
-#include <assert.h>
 
 /* global "model" object */
 #include "model.h"
 #include "execution.h"
+#include <errno.h>
 
 int pthread_create(pthread_t *t, const pthread_attr_t * attr,
 									 pthread_start_t start_routine, void * arg) {
@@ -33,7 +33,6 @@ int pthread_create(pthread_t *t, const pthread_attr_t * attr,
 }
 
 int pthread_join(pthread_t t, void **value_ptr) {
-//	Thread *th = model->get_pthread(t);
 	ModelExecution *execution = model->get_execution();
 	Thread *th = execution->get_pthread(t);
 
@@ -53,20 +52,27 @@ 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();
-	model->switch_to_master(new ModelAction(THREAD_FINISH, std::memory_order_seq_cst, th));
-	while(1) ;//make warning goaway
+	th->set_pthread_return(value_ptr);
+	model->switch_to_master(new ModelAction(THREADONLY_FINISH, std::memory_order_seq_cst, th));
+	//Need to exit so we don't return to the program
+	real_pthread_exit(NULL);
 }
 
 int pthread_mutex_init(pthread_mutex_t *p_mutex, const pthread_mutexattr_t *) {
-	cdsc::snapmutex *m = new cdsc::snapmutex();
-
 	if (!model) {
 		snapshot_system_init(10000, 1024, 1024, 40000);
 		model = new ModelChecker();
 		model->startChecker();
 	}
+	cdsc::snapmutex *m = new cdsc::snapmutex();
 
 	ModelExecution *execution = model->get_execution();
 	execution->getMutexMap()->put(p_mutex, m);
@@ -81,7 +87,6 @@ int pthread_mutex_lock(pthread_mutex_t *p_mutex) {
 		model->startChecker();
 	}
 
-
 	ModelExecution *execution = model->get_execution();
 
 	/* to protect the case where PTHREAD_MUTEX_INITIALIZER is used
@@ -96,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;
@@ -108,7 +113,7 @@ int pthread_mutex_trylock(pthread_mutex_t *p_mutex) {
 		model = new ModelChecker();
 		model->startChecker();
 	}
-	
+
 	ModelExecution *execution = model->get_execution();
 	cdsc::snapmutex *m = execution->getMutexMap()->get(p_mutex);
 	return m->try_lock();
@@ -121,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;
@@ -130,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() {
@@ -170,6 +183,8 @@ int pthread_cond_wait(pthread_cond_t *p_cond, pthread_mutex_t *p_mutex) {
 	ModelExecution *execution = model->get_execution();
 	if ( !execution->getCondMap()->contains(p_cond) )
 		pthread_cond_init(p_cond, NULL);
+	if ( !execution->getMutexMap()->contains(p_mutex) )
+		pthread_mutex_init(p_mutex, NULL);
 
 	cdsc::snapcondition_variable *v = execution->getCondMap()->get(p_cond);
 	cdsc::snapmutex *m = execution->getMutexMap()->get(p_mutex);
@@ -180,7 +195,6 @@ 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) {
-// implement cond_timedwait as a noop and let the scheduler decide which thread goes next
 	ModelExecution *execution = model->get_execution();
 
 	if ( !execution->getCondMap()->contains(p_cond) )
@@ -189,11 +203,12 @@ int pthread_cond_timedwait(pthread_cond_t *p_cond,
 		pthread_mutex_init(p_mutex, NULL);
 
 	cdsc::snapcondition_variable *v = execution->getCondMap()->get(p_cond);
-//	cdsc::snapmutex *m = execution->getMutexMap()->get(p_mutex);
+	cdsc::snapmutex *m = execution->getMutexMap()->get(p_mutex);
+
+	model->switch_to_master(new ModelAction(ATOMIC_TIMEDWAIT, std::memory_order_seq_cst, v, (uint64_t) m));
+	m->lock();
 
-	model->switch_to_master(new ModelAction(NOOP, std::memory_order_seq_cst, v));
-//	v->wait(*m);
-//	printf("timed_wait called\n");
+	// model_print("Timed_wait is called\n");
 	return 0;
 }