diff options
author | Robert Collins <rbtcollins@hotmail.com> | 2001-04-12 08:04:53 +0400 |
---|---|---|
committer | Robert Collins <rbtcollins@hotmail.com> | 2001-04-12 08:04:53 +0400 |
commit | 5c83f260b87bb3b8a516dc34abfce9b555c3f1d6 (patch) | |
tree | a9b3e0f999213ab1d076bdfc45a44d74f3a43dcf /winsup/cygwin/include/pthread.h | |
parent | eae0943a1f63ae4bc689fec3e6634d8020e4aff0 (diff) |
* configure.in: Remove PTH_ALLOW.
* cygwin.din: Remove @PTH_ALLOW@ prefixes to pthread functions.
Add new pthread exports.
* pthread.cc: New wrapper functions for the above new exports.
* sched.cc (valid_sched_parameters): New function.
(sched_setparam): Use it.
(sched_set_thread_priority): New function. Used by pthread_sched*.
* thread.cc (pthread_key_destructor::InsertAfter): New function.
(pthread_key_destructor::UnlinkNext): New function.
(pthread_key_destructor::Next): New function.
(pthread_key_destructor_list::Insert): New function.
(pthread_key_destructor_list::Remove): New function.
(pthread_key_destructor_list::Pop): New function.
(pthread_key_destructor::pthread_key_destructor): New function.
(pthread_key_destructor_list::IterateNull): New function.
(MTinterface::Init): Initialise new member.
(pthread::pthread): Initialise new members.
(pthread::create): Copy new attributes. Set the new thread priority.
(pthread_attr::pthread_attr): Initialise new members.
(pthread_key::pthread_key): Setup destructor function.
(pthread_key::~pthread_key): Remove destructor function.
(pthread_mutexattr::pthread_mutexattr): New function.
(pthread_mutexattr::~pthread_mutexattr): New function.
(__pthread_once): New function.
(__pthread_cleanup): New function.
(__pthread_cancel): New function.
(__pthread_setcancelstate): New function.
(__pthread_setcanceltype): New function.
(__pthread_testcancel): New function.
(__pthread_attr_getinheritsched): New function.
(__pthread_attr_getschedparam): New function.
(__pthread_attr_getschedpolicy): New function.
(__pthread_attr_getscope): New function.
(__pthread_attr_setinheritsched): New function.
(__pthread_attr_setschedparam): New function.
(__pthread_attr_setschedpolicy): New function.
(__pthread_attr_setscope): New function.
(__pthread_exit): Call any key destructors on thread exit.
(__pthread_join): Use the embedded attr values.
(__pthread_detach): Use the embedded attr values.
(__pthread_getconcurrency): New function.
(__pthread_getschedparam): New function.
(__pthread_key_create): Pass the destructor on object creation.
(__pthread_key_delete): Correct incorrect prototype.
(__pthread_setconcurrency): New function.
(__pthread_setschedparam): New function.
(__pthread_cond_timedwait): Support static mutex initialisers.
(__pthread_cond_wait): Ditto.
(__pthread_mutex_getprioceiling): New function.
(__pthread_mutex_lock): Support static mutex initialisers.
(__pthread_mutex_trylock): Ditto.
(__pthread_mutex_unlock): Ditto.
(__pthread_mutex_destroy): Ditto.
(__pthread_mutex_setprioceiling): New function.
(__pthread_mutexattr_getprotocol): New function.
(__pthread_mutexattr_getpshared): New function.
(__pthread_mutexattr_gettype): New function.
(__pthread_mutexattr_init): New function.
(__pthread_mutexattr_destroy): New function.
(__pthread_mutexattr_setprotocol): New function.
(__pthread_mutexattr_setprioceiling): New function.
(__pthread_mutexattr_getprioceiling): New function.
(__pthread_mutexattr_setpshared): New function.
(__pthread_mutexattr_settype): New function.
Remove stubs for non MT_SAFE compilation.
* thread.h: Remove duplicate #defines.
Add prototypes for new functions in thread.cc.
(pthread_key_destructor): New class.
(pthread_key_destructor_list): New class.
(pthread_attr): Add new members.
(pthread): Remove members that are duplicated in the pthread_attr class.
(pthread_mutex_attr): Add new members.
(pthread_once): New class.
* include/pthread.h: Add prototypes for new functions exported from cygwin1.dll.
Remove typedefs.
* include/sched.h: Add prototypes for new functions in sched.cc.
* include/cygwin/types.h: Add typedefs from pthread.h
Diffstat (limited to 'winsup/cygwin/include/pthread.h')
-rw-r--r-- | winsup/cygwin/include/pthread.h | 196 |
1 files changed, 129 insertions, 67 deletions
diff --git a/winsup/cygwin/include/pthread.h b/winsup/cygwin/include/pthread.h index d4b73de82..6f8f9025a 100644 --- a/winsup/cygwin/include/pthread.h +++ b/winsup/cygwin/include/pthread.h @@ -12,6 +12,7 @@ #include <sys/types.h> #include <signal.h> +#include <sched.h> #ifndef _PTHREAD_H #define _PTHREAD_H @@ -29,87 +30,148 @@ extern "C" would normally be written to the passed parameter of pthread_cond_init(lvalue, NULL); */ // #define PTHREAD_COND_INITIALIZER 0 -#define PTHREAD_PROCESS_PRIVATE 0 -#define PTHREAD_PROCESS_SHARED 1 #define PTHREAD_DESTRUCTOR_ITERATIONS 1 /* Tls has 64 items for pre win2000 - and we don't want to use them all :] * Before committing discuss this with the list */ #define PTHREAD_KEYS_MAX 32 +/* the default : joinable */ + +#define PTHREAD_CANCEL_ASYNCHRONOUS 1 +/* defaults are enable, deferred */ +#define PTHREAD_CANCEL_ENABLE 0 +#define PTHREAD_CANCEL_DEFERRED 0 +#define PTHREAD_CANCEL_DISABLE 1 +#define PTHREAD_CANCELED +#define PTHREAD_COND_INITIALIZER #define PTHREAD_CREATE_DETACHED 1 /* the default : joinable */ #define PTHREAD_CREATE_JOINABLE 0 +#define PTHREAD_EXPLICIT_SCHED 1 +#define PTHREAD_INHERIT_SCHED 0 +#define PTHREAD_MUTEX_DEFAULT 0 +#define PTHREAD_MUTEX_ERRORCHECK 1 +#define PTHREAD_MUTEX_NORMAL 2 +/* this should be too low to ever be a valid address */ +#define PTHREAD_MUTEX_INITIALIZER (void *)20 +#define PTHREAD_MUTEX_RECURSIVE 0 +#define PTHREAD_ONCE_INIT { PTHREAD_MUTEX_INITIALIZER, 0 } +#define PTHREAD_PRIO_INHERIT +#define PTHREAD_PRIO_NONE +#define PTHREAD_PRIO_PROTECT +#define PTHREAD_PROCESS_SHARED 1 +#define PTHREAD_PROCESS_PRIVATE 0 +#define PTHREAD_RWLOCK_INITIALIZER +/* process is the default */ +#define PTHREAD_SCOPE_PROCESS 0 +#define PTHREAD_SCOPE_SYSTEM 1 + + +/* Attributes */ +int pthread_attr_destroy (pthread_attr_t *); +int pthread_attr_getdetachstate (const pthread_attr_t *, int *); +int pthread_attr_getinheritsched (const pthread_attr_t *, int *); +int pthread_attr_getschedparam (const pthread_attr_t *, struct sched_param *); +int pthread_attr_getschedpolicy (const pthread_attr_t *, int *); +int pthread_attr_getscope (const pthread_attr_t *, int *); +int pthread_attr_init (pthread_attr_t *); +int pthread_attr_setdetachstate (pthread_attr_t *, int); +int pthread_attr_setinheritsched (pthread_attr_t *, int); +int pthread_attr_setschedparam (pthread_attr_t *, const struct sched_param *); +int pthread_attr_setschedpolicy (pthread_attr_t *, int); +int pthread_attr_setscope (pthread_attr_t *, int); + +#ifdef _POSIX_THREAD_ATTR_STACKADDR +/* These functions may be implementable via some low level trickery. For now they are + * Not supported or implemented. The prototypes are here so if someone greps the + * source they will see these comments + */ +int pthread_attr_getstackaddr (const pthread_attr_t *, void **); +int pthread_attr_setstackaddr (pthread_attr_t *, void *); +#endif +#ifdef _POSIX_THREAD_ATTR_STACKSIZE +int pthread_attr_getstacksize (const pthread_attr_t *, size_t *); +int pthread_attr_setstacksize (pthread_attr_t *, size_t); +#endif -/* these shouldn't be defined here but in sys/types. - * defining in sys/types mught also allow us to override them for the internal functions - * more easily (internal sys/types vs external sys/type - dev thoughts on this? - */ - typedef void *pthread_t; - typedef void *pthread_mutex_t; - - typedef void *pthread_key_t; - typedef void *pthread_attr_t; - typedef void *pthread_mutexattr_t; - typedef void *pthread_condattr_t; - typedef void *pthread_cond_t; - -/* ThreadCreation */ - int pthread_create (pthread_t * thread, const pthread_attr_t * attr, - void *(*)(void *), void *arg); - int pthread_attr_init (pthread_attr_t * attr); - int pthread_attr_destroy (pthread_attr_t * attr); - int pthread_attr_setdetachstate (pthread_attr_t *, int); - int pthread_attr_getdetachstate (const pthread_attr_t *, int *); - int pthread_attr_setstacksize (pthread_attr_t * attr, size_t size); - int pthread_attr_getstacksize (pthread_attr_t * attr, size_t * size); +int pthread_cancel (pthread_t); +/* Macros for cleanup_push and pop; + * The function definitions are +void pthread_cleanup_push(void (*routine)(void*), void *arg); +void pthread_cleanup_pop(int execute); +*/ +typedef void __cleanup_routine_type (void *); + +#define pthread_cleanup_push (fn, arg) { __cleanup_routine_type __cleanup_routine=fn; \ +void *__cleanup_param=arg; +#define pthread_cleanup_pop (execute) if (execute) __cleanup_routine(__cleanup_param); } /* Condition variables */ - int pthread_cond_broadcast (pthread_cond_t *); - int pthread_cond_destroy (pthread_cond_t *); - int pthread_cond_init (pthread_cond_t *, const pthread_condattr_t *); - int pthread_cond_signal (pthread_cond_t *); - int pthread_cond_timedwait (pthread_cond_t *, - pthread_mutex_t *, const struct timespec *); - int pthread_cond_wait (pthread_cond_t *, pthread_mutex_t *); - int pthread_condattr_destroy (pthread_condattr_t *); - int pthread_condattr_getpshared (const pthread_condattr_t *, int *); - int pthread_condattr_init (pthread_condattr_t *); - int pthread_condattr_setpshared (pthread_condattr_t *, int); - - -/* Thread Control */ - int pthread_detach (pthread_t thread); - int pthread_join (pthread_t thread, void **value_ptr); - -/* Thread Exit */ - void pthread_exit (void *value_ptr); - -/* Thread SpecificData */ - int pthread_key_create (pthread_key_t *, void (*)(void *)); - int pthread_key_delete (pthread_key_t * key); - int pthread_setspecific (pthread_key_t key, const void *value); - void *pthread_getspecific (pthread_key_t key); - -/* Thread signal (should be in signal.h) */ - int pthread_kill (pthread_t * thread, int sig); - int pthread_sigmask (int operation, const sigset_t * set, - sigset_t * old_set); - -/* ID */ - pthread_t pthread_self (); - int pthread_equal (pthread_t t1, pthread_t t2); - -/* Mutexes */ - int pthread_mutex_init (pthread_mutex_t * mutex, - const pthread_mutexattr_t *); - int pthread_mutex_lock (pthread_mutex_t * mutext); - int pthread_mutex_trylock (pthread_mutex_t * mutext); - int pthread_mutex_unlock (pthread_mutex_t * mutext); - int pthread_mutex_destroy (pthread_mutex_t * mutext); +int pthread_cond_broadcast (pthread_cond_t *); +int pthread_cond_destroy (pthread_cond_t *); +int pthread_cond_init (pthread_cond_t *, const pthread_condattr_t *); +int pthread_cond_signal (pthread_cond_t *); +int pthread_cond_timedwait (pthread_cond_t *, + pthread_mutex_t *, const struct timespec *); +int pthread_cond_wait (pthread_cond_t *, pthread_mutex_t *); +int pthread_condattr_destroy (pthread_condattr_t *); +int pthread_condattr_getpshared (const pthread_condattr_t *, int *); +int pthread_condattr_init (pthread_condattr_t *); +int pthread_condattr_setpshared (pthread_condattr_t *, int); + +int pthread_create (pthread_t *, const pthread_attr_t *, + void *(*)(void *), void *); +int pthread_detach (pthread_t); +int pthread_equal (pthread_t, pthread_t); +void pthread_exit (void *); +int pthread_getschedparam (pthread_t, int *, struct sched_param *); +void *pthread_getspecific (pthread_key_t); +int pthread_join (pthread_t, void **); +int pthread_key_create (pthread_key_t *, void (*)(void *)); +int pthread_key_delete (pthread_key_t); + +/* Mutex's */ +int pthread_mutex_destroy (pthread_mutex_t *); +int pthread_mutex_getprioceiling (const pthread_mutex_t *, int *); +int pthread_mutex_init (pthread_mutex_t *, const pthread_mutexattr_t *); +int pthread_mutex_lock (pthread_mutex_t *); +int pthread_mutex_setprioceiling (pthread_mutex_t *, int, int *); +int pthread_mutex_trylock (pthread_mutex_t *); +int pthread_mutex_unlock (pthread_mutex_t *); +int pthread_mutexattr_destroy (pthread_mutexattr_t *); +int pthread_mutexattr_getprioceiling (const pthread_mutexattr_t *, int *); +int pthread_mutexattr_getprotocol (const pthread_mutexattr_t *, int *); +int pthread_mutexattr_getpshared (const pthread_mutexattr_t *, int *); +int pthread_mutexattr_gettype (const pthread_mutexattr_t *, int *); +int pthread_mutexattr_init (pthread_mutexattr_t *); +int pthread_mutexattr_setprioceiling (pthread_mutexattr_t *, int); +int pthread_mutexattr_setprotocol (pthread_mutexattr_t *, int); +int pthread_mutexattr_setpshared (pthread_mutexattr_t *, int); +int pthread_mutexattr_settype (pthread_mutexattr_t *, int); + +int pthread_once (pthread_once_t *, void (*)(void)); + +/* Concurrency levels - X/Open interface */ +int pthread_getconcurrency (void); +int pthread_setconcurrency (int); + + +pthread_t pthread_self (void); +int pthread_setcancelstate (int, int *); +int pthread_setcanceltype (int, int *); +int pthread_setschedparam (pthread_t, int, const struct sched_param *); +int pthread_setspecific (pthread_key_t, const void *); +void pthread_testcancel (void); + +/* Non posix calls */ + +int pthread_suspend (pthread_t); +int pthread_continue (pthread_t); + #ifdef __cplusplus } #endif -#endif /* _PTHREAD_H */ +#endif /* _PTHREAD_H */ |