X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=pthread.cc;h=3f642951c1d848c470fe80e2df3c1230f164715a;hb=0229244d21ca78bf781e41684810e9fb6d5ca56c;hp=750a302ceb454439306403805e0fceb287e652b1;hpb=6b12232a5e3db3bc7f4cbcfa772ba86f1de04cc9;p=c11tester.git diff --git a/pthread.cc b/pthread.cc index 750a302c..3f642951 100644 --- a/pthread.cc +++ b/pthread.cc @@ -2,12 +2,57 @@ #include "threads-model.h" #include "action.h" #include "pthread.h" -#include + +#include "snapshot-interface.h" +#include "datarace.h" + +#include "mutex.h" +#include +#include /* global "model" object */ #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) { struct pthread_params params = { start_routine, arg }; @@ -41,7 +86,11 @@ void pthread_exit(void *value_ptr) { } int pthread_mutex_init(pthread_mutex_t *p_mutex, const pthread_mutexattr_t *) { - std::mutex *m = new std::mutex(); + if (!model) { + snapshot_system_init(10000, 1024, 1024, 40000, &model_main); + } + + cdsc::mutex *m = new cdsc::mutex(); ModelExecution *execution = model->get_execution(); execution->mutex_map.put(p_mutex, m); @@ -50,26 +99,65 @@ 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(); - std::mutex *m = execution->mutex_map.get(p_mutex); - m->lock(); - /* error message? */ + + /* 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)) { + pthread_mutex_init(p_mutex, NULL); + } + + cdsc::mutex *m = execution->mutex_map.get(p_mutex); + + if (m != NULL) { + m->lock(); + } else { + printf("ah\n"); + } + return 0; } + int pthread_mutex_trylock(pthread_mutex_t *p_mutex) { ModelExecution *execution = model->get_execution(); - std::mutex *m = execution->mutex_map.get(p_mutex); + cdsc::mutex *m = execution->mutex_map.get(p_mutex); return m->try_lock(); - - /* error message? */ } int pthread_mutex_unlock(pthread_mutex_t *p_mutex) { ModelExecution *execution = model->get_execution(); - std::mutex *m = execution->mutex_map.get(p_mutex); - m->unlock(); + cdsc::mutex *m = execution->mutex_map.get(p_mutex); + + if (m != NULL) { + m->unlock(); + } else { + printf("try to unlock an untracked pthread_mutex\n"); + } return 0; } +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::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; +} + pthread_t pthread_self() { Thread* th = model->get_current_thread(); return th->get_id(); @@ -79,3 +167,65 @@ 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::condition_variable *v = new cdsc::condition_variable(); + + ModelExecution *execution = model->get_execution(); + execution->cond_map.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) ) + 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); + + 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->cond_map.contains(p_cond) ) + pthread_cond_init(p_cond, NULL); + if ( !execution->mutex_map.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); + + model->switch_to_master(new ModelAction(NOOP, std::memory_order_seq_cst, v, NULL)); +// 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->cond_map.contains(p_cond) ) + pthread_cond_init(p_cond, NULL); + + cdsc::condition_variable *v = execution->cond_map.get(p_cond); + + v->notify_one(); + return 0; +} + +void pthread_cleanup_push(void (*routine)(void*), void *arg ) { + printf("pthrea cleanup push called\n"); +} + +int pthread_once (pthread_once_t *__once_control, + void (*__init_routine)) { + printf("pthread once is called\n"); +} + +