X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=pthread.cc;h=71c60519d479365fba56a20646e1fdcab2afec28;hb=4734cee80cd579ded905ce4057ef9a2c3c81e494;hp=808aa207cd72338806932b3afd86c2d5abe367c6;hpb=c44681494532fc9b3cec1e9148324025a635017b;p=c11tester.git

diff --git a/pthread.cc b/pthread.cc
index 808aa207..71c60519 100644
--- a/pthread.cc
+++ b/pthread.cc
@@ -13,9 +13,36 @@
 /* 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;
+}
 
 int pthread_create(pthread_t *t, const pthread_attr_t * attr,
 									 pthread_start_t start_routine, void * arg) {
+	if (!model) {
+		snapshot_system_init(10000, 1024, 1024, 40000);
+		model = new ModelChecker();
+		model->startChecker();
+	}
+
 	struct pthread_params params = { start_routine, arg };
 
 	ModelAction *act = new ModelAction(PTHREAD_CREATE, std::memory_order_seq_cst, t, (uint64_t)&params);
@@ -41,18 +68,27 @@ int pthread_join(pthread_t t, void **value_ptr) {
 	return 0;
 }
 
+int pthread_detach(pthread_t t) {
+	//Doesn't do anything
+	//Return success
+	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::mutex *m = new cdsc::mutex();
+	cdsc::snapmutex *m = new cdsc::snapmutex();
 
 	if (!model) {
 		snapshot_system_init(10000, 1024, 1024, 40000);
 		model = new ModelChecker();
+		model->startChecker();
 	}
 
 	ModelExecution *execution = model->get_execution();
@@ -62,6 +98,13 @@ int pthread_mutex_init(pthread_mutex_t *p_mutex, const pthread_mutexattr_t *) {
 }
 
 int pthread_mutex_lock(pthread_mutex_t *p_mutex) {
+	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
@@ -71,7 +114,7 @@ int pthread_mutex_lock(pthread_mutex_t *p_mutex) {
 		pthread_mutex_init(p_mutex, NULL);
 	}
 
-	cdsc::mutex *m = execution->getMutexMap()->get(p_mutex);
+	cdsc::snapmutex *m = execution->getMutexMap()->get(p_mutex);
 
 	if (m != NULL) {
 		m->lock();
@@ -83,13 +126,19 @@ int pthread_mutex_lock(pthread_mutex_t *p_mutex) {
 }
 
 int pthread_mutex_trylock(pthread_mutex_t *p_mutex) {
+	if (!model) {
+		snapshot_system_init(10000, 1024, 1024, 40000);
+		model = new ModelChecker();
+		model->startChecker();
+	}
+
 	ModelExecution *execution = model->get_execution();
-	cdsc::mutex *m = execution->getMutexMap()->get(p_mutex);
+	cdsc::snapmutex *m = execution->getMutexMap()->get(p_mutex);
 	return m->try_lock();
 }
 int pthread_mutex_unlock(pthread_mutex_t *p_mutex) {
 	ModelExecution *execution = model->get_execution();
-	cdsc::mutex *m = execution->getMutexMap()->get(p_mutex);
+	cdsc::snapmutex *m = execution->getMutexMap()->get(p_mutex);
 
 	if (m != NULL) {
 		m->unlock();
@@ -109,7 +158,7 @@ int pthread_mutex_timedlock (pthread_mutex_t *__restrict p_mutex,
         if (!execution->mutex_map.contains(p_mutex)) {
                 pthread_mutex_init(p_mutex, NULL);
         }
-        cdsc::mutex *m = execution->mutex_map.get(p_mutex);
+        cdsc::snapmutex *m = execution->mutex_map.get(p_mutex);
 
         if (m != NULL) {
                 m->lock();
@@ -133,7 +182,7 @@ int pthread_key_delete(pthread_key_t) {
 }
 
 int pthread_cond_init(pthread_cond_t *p_cond, const pthread_condattr_t *attr) {
-	cdsc::condition_variable *v = new cdsc::condition_variable();
+	cdsc::snapcondition_variable *v = new cdsc::snapcondition_variable();
 
 	ModelExecution *execution = model->get_execution();
 	execution->getCondMap()->put(p_cond, v);
@@ -145,8 +194,8 @@ int pthread_cond_wait(pthread_cond_t *p_cond, pthread_mutex_t *p_mutex) {
 	if ( !execution->getCondMap()->contains(p_cond) )
 		pthread_cond_init(p_cond, NULL);
 
-	cdsc::condition_variable *v = execution->getCondMap()->get(p_cond);
-	cdsc::mutex *m = execution->getMutexMap()->get(p_mutex);
+	cdsc::snapcondition_variable *v = execution->getCondMap()->get(p_cond);
+	cdsc::snapmutex *m = execution->getMutexMap()->get(p_mutex);
 
 	v->wait(*m);
 	return 0;
@@ -162,8 +211,8 @@ int pthread_cond_timedwait(pthread_cond_t *p_cond,
 	if ( !execution->getMutexMap()->contains(p_mutex) )
 		pthread_mutex_init(p_mutex, NULL);
 
-	cdsc::condition_variable *v = execution->getCondMap()->get(p_cond);
-	cdsc::mutex *m = execution->getMutexMap()->get(p_mutex);
+	cdsc::snapcondition_variable *v = execution->getCondMap()->get(p_cond);
+	//	cdsc::snapmutex *m = execution->getMutexMap()->get(p_mutex);
 
 	model->switch_to_master(new ModelAction(NOOP, std::memory_order_seq_cst, v));
 //	v->wait(*m);
@@ -177,8 +226,20 @@ int pthread_cond_signal(pthread_cond_t *p_cond) {
 	if ( !execution->getCondMap()->contains(p_cond) )
 		pthread_cond_init(p_cond, NULL);
 
-	cdsc::condition_variable *v = execution->getCondMap()->get(p_cond);
+	cdsc::snapcondition_variable *v = execution->getCondMap()->get(p_cond);
 
 	v->notify_one();
 	return 0;
 }
+
+int pthread_cond_broadcast(pthread_cond_t *p_cond) {
+	// notify all blocked threads
+	ModelExecution *execution = model->get_execution();
+	if ( !execution->getCondMap()->contains(p_cond) )
+		pthread_cond_init(p_cond, NULL);
+
+	cdsc::snapcondition_variable *v = execution->getCondMap()->get(p_cond);
+
+	v->notify_all();
+	return 0;
+}