X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=pthread.cc;h=71c60519d479365fba56a20646e1fdcab2afec28;hp=120d365cf9d2e3354874c36453345a8f9d073753;hb=ce83d6dece4406efc62a60fe79ea4c9731dc7d5f;hpb=11349f4e83c1446d5c678384a7d45e410c82c3e2

diff --git a/pthread.cc b/pthread.cc
index 120d365c..71c60519 100644
--- a/pthread.cc
+++ b/pthread.cc
@@ -13,6 +13,27 @@
 /* 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) {
@@ -55,8 +76,10 @@ int pthread_detach(pthread_t t) {
 
 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 *) {
@@ -189,7 +212,7 @@ 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(NOOP, std::memory_order_seq_cst, v));
 //	v->wait(*m);