pthread_join is able to return values

[c11tester.git] / pthread.cc

diff --git a/pthread.cc b/pthread.cc
index 39c7cfbd63c65026e34a440b293be831e44eec6f..d811ffef6a00279ee05e2ff657e0138020e6e509 100644 (file)
--- a/pthread.cc
+++ b/pthread.cc
@@ -3,15 +3,20 @@
 #include "action.h"
 #include <pthread.h>
 #include <mutex>
-#include <vector>
 
 /* global "model" object */
 #include "model.h"
 
+unsigned int counter = 0;      // counter does not to be reset to zero. It is 
+                               // find as long as it is unique.
+
 int pthread_create(pthread_t *t, const pthread_attr_t * attr,
           pthread_start_t start_routine, void * arg) {
        struct pthread_params params = { start_routine, arg };
 
+       *t = counter;
+       counter++;
+
        ModelAction *act = new ModelAction(PTHREAD_CREATE, std::memory_order_seq_cst, t, (uint64_t)&params);
        model->pthread_map[*t] = act;
 
@@ -24,7 +29,13 @@ int pthread_create(pthread_t *t, const pthread_attr_t * attr,
 int pthread_join(pthread_t t, void **value_ptr) {
        ModelAction *act = model->pthread_map[t];
        Thread *th = act->get_thread_operand();
+
        model->switch_to_master(new ModelAction(PTHREAD_JOIN, std::memory_order_seq_cst, th, id_to_int(th->get_id())));
+
+       // store return value
+       void *rtval = th->get_pthread_return();
+       *value_ptr = rtval;
+
        return 0;
 }
 
@@ -34,7 +45,7 @@ void pthread_exit(void *value_ptr) {
 }
 
 int pthread_mutex_init(pthread_mutex_t *p_mutex, const pthread_mutexattr_t *) {
-       if (model->mutex_map.find(p_mutex) != model->mutex_map.end() /*&& table[p_mutex]->is_initialized()*/ ) {
+       if (model->mutex_map.find(p_mutex) != model->mutex_map.end() ) {
                model_print("Reinitialize a lock\n");
                // return 1;    // 0 means success; 1 means failure
        }
@@ -61,3 +72,9 @@ int pthread_mutex_unlock(pthread_mutex_t *p_mutex) {
         m->unlock();
        return 0;
 }
+
+void check() {
+       for (std::map<pthread_t, ModelAction*>::iterator it = model->pthread_map.begin(); it != model->pthread_map.end(); it++) {
+               model_print("id: %d\n", it->first);
+       }
+}