X-Git-Url: http://nsz.repo.hu/git/?p=musl;a=blobdiff_plain;f=include%2Fpthread.h;h=d4ffb9ab0916715d103d8b2478b2cb7f88097ee7;hp=749a0e8c01f62eb8d8d7a59a290f7d344f9729b8;hb=594318fd3d13c7dda1ea87a76934e052ac74301f;hpb=e882756311c7b06e59fcc8e582f03852b7dcfd30

diff --git a/include/pthread.h b/include/pthread.h
index 749a0e8c..d4ffb9ab 100644
--- a/include/pthread.h
+++ b/include/pthread.h
@@ -5,6 +5,7 @@ extern "C" {
 #endif
 
 #define __NEED_time_t
+#define __NEED_clockid_t
 #define __NEED_struct_timespec
 #define __NEED_sigset_t
 #define __NEED_pthread_t
@@ -52,9 +53,9 @@ extern "C" {
 #define PTHREAD_PROCESS_SHARED 1
 
 
-#define PTHREAD_MUTEX_INITIALIZER {0}
-#define PTHREAD_RWLOCK_INITIALIZER {0}
-#define PTHREAD_COND_INITIALIZER {0}
+#define PTHREAD_MUTEX_INITIALIZER {{{0}}}
+#define PTHREAD_RWLOCK_INITIALIZER {{{0}}}
+#define PTHREAD_COND_INITIALIZER {{{0}}}
 #define PTHREAD_ONCE_INIT 0
 
 
@@ -64,7 +65,7 @@ extern "C" {
 #define PTHREAD_CANCEL_DEFERRED 0
 #define PTHREAD_CANCEL_ASYNCHRONOUS 1
 
-#define PTHREAD_CANCELLED ((void *)-1)
+#define PTHREAD_CANCELED ((void *)-1)
 
 
 #define PTHREAD_BARRIER_SERIAL_THREAD (-1)
@@ -75,8 +76,13 @@ int pthread_detach(pthread_t);
 void pthread_exit(void *);
 int pthread_join(pthread_t, void **);
 
+#ifdef __GNUC__
+__attribute__((const))
+#endif
 pthread_t pthread_self(void);
+
 int pthread_equal(pthread_t, pthread_t);
+#define pthread_equal(x,y) ((x)==(y))
 
 int pthread_setcancelstate(int, int *);
 int pthread_setcanceltype(int, int *);
@@ -91,6 +97,7 @@ int pthread_mutex_unlock(pthread_mutex_t *);
 int pthread_mutex_trylock(pthread_mutex_t *);
 int pthread_mutex_timedlock(pthread_mutex_t *, const struct timespec *);
 int pthread_mutex_destroy(pthread_mutex_t *);
+int pthread_mutex_consistent(pthread_mutex_t *);
 
 int pthread_cond_init(pthread_cond_t *, const pthread_condattr_t *);
 int pthread_cond_destroy(pthread_cond_t *);
@@ -127,21 +134,21 @@ int pthread_setspecific(pthread_key_t, const void *);
 int pthread_attr_init(pthread_attr_t *);
 int pthread_attr_destroy(pthread_attr_t *);
 
-int pthread_attr_getguardsize(pthread_attr_t *, size_t *);
+int pthread_attr_getguardsize(const pthread_attr_t *, size_t *);
 int pthread_attr_setguardsize(pthread_attr_t *, size_t);
-int pthread_attr_getstacksize(pthread_attr_t *, size_t *);
+int pthread_attr_getstacksize(const pthread_attr_t *, size_t *);
 int pthread_attr_setstacksize(pthread_attr_t *, size_t);
-int pthread_attr_getdetachstate(pthread_attr_t *, int *);
+int pthread_attr_getdetachstate(const pthread_attr_t *, int *);
 int pthread_attr_setdetachstate(pthread_attr_t *, int);
-int pthread_attr_getstack(pthread_attr_t *, void **, size_t *);
+int pthread_attr_getstack(const pthread_attr_t *, void **, size_t *);
 int pthread_attr_setstack(pthread_attr_t *, void *, size_t);
-int pthread_attr_getscope(pthread_attr_t *, int *);
+int pthread_attr_getscope(const pthread_attr_t *, int *);
 int pthread_attr_setscope(pthread_attr_t *, int);
-int pthread_attr_getschedpolicy(pthread_attr_t *, int *);
+int pthread_attr_getschedpolicy(const pthread_attr_t *, int *);
 int pthread_attr_setschedpolicy(pthread_attr_t *, int);
-int pthread_attr_getschedparam(pthread_attr_t *, struct sched_param *);
+int pthread_attr_getschedparam(const pthread_attr_t *, struct sched_param *);
 int pthread_attr_setschedparam(pthread_attr_t *, const struct sched_param *);
-int pthread_attr_getinheritsched(pthread_attr_t *, int *);
+int pthread_attr_getinheritsched(const pthread_attr_t *, int *);
 int pthread_attr_setinheritsched(pthread_attr_t *, int);
 
 int pthread_mutexattr_destroy(pthread_mutexattr_t *);
@@ -157,27 +164,39 @@ int pthread_mutexattr_setpshared(pthread_mutexattr_t *, int);
 int pthread_mutexattr_setrobust(pthread_mutexattr_t *, int);
 int pthread_mutexattr_settype(pthread_mutexattr_t *, int);
 
+int pthread_condattr_init(pthread_condattr_t *);
+int pthread_condattr_destroy(pthread_condattr_t *);
+int pthread_condattr_setclock(pthread_condattr_t *, clockid_t);
+int pthread_condattr_setpshared(pthread_condattr_t *, int);
+int pthread_condattr_getclock(const pthread_condattr_t *, clockid_t *);
+int pthread_condattr_getpshared(const pthread_condattr_t *, int *);
+
+int pthread_rwlockattr_init(pthread_rwlockattr_t *);
+int pthread_rwlockattr_destroy(pthread_rwlockattr_t *);
+int pthread_rwlockattr_setpshared(pthread_rwlockattr_t *, int);
+int pthread_rwlockattr_getpshared(const pthread_rwlockattr_t *, int *);
+
 int pthread_barrierattr_destroy(pthread_barrierattr_t *);
 int pthread_barrierattr_getpshared(const pthread_barrierattr_t *, int *);
 int pthread_barrierattr_init(pthread_barrierattr_t *);
 int pthread_barrierattr_setpshared(pthread_barrierattr_t *, int);
 
-#include <bits/pthread.h>
+int pthread_atfork(void (*)(void), void (*)(void), void (*)(void));
 
-int __setjmp(void *);
-void __pthread_register_cancel(struct __ptcb *);
-void __pthread_unregister_cancel(struct __ptcb *);
-void __pthread_unwind_next(struct __ptcb *);
+int pthread_getconcurrency(void);
+int pthread_setconcurrency(int);
 
-#define pthread_cleanup_push(f, x) \
-do { struct __ptcb __cb; void (*__f)(void *) = (f); void *__x = (x); \
-if (__setjmp(__cb.__jb)) __f(__x), __pthread_unwind_next(&__cb); \
-__pthread_register_cancel(&__cb); {
+struct __ptcb {
+	void (*__f)(void *);
+	void *__x;
+	struct __ptcb *__next;
+};
 
-#define pthread_cleanup_pop(r) ; } \
-__pthread_unregister_cancel(&__cb); \
-if (r) __f(__x); } while (0)
+void _pthread_cleanup_push(struct __ptcb *, void (*)(void *), void *);
+void _pthread_cleanup_pop(struct __ptcb *, int);
 
+#define pthread_cleanup_push(f, x) do { struct __ptcb __cb; _pthread_cleanup_push(&__cb, f, x);
+#define pthread_cleanup_pop(r) _pthread_cleanup_pop(&__cb, (r)); } while(0)
 
 #ifdef __cplusplus
 }