ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/libeio/xthread.h
(Generate patch)

Comparing libeio/xthread.h (file contents):
Revision 1.3 by root, Mon May 12 16:19:42 2008 UTC vs.
Revision 1.12 by root, Thu Jul 14 19:34:39 2011 UTC

1#ifndef XTHREAD_H_ 1#ifndef XTHREAD_H_
2#define XTHREAD_H_ 2#define XTHREAD_H_
3 3
4/* whether word reads are potentially non-atomic. 4/* whether word reads are potentially non-atomic.
5 * this is conservatice, likely most arches this runs 5 * this is conservative, likely most arches this runs
6 * on have atomic word read/writes. 6 * on have atomic word read/writes.
7 */ 7 */
8#ifndef WORDACCESS_UNSAFE 8#ifndef WORDACCESS_UNSAFE
9# if __i386 || __x86_64 9# if __i386 || __x86_64
10# define WORDACCESS_UNSAFE 0 10# define WORDACCESS_UNSAFE 0
… …
33#define pthread_sigmask(a,b,c) 33#define pthread_sigmask(a,b,c)
34#define sigaddset(a,b) 34#define sigaddset(a,b)
35#define sigemptyset(s) 35#define sigemptyset(s)
36#define sigfillset(s) 36#define sigfillset(s)
37 37
38typedef pthread_mutex_t mutex_t; 38typedef pthread_mutex_t xmutex_t;
39#define X_MUTEX_INIT PTHREAD_MUTEX_INITIALIZER 39#define X_MUTEX_INIT PTHREAD_MUTEX_INITIALIZER
40#define X_MUTEX_CHECK(mutex) 40#define X_MUTEX_CREATE(mutex) pthread_mutex_init (&(mutex), 0)
41#define X_LOCK(mutex) pthread_mutex_lock (&(mutex)) 41#define X_LOCK(mutex) pthread_mutex_lock (&(mutex))
42#define X_UNLOCK(mutex) pthread_mutex_unlock (&(mutex)) 42#define X_UNLOCK(mutex) pthread_mutex_unlock (&(mutex))
43 43
44typedef pthread_cond_t cond_t; 44typedef pthread_cond_t xcond_t;
45#define X_COND_INIT PTHREAD_COND_INITIALIZER 45#define X_COND_INIT PTHREAD_COND_INITIALIZER
46#define X_COND_CHECK(cond) 46#define X_COND_CREATE(cond) pthread_cond_init (&(cond), 0)
47#define X_COND_SIGNAL(cond) pthread_cond_signal (&(cond)) 47#define X_COND_SIGNAL(cond) pthread_cond_signal (&(cond))
48#define X_COND_WAIT(cond,mutex) pthread_cond_wait (&(cond), &(mutex)) 48#define X_COND_WAIT(cond,mutex) pthread_cond_wait (&(cond), &(mutex))
49#define X_COND_TIMEDWAIT(cond,mutex,to) pthread_cond_timedwait (&(cond), &(mutex), &(to)) 49#define X_COND_TIMEDWAIT(cond,mutex,to) pthread_cond_timedwait (&(cond), &(mutex), &(to))
50 50
51typedef pthread_t thread_t; 51typedef pthread_t xthread_t;
52#define X_THREAD_PROC(name) void *name (void *thr_arg) 52#define X_THREAD_PROC(name) void *name (void *thr_arg)
53#define X_THREAD_ATFORK(a,b,c) 53#define X_THREAD_ATFORK(a,b,c)
54 54
55static int 55static int
56thread_create (thread_t *tid, void *(*proc)(void *), void *arg) 56thread_create (xthread_t *tid, void *(*proc)(void *), void *arg)
57{ 57{
58 int retval; 58 int retval;
59 pthread_attr_t attr; 59 pthread_attr_t attr;
60 60
61 pthread_attr_init (&attr); 61 pthread_attr_init (&attr);
… …
94#include <fcntl.h> 94#include <fcntl.h>
95#include <signal.h> 95#include <signal.h>
96#include <limits.h> 96#include <limits.h>
97#include <pthread.h> 97#include <pthread.h>
98 98
99typedef pthread_mutex_t mutex_t; 99typedef pthread_mutex_t xmutex_t;
100#if __linux && defined (PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP) 100#if __linux && defined (PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP)
101# define X_MUTEX_INIT PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP 101# define X_MUTEX_INIT PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP
102# define X_MUTEX_CREATE(mutex) \
103 do { \
104 pthread_mutexattr_t attr; \
105 pthread_mutexattr_init (&attr); \
106 pthread_mutexattr_settype (&attr, PTHREAD_MUTEX_ADAPTIVE_NP); \
107 pthread_mutex_init (&(mutex), &attr); \
108 } while (0)
102#else 109#else
103# define X_MUTEX_INIT PTHREAD_MUTEX_INITIALIZER 110# define X_MUTEX_INIT PTHREAD_MUTEX_INITIALIZER
111# define X_MUTEX_CREATE(mutex) pthread_mutex_init (&(mutex), 0)
104#endif 112#endif
105#define X_LOCK(mutex) pthread_mutex_lock (&(mutex)) 113#define X_LOCK(mutex) pthread_mutex_lock (&(mutex))
106#define X_UNLOCK(mutex) pthread_mutex_unlock (&(mutex)) 114#define X_UNLOCK(mutex) pthread_mutex_unlock (&(mutex))
107 115
108typedef pthread_cond_t cond_t; 116typedef pthread_cond_t xcond_t;
109#define X_COND_INIT PTHREAD_COND_INITIALIZER 117#define X_COND_INIT PTHREAD_COND_INITIALIZER
118#define X_COND_CREATE(cond) pthread_cond_init (&(cond), 0)
110#define X_COND_SIGNAL(cond) pthread_cond_signal (&(cond)) 119#define X_COND_SIGNAL(cond) pthread_cond_signal (&(cond))
111#define X_COND_WAIT(cond,mutex) pthread_cond_wait (&(cond), &(mutex)) 120#define X_COND_WAIT(cond,mutex) pthread_cond_wait (&(cond), &(mutex))
112#define X_COND_TIMEDWAIT(cond,mutex,to) pthread_cond_timedwait (&(cond), &(mutex), &(to)) 121#define X_COND_TIMEDWAIT(cond,mutex,to) pthread_cond_timedwait (&(cond), &(mutex), &(to))
113 122
114typedef pthread_t thread_t; 123typedef pthread_t xthread_t;
115#define X_THREAD_PROC(name) static void *name (void *thr_arg) 124#define X_THREAD_PROC(name) static void *name (void *thr_arg)
116#define X_THREAD_ATFORK(prepare,parent,child) pthread_atfork (prepare, parent, child) 125#define X_THREAD_ATFORK(prepare,parent,child) pthread_atfork (prepare, parent, child)
117 126
127// the broken bsd's once more
128#ifndef PTHREAD_STACK_MIN
129# define PTHREAD_STACK_MIN 0
130#endif
131
132#ifndef X_STACKSIZE
133# define X_STACKSIZE sizeof (void *) * 4096
134#endif
135
118static int 136static int
119thread_create (thread_t *tid, void *(*proc)(void *), void *arg) 137thread_create (xthread_t *tid, void *(*proc)(void *), void *arg)
120{ 138{
121 int retval; 139 int retval;
122 sigset_t fullsigset, oldsigset; 140 sigset_t fullsigset, oldsigset;
123 pthread_attr_t attr; 141 pthread_attr_t attr;
124 142
125 pthread_attr_init (&attr); 143 pthread_attr_init (&attr);
126 pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED); 144 pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED);
127 pthread_attr_setstacksize (&attr, PTHREAD_STACK_MIN < sizeof (long) * 4096 145 pthread_attr_setstacksize (&attr, PTHREAD_STACK_MIN < X_STACKSIZE ? X_STACKSIZE : PTHREAD_STACK_MIN);
128 ? sizeof (long) * 4096 : PTHREAD_STACK_MIN);
129#ifdef PTHREAD_SCOPE_PROCESS 146#ifdef PTHREAD_SCOPE_PROCESS
130 pthread_attr_setscope (&attr, PTHREAD_SCOPE_PROCESS); 147 pthread_attr_setscope (&attr, PTHREAD_SCOPE_PROCESS);
131#endif 148#endif
132 149
133 sigfillset (&fullsigset); 150 sigfillset (&fullsigset);

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines