X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=pthread.cc;h=1df85e13604ea29958aa63b35d37499955ce73a9;hb=372a94caf2fd5ecbf86c5752b94ae10df45fd80b;hp=d811ffef6a00279ee05e2ff657e0138020e6e509;hpb=95ee0b6522a582a1a4501c12244d661905ba8a00;p=c11tester.git diff --git a/pthread.cc b/pthread.cc index d811ffef..1df85e13 100644 --- a/pthread.cc +++ b/pthread.cc @@ -1,24 +1,30 @@ #include "common.h" #include "threads-model.h" #include "action.h" -#include -#include +#include "mypthread.h" + +#include "snapshot-interface.h" +#include "datarace.h" + +#include "mutex.h" +#include +#include /* 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. +#include "execution.h" 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 }; + pthread_start_t start_routine, void * arg) { + if (!model) { + snapshot_system_init(10000, 1024, 1024, 40000); + model = new ModelChecker(); + model->startChecker(); + } - *t = counter; - counter++; + struct pthread_params params = { start_routine, arg }; ModelAction *act = new ModelAction(PTHREAD_CREATE, std::memory_order_seq_cst, t, (uint64_t)¶ms); - model->pthread_map[*t] = act; /* seq_cst is just a 'don't care' parameter */ model->switch_to_master(act); @@ -27,54 +33,166 @@ 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(); +// Thread *th = model->get_pthread(t); + ModelExecution *execution = model->get_execution(); + Thread *th = execution->get_pthread(t); 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; - + if ( 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 } int pthread_mutex_init(pthread_mutex_t *p_mutex, const pthread_mutexattr_t *) { - 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 + cdsc::snapmutex *m = new cdsc::snapmutex(); + + if (!model) { + snapshot_system_init(10000, 1024, 1024, 40000); + model = new ModelChecker(); + model->startChecker(); } - std::mutex *m = new std::mutex(); - m->initialize(); - model->mutex_map[p_mutex] = m; + ModelExecution *execution = model->get_execution(); + execution->getMutexMap()->put(p_mutex, m); + return 0; } int pthread_mutex_lock(pthread_mutex_t *p_mutex) { - std::mutex *m = model->mutex_map[p_mutex]; - m->lock(); - /* error message? */ + 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 + 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)) { + pthread_mutex_init(p_mutex, NULL); + } + + cdsc::snapmutex *m = execution->getMutexMap()->get(p_mutex); + + if (m != NULL) { + m->lock(); + } else { + printf("ah\n"); + } + return 0; } + int pthread_mutex_trylock(pthread_mutex_t *p_mutex) { - std::mutex *m = model->mutex_map[p_mutex]; + ModelExecution *execution = model->get_execution(); + cdsc::snapmutex *m = execution->getMutexMap()->get(p_mutex); return m->try_lock(); - /* error message? */ } -int pthread_mutex_unlock(pthread_mutex_t *p_mutex) { - std::mutex *m = model->mutex_map[p_mutex]; - m->unlock(); +int pthread_mutex_unlock(pthread_mutex_t *p_mutex) { + ModelExecution *execution = model->get_execution(); + cdsc::snapmutex *m = execution->getMutexMap()->get(p_mutex); + + if (m != NULL) { + m->unlock(); + } else { + printf("try to unlock an untracked pthread_mutex\n"); + } + return 0; } -void check() { - for (std::map::iterator it = model->pthread_map.begin(); it != model->pthread_map.end(); it++) { - model_print("id: %d\n", it->first); - } +int pthread_mutex_timedlock (pthread_mutex_t *__restrict p_mutex, + 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::snapmutex *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; +} + +pthread_t pthread_self() { + Thread* th = model->get_current_thread(); + return (pthread_t)th->get_id(); +} + +int pthread_key_delete(pthread_key_t) { + model_print("key_delete is called\n"); + return 0; +} + +int pthread_cond_init(pthread_cond_t *p_cond, const pthread_condattr_t *attr) { + cdsc::snapcondition_variable *v = new cdsc::snapcondition_variable(); + + ModelExecution *execution = model->get_execution(); + execution->getCondMap()->put(p_cond, v); + return 0; +} + +int pthread_cond_wait(pthread_cond_t *p_cond, pthread_mutex_t *p_mutex) { + 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); + cdsc::snapmutex *m = execution->getMutexMap()->get(p_mutex); + + v->wait(*m); + return 0; +} + +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(); + + if ( !execution->getCondMap()->contains(p_cond) ) + pthread_cond_init(p_cond, NULL); + if ( !execution->getMutexMap()->contains(p_mutex) ) + pthread_mutex_init(p_mutex, NULL); + + 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); +// printf("timed_wait called\n"); + return 0; +} + +int pthread_cond_signal(pthread_cond_t *p_cond) { + // notify only one blocked thread + 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_one(); + return 0; }