X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=pthread.cc;h=1df85e13604ea29958aa63b35d37499955ce73a9;hb=372a94caf2fd5ecbf86c5752b94ae10df45fd80b;hp=dec0ddf7538ab481c237d2a53e1a8c4e2400dbde;hpb=df985eb69ed57df60c1ab58f157d6e53999bf173;p=c11tester.git diff --git a/pthread.cc b/pthread.cc index dec0ddf7..1df85e13 100644 --- a/pthread.cc +++ b/pthread.cc @@ -1,7 +1,7 @@ #include "common.h" #include "threads-model.h" #include "action.h" -#include "pthread.h" +#include "mypthread.h" #include "snapshot-interface.h" #include "datarace.h" @@ -14,47 +14,14 @@ #include "model.h" #include "execution.h" -static void param_defaults(struct model_params *params) -{ - params->maxreads = 0; - params->maxfuturedelay = 6; - params->fairwindow = 0; - params->yieldon = false; - params->yieldblock = false; - params->enabledcount = 1; - params->bound = 0; - params->maxfuturevalues = 0; - params->expireslop = 4; - params->verbose = !!DBG_ENABLED(); - params->uninitvalue = 0; - params->maxexecutions = 0; -} - -static void model_main() -{ - struct model_params params; - - param_defaults(¶ms); - - //parse_options(¶ms, main_argc, main_argv); - - //Initialize race detector - initRaceDetector(); - - snapshot_stack_init(); - - model = new ModelChecker(params); // L: Model thread is created -// install_trace_analyses(model->get_execution()); L: disable plugin - - snapshot_record(0); - model->run(); - delete model; - - DEBUG("Exiting\n"); -} - 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) { + if (!model) { + snapshot_system_init(10000, 1024, 1024, 40000); + model = new ModelChecker(); + model->startChecker(); + } + struct pthread_params params = { start_routine, arg }; ModelAction *act = new ModelAction(PTHREAD_CREATE, std::memory_order_seq_cst, t, (uint64_t)¶ms); @@ -76,38 +43,49 @@ 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 } int pthread_mutex_init(pthread_mutex_t *p_mutex, const pthread_mutexattr_t *) { + cdsc::snapmutex *m = new cdsc::snapmutex(); + if (!model) { - snapshot_system_init(10000, 1024, 1024, 40000, &model_main); + snapshot_system_init(10000, 1024, 1024, 40000); + model = new ModelChecker(); + model->startChecker(); } - cdsc::mutex *m = new cdsc::mutex(); - ModelExecution *execution = model->get_execution(); - execution->mutex_map.put(p_mutex, m); + execution->getMutexMap()->put(p_mutex, m); + return 0; } int pthread_mutex_lock(pthread_mutex_t *p_mutex) { + 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 + /* 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->mutex_map.contains(p_mutex)) { + if (!execution->getMutexMap()->contains(p_mutex)) { pthread_mutex_init(p_mutex, NULL); } - cdsc::mutex *m = execution->mutex_map.get(p_mutex); + cdsc::snapmutex *m = execution->getMutexMap()->get(p_mutex); if (m != NULL) { m->lock(); @@ -120,12 +98,12 @@ int pthread_mutex_lock(pthread_mutex_t *p_mutex) { int pthread_mutex_trylock(pthread_mutex_t *p_mutex) { ModelExecution *execution = model->get_execution(); - cdsc::mutex *m = execution->mutex_map.get(p_mutex); + cdsc::snapmutex *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->mutex_map.get(p_mutex); + cdsc::snapmutex *m = execution->getMutexMap()->get(p_mutex); if (m != NULL) { m->unlock(); @@ -137,30 +115,30 @@ 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::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 th->get_id(); + return (pthread_t)th->get_id(); } int pthread_key_delete(pthread_key_t) { @@ -169,39 +147,39 @@ int pthread_key_delete(pthread_key_t) { } int pthread_cond_init(pthread_cond_t *p_cond, const pthread_condattr_t *attr) { - cdsc::condition_variable *v = new cdsc::condition_variable(); + cdsc::snapcondition_variable *v = new cdsc::snapcondition_variable(); ModelExecution *execution = model->get_execution(); - execution->cond_map.put(p_cond, v); + 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->cond_map.contains(p_cond) ) + if ( !execution->getCondMap()->contains(p_cond) ) pthread_cond_init(p_cond, NULL); - cdsc::condition_variable *v = execution->cond_map.get(p_cond); - cdsc::mutex *m = execution->mutex_map.get(p_mutex); + 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) { +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->cond_map.contains(p_cond) ) + if ( !execution->getCondMap()->contains(p_cond) ) pthread_cond_init(p_cond, NULL); - if ( !execution->mutex_map.contains(p_mutex) ) + if ( !execution->getMutexMap()->contains(p_mutex) ) pthread_mutex_init(p_mutex, NULL); - cdsc::condition_variable *v = execution->cond_map.get(p_cond); - cdsc::mutex *m = execution->mutex_map.get(p_mutex); + 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, NULL)); + model->switch_to_master(new ModelAction(NOOP, std::memory_order_seq_cst, v)); // v->wait(*m); // printf("timed_wait called\n"); return 0; @@ -210,10 +188,10 @@ int pthread_cond_timedwait(pthread_cond_t *p_cond, int pthread_cond_signal(pthread_cond_t *p_cond) { // notify only one blocked thread ModelExecution *execution = model->get_execution(); - if ( !execution->cond_map.contains(p_cond) ) + if ( !execution->getCondMap()->contains(p_cond) ) pthread_cond_init(p_cond, NULL); - cdsc::condition_variable *v = execution->cond_map.get(p_cond); + cdsc::snapcondition_variable *v = execution->getCondMap()->get(p_cond); v->notify_one(); return 0;