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

Comparing libeio/xthread.h (file contents):
Revision 1.5 by root, Tue May 20 05:50:49 2008 UTC vs.
Revision 1.10 by root, Tue Feb 15 03:15:16 2011 UTC

… …
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_CREATE(mutex) pthread_mutex_init (&(mutex), 0)
40#define X_LOCK(mutex) pthread_mutex_lock (&(mutex)) 41#define X_LOCK(mutex) pthread_mutex_lock (&(mutex))
41#define X_UNLOCK(mutex) pthread_mutex_unlock (&(mutex)) 42#define X_UNLOCK(mutex) pthread_mutex_unlock (&(mutex))
42 43
43typedef pthread_cond_t cond_t; 44typedef pthread_cond_t xcond_t;
44#define X_COND_INIT PTHREAD_COND_INITIALIZER 45#define X_COND_INIT PTHREAD_COND_INITIALIZER
46#define X_COND_CREATE(cond) pthread_cond_init (&(cond), 0)
45#define X_COND_SIGNAL(cond) pthread_cond_signal (&(cond)) 47#define X_COND_SIGNAL(cond) pthread_cond_signal (&(cond))
46#define X_COND_WAIT(cond,mutex) pthread_cond_wait (&(cond), &(mutex)) 48#define X_COND_WAIT(cond,mutex) pthread_cond_wait (&(cond), &(mutex))
47#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))
48 50
49typedef pthread_t thread_t; 51typedef pthread_t xthread_t;
50#define X_THREAD_PROC(name) void *name (void *thr_arg) 52#define X_THREAD_PROC(name) void *name (void *thr_arg)
51#define X_THREAD_ATFORK(a,b,c) 53#define X_THREAD_ATFORK(a,b,c)
52 54
53static int 55static int
54thread_create (thread_t *tid, void *(*proc)(void *), void *arg) 56thread_create (xthread_t *tid, void *(*proc)(void *), void *arg)
55{ 57{
56 int retval; 58 int retval;
57 pthread_attr_t attr; 59 pthread_attr_t attr;
58 60
59 pthread_attr_init (&attr); 61 pthread_attr_init (&attr);
… …
92#include <fcntl.h> 94#include <fcntl.h>
93#include <signal.h> 95#include <signal.h>
94#include <limits.h> 96#include <limits.h>
95#include <pthread.h> 97#include <pthread.h>
96 98
97typedef pthread_mutex_t mutex_t; 99typedef pthread_mutex_t xmutex_t;
98#if __linux && defined (PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP) 100#if __linux && defined (PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP)
99# 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)
100#else 109#else
101# 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)
102#endif 112#endif
103#define X_LOCK(mutex) pthread_mutex_lock (&(mutex)) 113#define X_LOCK(mutex) pthread_mutex_lock (&(mutex))
104#define X_UNLOCK(mutex) pthread_mutex_unlock (&(mutex)) 114#define X_UNLOCK(mutex) pthread_mutex_unlock (&(mutex))
105 115
106typedef pthread_cond_t cond_t; 116typedef pthread_cond_t xcond_t;
107#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)
108#define X_COND_SIGNAL(cond) pthread_cond_signal (&(cond)) 119#define X_COND_SIGNAL(cond) pthread_cond_signal (&(cond))
109#define X_COND_WAIT(cond,mutex) pthread_cond_wait (&(cond), &(mutex)) 120#define X_COND_WAIT(cond,mutex) pthread_cond_wait (&(cond), &(mutex))
110#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))
111 122
112typedef pthread_t thread_t; 123typedef pthread_t xthread_t;
113#define X_THREAD_PROC(name) static void *name (void *thr_arg) 124#define X_THREAD_PROC(name) static void *name (void *thr_arg)
114#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)
115 126
116// the broken bsd's once more 127// the broken bsd's once more
117#ifndef PTHREAD_STACK_MIN 128#ifndef PTHREAD_STACK_MIN
118# define PTHREAD_STACK_MIN 0 129# define PTHREAD_STACK_MIN 0
119#endif 130#endif
120 131
132#ifndef X_STACKSIZE
133# define X_STACKSIZE sizeof (long) * 4096
134#endif
135
121static int 136static int
122thread_create (thread_t *tid, void *(*proc)(void *), void *arg) 137thread_create (xthread_t *tid, void *(*proc)(void *), void *arg)
123{ 138{
124 int retval; 139 int retval;
125 sigset_t fullsigset, oldsigset; 140 sigset_t fullsigset, oldsigset;
126 pthread_attr_t attr; 141 pthread_attr_t attr;
127 142
128 pthread_attr_init (&attr); 143 pthread_attr_init (&attr);
129 pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED); 144 pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED);
130 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);
131 ? sizeof (long) * 4096 : PTHREAD_STACK_MIN);
132#ifdef PTHREAD_SCOPE_PROCESS 146#ifdef PTHREAD_SCOPE_PROCESS
133 pthread_attr_setscope (&attr, PTHREAD_SCOPE_PROCESS); 147 pthread_attr_setscope (&attr, PTHREAD_SCOPE_PROCESS);
134#endif 148#endif
135 149
136 sigfillset (&fullsigset); 150 sigfillset (&fullsigset);

Diff Legend

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