summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorroot <root>2010-03-31 00:46:18 +0000
committerroot <root>2010-03-31 00:46:18 +0000
commitba4bef26a0943bcef3f8b3adcbb18a7d563d881b (patch)
tree131a5421da3b645c20da383393dcbd8c2357b3db
parentb04db3559062626b5764e4360866fc4d403c6631 (diff)
-rw-r--r--eio.c12
-rw-r--r--xthread.h16
2 files changed, 14 insertions, 14 deletions
diff --git a/eio.c b/eio.c
index 937c066..1c1806e 100644
--- a/eio.c
+++ b/eio.c
@@ -224,10 +224,10 @@ static volatile unsigned int nready; /* reqlock */
static volatile unsigned int npending; /* reqlock */
static volatile unsigned int max_idle = 4;
-static mutex_t wrklock = X_MUTEX_INIT;
-static mutex_t reslock = X_MUTEX_INIT;
-static mutex_t reqlock = X_MUTEX_INIT;
-static cond_t reqwait = X_COND_INIT;
+static xmutex_t wrklock = X_MUTEX_INIT;
+static xmutex_t reslock = X_MUTEX_INIT;
+static xmutex_t reqlock = X_MUTEX_INIT;
+static xcond_t reqwait = X_COND_INIT;
#if !HAVE_PREADWRITE
/*
@@ -235,7 +235,7 @@ static cond_t reqwait = X_COND_INIT;
* normal read/write by using a mutex. slows down execution a lot,
* but that's your problem, not mine.
*/
-static mutex_t preadwritelock = X_MUTEX_INIT;
+static xmutex_t preadwritelock = X_MUTEX_INIT;
#endif
typedef struct etp_worker
@@ -243,7 +243,7 @@ typedef struct etp_worker
/* locked by wrklock */
struct etp_worker *prev, *next;
- thread_t tid;
+ xthread_t tid;
/* locked by reslock, reqlock or wrklock */
ETP_REQ *req; /* currently processed request */
diff --git a/xthread.h b/xthread.h
index d9a404e..9cd2b6e 100644
--- a/xthread.h
+++ b/xthread.h
@@ -35,23 +35,23 @@ typedef int ssize_t;
#define sigemptyset(s)
#define sigfillset(s)
-typedef pthread_mutex_t mutex_t;
+typedef pthread_mutex_t xmutex_t;
#define X_MUTEX_INIT PTHREAD_MUTEX_INITIALIZER
#define X_LOCK(mutex) pthread_mutex_lock (&(mutex))
#define X_UNLOCK(mutex) pthread_mutex_unlock (&(mutex))
-typedef pthread_cond_t cond_t;
+typedef pthread_cond_t xcond_t;
#define X_COND_INIT PTHREAD_COND_INITIALIZER
#define X_COND_SIGNAL(cond) pthread_cond_signal (&(cond))
#define X_COND_WAIT(cond,mutex) pthread_cond_wait (&(cond), &(mutex))
#define X_COND_TIMEDWAIT(cond,mutex,to) pthread_cond_timedwait (&(cond), &(mutex), &(to))
-typedef pthread_t thread_t;
+typedef pthread_t xthread_t;
#define X_THREAD_PROC(name) void *name (void *thr_arg)
#define X_THREAD_ATFORK(a,b,c)
static int
-thread_create (thread_t *tid, void *(*proc)(void *), void *arg)
+thread_create (xthread_t *tid, void *(*proc)(void *), void *arg)
{
int retval;
pthread_attr_t attr;
@@ -94,7 +94,7 @@ thread_create (thread_t *tid, void *(*proc)(void *), void *arg)
#include <limits.h>
#include <pthread.h>
-typedef pthread_mutex_t mutex_t;
+typedef pthread_mutex_t xmutex_t;
#if __linux && defined (PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP)
# define X_MUTEX_INIT PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP
#else
@@ -103,13 +103,13 @@ typedef pthread_mutex_t mutex_t;
#define X_LOCK(mutex) pthread_mutex_lock (&(mutex))
#define X_UNLOCK(mutex) pthread_mutex_unlock (&(mutex))
-typedef pthread_cond_t cond_t;
+typedef pthread_cond_t xcond_t;
#define X_COND_INIT PTHREAD_COND_INITIALIZER
#define X_COND_SIGNAL(cond) pthread_cond_signal (&(cond))
#define X_COND_WAIT(cond,mutex) pthread_cond_wait (&(cond), &(mutex))
#define X_COND_TIMEDWAIT(cond,mutex,to) pthread_cond_timedwait (&(cond), &(mutex), &(to))
-typedef pthread_t thread_t;
+typedef pthread_t xthread_t;
#define X_THREAD_PROC(name) static void *name (void *thr_arg)
#define X_THREAD_ATFORK(prepare,parent,child) pthread_atfork (prepare, parent, child)
@@ -123,7 +123,7 @@ typedef pthread_t thread_t;
#endif
static int
-thread_create (thread_t *tid, void *(*proc)(void *), void *arg)
+thread_create (xthread_t *tid, void *(*proc)(void *), void *arg)
{
int retval;
sigset_t fullsigset, oldsigset;