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.17 by root, Thu May 9 03:03:24 2013 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
… …
14#endif 14#endif
15 15
16///////////////////////////////////////////////////////////////////////////// 16/////////////////////////////////////////////////////////////////////////////
17 17
18#ifdef _WIN32 18#ifdef _WIN32
19typedef int ssize_t;
20 19
21#define NTDDI_VERSION NTDDI_WIN2K // needed to get win2000 api calls 20//#define NTDDI_VERSION NTDDI_WIN2K // needed to get win2000 api calls, fails with mingw
22#define _WIN32_WINNT 0x400 21#define _WIN32_WINNT 0x400 // maybe working alternative for mingw
23#include <stdio.h>//D 22#include <stdio.h>//D
24#include <fcntl.h> 23#include <fcntl.h>
25#include <io.h> 24#include <io.h>
26#include <time.h> 25#include <time.h>
27#include <winsock2.h> 26#include <winsock2.h>
28#include <process.h> 27#include <process.h>
29#include <windows.h> 28#include <windows.h>
29
30/* work around some bugs in ptw32 */
31#if defined(__MINGW32__) && defined(_TIMESPEC_DEFINED)
32#define HAVE_STRUCT_TIMESPEC 1
33#endif
34
30#include <pthread.h> 35#include <pthread.h>
31#define sigset_t int 36#define sigset_t int
32#define sigfillset(a) 37#define sigfillset(a)
33#define pthread_sigmask(a,b,c) 38#define pthread_sigmask(a,b,c)
34#define sigaddset(a,b) 39#define sigaddset(a,b)
35#define sigemptyset(s) 40#define sigemptyset(s)
36#define sigfillset(s)
37 41
38typedef pthread_mutex_t mutex_t; 42typedef pthread_mutex_t xmutex_t;
39#define X_MUTEX_INIT PTHREAD_MUTEX_INITIALIZER 43#define X_MUTEX_INIT PTHREAD_MUTEX_INITIALIZER
40#define X_MUTEX_CHECK(mutex) 44#define X_MUTEX_CREATE(mutex) pthread_mutex_init (&(mutex), 0)
41#define X_LOCK(mutex) pthread_mutex_lock (&(mutex)) 45#define X_LOCK(mutex) pthread_mutex_lock (&(mutex))
42#define X_UNLOCK(mutex) pthread_mutex_unlock (&(mutex)) 46#define X_UNLOCK(mutex) pthread_mutex_unlock (&(mutex))
43 47
44typedef pthread_cond_t cond_t; 48typedef pthread_cond_t xcond_t;
45#define X_COND_INIT PTHREAD_COND_INITIALIZER 49#define X_COND_INIT PTHREAD_COND_INITIALIZER
46#define X_COND_CHECK(cond) 50#define X_COND_CREATE(cond) pthread_cond_init (&(cond), 0)
47#define X_COND_SIGNAL(cond) pthread_cond_signal (&(cond)) 51#define X_COND_SIGNAL(cond) pthread_cond_signal (&(cond))
48#define X_COND_WAIT(cond,mutex) pthread_cond_wait (&(cond), &(mutex)) 52#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)) 53#define X_COND_TIMEDWAIT(cond,mutex,to) pthread_cond_timedwait (&(cond), &(mutex), &(to))
50 54
51typedef pthread_t thread_t; 55typedef pthread_t xthread_t;
52#define X_THREAD_PROC(name) void *name (void *thr_arg) 56#define X_THREAD_PROC(name) static void *name (void *thr_arg)
53#define X_THREAD_ATFORK(a,b,c) 57#define X_THREAD_ATFORK(a,b,c)
54 58
55static int 59static int
56thread_create (thread_t *tid, void *(*proc)(void *), void *arg) 60xthread_create (xthread_t *tid, void *(*proc)(void *), void *arg)
57{ 61{
58 int retval; 62 int retval;
59 pthread_attr_t attr; 63 pthread_attr_t attr;
60 64
61 pthread_attr_init (&attr); 65 pthread_attr_init (&attr);
… …
94#include <fcntl.h> 98#include <fcntl.h>
95#include <signal.h> 99#include <signal.h>
96#include <limits.h> 100#include <limits.h>
97#include <pthread.h> 101#include <pthread.h>
98 102
99typedef pthread_mutex_t mutex_t; 103typedef pthread_mutex_t xmutex_t;
100#if __linux && defined (PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP) 104#if __linux && defined (PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP)
101# define X_MUTEX_INIT PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP 105# define X_MUTEX_INIT PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP
106# define X_MUTEX_CREATE(mutex) \
107 do { \
108 pthread_mutexattr_t attr; \
109 pthread_mutexattr_init (&attr); \
110 pthread_mutexattr_settype (&attr, PTHREAD_MUTEX_ADAPTIVE_NP); \
111 pthread_mutex_init (&(mutex), &attr); \
112 } while (0)
102#else 113#else
103# define X_MUTEX_INIT PTHREAD_MUTEX_INITIALIZER 114# define X_MUTEX_INIT PTHREAD_MUTEX_INITIALIZER
115# define X_MUTEX_CREATE(mutex) pthread_mutex_init (&(mutex), 0)
104#endif 116#endif
105#define X_LOCK(mutex) pthread_mutex_lock (&(mutex)) 117#define X_LOCK(mutex) pthread_mutex_lock (&(mutex))
106#define X_UNLOCK(mutex) pthread_mutex_unlock (&(mutex)) 118#define X_UNLOCK(mutex) pthread_mutex_unlock (&(mutex))
107 119
108typedef pthread_cond_t cond_t; 120typedef pthread_cond_t xcond_t;
109#define X_COND_INIT PTHREAD_COND_INITIALIZER 121#define X_COND_INIT PTHREAD_COND_INITIALIZER
122#define X_COND_CREATE(cond) pthread_cond_init (&(cond), 0)
110#define X_COND_SIGNAL(cond) pthread_cond_signal (&(cond)) 123#define X_COND_SIGNAL(cond) pthread_cond_signal (&(cond))
111#define X_COND_WAIT(cond,mutex) pthread_cond_wait (&(cond), &(mutex)) 124#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)) 125#define X_COND_TIMEDWAIT(cond,mutex,to) pthread_cond_timedwait (&(cond), &(mutex), &(to))
113 126
114typedef pthread_t thread_t; 127typedef pthread_t xthread_t;
115#define X_THREAD_PROC(name) static void *name (void *thr_arg) 128#define X_THREAD_PROC(name) static void *name (void *thr_arg)
116#define X_THREAD_ATFORK(prepare,parent,child) pthread_atfork (prepare, parent, child) 129#define X_THREAD_ATFORK(prepare,parent,child) pthread_atfork (prepare, parent, child)
117 130
131// the broken bsd's once more
132#ifndef PTHREAD_STACK_MIN
133# define PTHREAD_STACK_MIN 0
134#endif
135
136#ifndef X_STACKSIZE
137# define X_STACKSIZE sizeof (void *) * 4096
138#endif
139
118static int 140static int
119thread_create (thread_t *tid, void *(*proc)(void *), void *arg) 141xthread_create (xthread_t *tid, void *(*proc)(void *), void *arg)
120{ 142{
121 int retval; 143 int retval;
122 sigset_t fullsigset, oldsigset; 144 sigset_t fullsigset, oldsigset;
123 pthread_attr_t attr; 145 pthread_attr_t attr;
124 146
125 pthread_attr_init (&attr); 147 pthread_attr_init (&attr);
126 pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED); 148 pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED);
127 pthread_attr_setstacksize (&attr, PTHREAD_STACK_MIN < sizeof (long) * 4096 149 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 150#ifdef PTHREAD_SCOPE_PROCESS
130 pthread_attr_setscope (&attr, PTHREAD_SCOPE_PROCESS); 151 pthread_attr_setscope (&attr, PTHREAD_SCOPE_PROCESS);
131#endif 152#endif
132 153
133 sigfillset (&fullsigset); 154 sigfillset (&fullsigset);

Diff Legend

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