X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=pthread.cc;h=20999aea4899c61f6fb20e0f6707d29e16737dde;hb=7742256df627848c1c375f979f5369a45c92057b;hp=d6067eb20fdafb70f04a8378150ba479f3465fd8;hpb=bbc0bd0561362e1cb93c04fddc165b49d83c24ed;p=c11tester.git diff --git a/pthread.cc b/pthread.cc index d6067eb2..20999aea 100644 --- a/pthread.cc +++ b/pthread.cc @@ -15,19 +15,12 @@ #include int pthread_create(pthread_t *t, const pthread_attr_t * attr, - pthread_start_t start_routine, void * arg) { - if (!model) { - snapshot_system_init(10000, 1024, 1024, 40000); - model = new ModelChecker(); - model->startChecker(); - } - + pthread_start_t start_routine, void * arg) { + createModelIfNotExist(); struct pthread_params params = { start_routine, arg }; - ModelAction *act = new ModelAction(PTHREAD_CREATE, std::memory_order_seq_cst, t, (uint64_t)¶ms); - /* seq_cst is just a 'don't care' parameter */ - model->switch_to_master(act); + model->switch_thread(new ModelAction(PTHREAD_CREATE, std::memory_order_seq_cst, t, (uint64_t)¶ms)); return 0; } @@ -36,7 +29,7 @@ int pthread_join(pthread_t t, void **value_ptr) { 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()))); + model->switch_thread(new ModelAction(PTHREAD_JOIN, std::memory_order_seq_cst, th, id_to_int(th->get_id()))); if ( value_ptr ) { // store return value @@ -52,21 +45,27 @@ int pthread_detach(pthread_t t) { return 0; } +/* Take care of both pthread_yield and c++ thread yield */ +int sched_yield() { + model->switch_thread(new ModelAction(THREAD_YIELD, std::memory_order_seq_cst, thread_current(), VALUE_NONE)); + return 0; +} + void pthread_exit(void *value_ptr) { Thread * th = thread_current(); th->set_pthread_return(value_ptr); - model->switch_to_master(new ModelAction(THREADONLY_FINISH, std::memory_order_seq_cst, th)); + model->switch_thread(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 *) { - if (!model) { - snapshot_system_init(10000, 1024, 1024, 40000); - model = new ModelChecker(); - model->startChecker(); - } - cdsc::snapmutex *m = new cdsc::snapmutex(); +int pthread_mutex_init(pthread_mutex_t *p_mutex, const pthread_mutexattr_t * attr) { + createModelIfNotExist(); + int mutex_type = PTHREAD_MUTEX_DEFAULT; + if (attr != NULL) + pthread_mutexattr_gettype(attr, &mutex_type); + + cdsc::snapmutex *m = new cdsc::snapmutex(mutex_type); ModelExecution *execution = model->get_execution(); execution->getMutexMap()->put(p_mutex, m); @@ -75,12 +74,7 @@ int pthread_mutex_init(pthread_mutex_t *p_mutex, const pthread_mutexattr_t *) { } int pthread_mutex_lock(pthread_mutex_t *p_mutex) { - if (!model) { - snapshot_system_init(10000, 1024, 1024, 40000); - model = new ModelChecker(); - model->startChecker(); - } - + createModelIfNotExist(); ModelExecution *execution = model->get_execution(); /* to protect the case where PTHREAD_MUTEX_INITIALIZER is used @@ -102,15 +96,10 @@ int pthread_mutex_lock(pthread_mutex_t *p_mutex) { } int pthread_mutex_trylock(pthread_mutex_t *p_mutex) { - if (!model) { - snapshot_system_init(10000, 1024, 1024, 40000); - model = new ModelChecker(); - model->startChecker(); - } - + createModelIfNotExist(); ModelExecution *execution = model->get_execution(); cdsc::snapmutex *m = execution->getMutexMap()->get(p_mutex); - return m->try_lock(); + return m->try_lock() ? 0 : EBUSY; } int pthread_mutex_unlock(pthread_mutex_t *p_mutex) { ModelExecution *execution = model->get_execution(); @@ -127,15 +116,9 @@ 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 - - if (!model) { - snapshot_system_init(10000, 1024, 1024, 40000); - model = new ModelChecker(); - model->startChecker(); - } - + createModelIfNotExist(); ModelExecution *execution = model->get_execution(); /* to protect the case where PTHREAD_MUTEX_INITIALIZER is used @@ -156,6 +139,7 @@ int pthread_mutex_timedlock (pthread_mutex_t *__restrict p_mutex, } pthread_t pthread_self() { + createModelIfNotExist(); Thread* th = model->get_current_thread(); return (pthread_t)th->get_id(); } @@ -188,7 +172,7 @@ int pthread_cond_wait(pthread_cond_t *p_cond, pthread_mutex_t *p_mutex) { } int pthread_cond_timedwait(pthread_cond_t *p_cond, - pthread_mutex_t *p_mutex, const struct timespec *abstime) { + pthread_mutex_t *p_mutex, const struct timespec *abstime) { ModelExecution *execution = model->get_execution(); if ( !execution->getCondMap()->contains(p_cond) ) @@ -199,7 +183,7 @@ int pthread_cond_timedwait(pthread_cond_t *p_cond, cdsc::snapcondition_variable *v = execution->getCondMap()->get(p_cond); cdsc::snapmutex *m = execution->getMutexMap()->get(p_mutex); - model->switch_to_master(new ModelAction(ATOMIC_TIMEDWAIT, std::memory_order_seq_cst, v, (uint64_t) m)); + model->switch_thread(new ModelAction(ATOMIC_TIMEDWAIT, std::memory_order_seq_cst, v, (uint64_t) m)); m->lock(); // model_print("Timed_wait is called\n"); @@ -240,3 +224,37 @@ int pthread_cond_destroy(pthread_cond_t *p_cond) { } return 0; } + +/* https://github.com/lattera/glibc/blob/master/nptl/pthread_getattr_np.c */ +int pthread_getattr_np(pthread_t t, pthread_attr_t *attr) +{ + ModelExecution *execution = model->get_execution(); + Thread *th = execution->get_pthread(t); + + struct pthread_attr *iattr = (struct pthread_attr *) attr; + + /* The sizes are subject to alignment. */ + if (th != NULL) { +#if _STACK_GROWS_DOWN + ASSERT(false); +#else + iattr->stackaddr = (char *) th->get_stack_addr(); +#endif + + } else { + ASSERT(false); + } + + return 0; +} + +int pthread_setname_np(pthread_t t, const char *name) +{ + ModelExecution *execution = model->get_execution(); + Thread *th = execution->get_pthread(t); + + if (th != NULL) + return 0; + + return 1; +}