merge

[c11tester.git] / pthread.cc

diff --git a/pthread.cc b/pthread.cc
index 120d365cf9d2e3354874c36453345a8f9d073753..272626d5bfc8e911c0520368520548360f562ca5 100644 (file)
--- a/pthread.cc
+++ b/pthread.cc
@@ -55,8 +55,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 +191,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);
@@ -220,3 +222,14 @@ int pthread_cond_broadcast(pthread_cond_t *p_cond) {
        v->notify_all();
        return 0;
 }
+
+int pthread_cond_destroy(pthread_cond_t *p_cond) {
+       ModelExecution *execution = model->get_execution();
+
+       if (execution->getCondMap()->contains(p_cond)) {
+               cdsc::snapcondition_variable *v = execution->getCondMap()->get(p_cond);
+               delete v;
+               execution->getCondMap()->remove(p_cond);
+       }
+       return 0;
+}