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

Comparing libeio/xthread.h (file contents):
Revision 1.9 by root, Sat Oct 30 14:36:53 2010 UTC vs.
Revision 1.10 by root, Tue Feb 15 03:15:16 2011 UTC

… …
27#include <winsock2.h> 27#include <winsock2.h>
28#include <process.h> 28#include <process.h>
29#include <windows.h> 29#include <windows.h>
30#include <pthread.h> 30#include <pthread.h>
31#define sigset_t int 31#define sigset_t int
32#define sigfillset(a)
32#define pthread_sigmask(a,b,c) 33#define pthread_sigmask(a,b,c)
33#define sigaddset(a,b) 34#define sigaddset(a,b)
34#define sigemptyset(s) 35#define sigemptyset(s)
35#define sigfillset(s) 36#define sigfillset(s)
36 37
37typedef pthread_mutex_t xmutex_t; 38typedef pthread_mutex_t xmutex_t;
38#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)
39#define X_LOCK(mutex) pthread_mutex_lock (&(mutex)) 41#define X_LOCK(mutex) pthread_mutex_lock (&(mutex))
40#define X_UNLOCK(mutex) pthread_mutex_unlock (&(mutex)) 42#define X_UNLOCK(mutex) pthread_mutex_unlock (&(mutex))
41 43
42typedef pthread_cond_t xcond_t; 44typedef pthread_cond_t xcond_t;
43#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)
44#define X_COND_SIGNAL(cond) pthread_cond_signal (&(cond)) 47#define X_COND_SIGNAL(cond) pthread_cond_signal (&(cond))
45#define X_COND_WAIT(cond,mutex) pthread_cond_wait (&(cond), &(mutex)) 48#define X_COND_WAIT(cond,mutex) pthread_cond_wait (&(cond), &(mutex))
46#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))
47 50
48typedef pthread_t xthread_t; 51typedef pthread_t xthread_t;
… …
93#include <limits.h> 96#include <limits.h>
94#include <pthread.h> 97#include <pthread.h>
95 98
96typedef pthread_mutex_t xmutex_t; 99typedef pthread_mutex_t xmutex_t;
97#if __linux && defined (PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP) 100#if __linux && defined (PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP)
98# 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)
99#else 109#else
100# 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)
101#endif 112#endif
102#define X_LOCK(mutex) pthread_mutex_lock (&(mutex)) 113#define X_LOCK(mutex) pthread_mutex_lock (&(mutex))
103#define X_UNLOCK(mutex) pthread_mutex_unlock (&(mutex)) 114#define X_UNLOCK(mutex) pthread_mutex_unlock (&(mutex))
104 115
105typedef pthread_cond_t xcond_t; 116typedef pthread_cond_t xcond_t;
106#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)
107#define X_COND_SIGNAL(cond) pthread_cond_signal (&(cond)) 119#define X_COND_SIGNAL(cond) pthread_cond_signal (&(cond))
108#define X_COND_WAIT(cond,mutex) pthread_cond_wait (&(cond), &(mutex)) 120#define X_COND_WAIT(cond,mutex) pthread_cond_wait (&(cond), &(mutex))
109#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))
110 122
111typedef pthread_t xthread_t; 123typedef pthread_t xthread_t;
112#define X_THREAD_PROC(name) static void *name (void *thr_arg) 124#define X_THREAD_PROC(name) static void *name (void *thr_arg)
113#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)
114 126

Diff Legend

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