X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=pthread.cc;h=35af63e6a5cbbd654f663625e220aa36eb242830;hp=87dc206510b142ae48886237b15181a5262a1245;hb=febd10a6b4b1af40b690219ebfd8d0b1a42b183c;hpb=805ebd24556eda8ae7183ee3f518148e86799ac1

diff --git a/pthread.cc b/pthread.cc
index 87dc2065..35af63e6 100644
--- a/pthread.cc
+++ b/pthread.cc
@@ -15,7 +15,7 @@
 #include "execution.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) {
 	struct pthread_params params = { start_routine, arg };
 
 	ModelAction *act = new ModelAction(PTHREAD_CREATE, std::memory_order_seq_cst, t, (uint64_t)&params);
@@ -37,19 +37,20 @@ int pthread_join(pthread_t t, void **value_ptr) {
 		// store return value
 		void *rtval = th->get_pthread_return();
 		*value_ptr = rtval;
-	} 
+	}
 	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
+	while(1) ;//make warning goaway
 }
 
 int pthread_mutex_init(pthread_mutex_t *p_mutex, const pthread_mutexattr_t *) {
 	if (!model) {
-	  model = new ModelChecker();
+		snapshot_system_init(10000, 1024, 1024, 40000);
+		model = new ModelChecker();
 	}
 
 	cdsc::mutex *m = new cdsc::mutex();
@@ -62,10 +63,10 @@ int pthread_mutex_init(pthread_mutex_t *p_mutex, const pthread_mutexattr_t *) {
 int pthread_mutex_lock(pthread_mutex_t *p_mutex) {
 	ModelExecution *execution = model->get_execution();
 
-	/* to protect the case where PTHREAD_MUTEX_INITIALIZER is used 
+	/* 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)) {	
+	if (!execution->getMutexMap()->contains(p_mutex)) {
 		pthread_mutex_init(p_mutex, NULL);
 	}
 
@@ -85,7 +86,7 @@ int pthread_mutex_trylock(pthread_mutex_t *p_mutex) {
 	cdsc::mutex *m = execution->getMutexMap()->get(p_mutex);
 	return m->try_lock();
 }
-int pthread_mutex_unlock(pthread_mutex_t *p_mutex) {	
+int pthread_mutex_unlock(pthread_mutex_t *p_mutex) {
 	ModelExecution *execution = model->get_execution();
 	cdsc::mutex *m = execution->getMutexMap()->get(p_mutex);
 
@@ -99,24 +100,24 @@ 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
 
 /*
-	ModelExecution *execution = model->get_execution();
-	if (!execution->mutex_map.contains(p_mutex)) {	
-		pthread_mutex_init(p_mutex, NULL);
-	}
-	cdsc::mutex *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");
-*/
+        ModelExecution *execution = model->get_execution();
+        if (!execution->mutex_map.contains(p_mutex)) {
+                pthread_mutex_init(p_mutex, NULL);
+        }
+        cdsc::mutex *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;
 }
 
@@ -150,8 +151,8 @@ int pthread_cond_wait(pthread_cond_t *p_cond, pthread_mutex_t *p_mutex) {
 	return 0;
 }
 
-int pthread_cond_timedwait(pthread_cond_t *p_cond, 
-    pthread_mutex_t *p_mutex, const struct timespec *abstime) {
+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();