From 5881b6573197c0366e2380cf28f78189c3fde312 Mon Sep 17 00:00:00 2001 From: weiyu Date: Mon, 17 Jun 2019 10:09:33 -0700 Subject: [PATCH] rename pthead.h to mypthread.h --- action.h | 2 +- execution.h | 2 +- include/{pthread.h => mypthread.h} | 19 ------------------- pthread.cc | 2 +- 4 files changed, 3 insertions(+), 22 deletions(-) rename include/{pthread.h => mypthread.h} (83%) diff --git a/action.h b/action.h index 4b49f145..e65b8db9 100644 --- a/action.h +++ b/action.h @@ -11,7 +11,7 @@ #include "mymemory.h" #include "memoryorder.h" #include "modeltypes.h" -#include "pthread.h" +#include "mypthread.h" #include "classlist.h" namespace cdsc { diff --git a/execution.h b/execution.h index f14628bf..b78837fc 100644 --- a/execution.h +++ b/execution.h @@ -14,7 +14,7 @@ #include "modeltypes.h" #include "stl-model.h" #include "params.h" -#include "pthread.h" +#include "mypthread.h" #include "mutex.h" #include #include "classlist.h" diff --git a/include/pthread.h b/include/mypthread.h similarity index 83% rename from include/pthread.h rename to include/mypthread.h index 97c686b8..ad92d24d 100644 --- a/include/pthread.h +++ b/include/mypthread.h @@ -18,27 +18,8 @@ struct pthread_params { }; extern "C" { -int pthread_create(pthread_t *, const pthread_attr_t *, - void *(*start_routine) (void *), void * arg); -void pthread_exit(void *); -int pthread_join(pthread_t, void **); pthread_t pthread_self(void); - -int pthread_mutex_init(pthread_mutex_t *, const pthread_mutexattr_t *); -int pthread_mutex_lock(pthread_mutex_t *); -int pthread_mutex_trylock(pthread_mutex_t *); -int pthread_mutex_unlock(pthread_mutex_t *); -int pthread_mutex_timedlock (pthread_mutex_t *__restrict p_mutex, - const struct timespec *__restrict __abstime); - -int pthread_cond_init(pthread_cond_t *p_cond, const pthread_condattr_t *attr); -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); -int pthread_cond_signal(pthread_cond_t *); - - int user_main(int, char**); // --- not implemented yet --- diff --git a/pthread.cc b/pthread.cc index 4f2dcd0e..8c2bc076 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" -- 2.34.1