lukechilds
/
node
mirror of https://github.com/lukechilds/node.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Upgrade libeio

v0.7.4-release
Ryan Dahl 15 years ago
parent
b58db3cd73
commit
0f143f6c23
3 changed files with 17 additions and 16 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      deps/libeio/demo.c
  2. 13
      deps/libeio/eio.c
  3. 16
      deps/libeio/xthread.h

4
deps/libeio/demo.c
View File

@ -144,8 +144,8 @@ main (void)
eio_chown ("eio-test-dir", getuid (), getgid (), 0, res_cb, "chown"); eio_chown ("eio-test-dir", getuid (), getgid (), 0, res_cb, "chown");
eio_fchown (last_fd, getuid (), getgid (), 0, res_cb, "fchown"); eio_fchown (last_fd, getuid (), getgid (), 0, res_cb, "fchown");
eio_fchmod (last_fd, 0123, 0, res_cb, "fchmod"); eio_fchmod (last_fd, 0123, 0, res_cb, "fchmod");
eio_readdir ("eio-test-dir", 0, readdir_cb, "readdir"); eio_readdir ("eio-test-dir", 0, 0, readdir_cb, "readdir");
eio_readdir ("/nonexistant", 0, readdir_cb, "readdir"); eio_readdir ("/nonexistant", 0, 0, readdir_cb, "readdir");
eio_fstat (last_fd, 0, stat_cb, "stat"); eio_fstat (last_fd, 0, stat_cb, "stat");
eio_write (last_fd, "test\nfail\n", 10, 4, 0, res_cb, "write"); eio_write (last_fd, "test\nfail\n", 10, 4, 0, res_cb, "write");
event_loop (); event_loop ();

13
deps/libeio/eio.c
View File

@ -55,6 +55,7 @@
#include <limits.h> #include <limits.h>
#include <fcntl.h> #include <fcntl.h>
#include <assert.h> #include <assert.h>
#include <stdint.h>
#ifndef EIO_FINISH #ifndef EIO_FINISH
# define EIO_FINISH(req) ((req)->finish) && !EIO_CANCELLED (req) ? (req)->finish (req) : 0 # define EIO_FINISH(req) ((req)->finish) && !EIO_CANCELLED (req) ? (req)->finish (req) : 0
@ -224,10 +225,10 @@ static volatile unsigned int nready; /* reqlock */
static volatile unsigned int npending; /* reqlock */ static volatile unsigned int npending; /* reqlock */
static volatile unsigned int max_idle = 4; static volatile unsigned int max_idle = 4;
static mutex_t wrklock = X_MUTEX_INIT; static xmutex_t wrklock = X_MUTEX_INIT;
static mutex_t reslock = X_MUTEX_INIT; static xmutex_t reslock = X_MUTEX_INIT;
static mutex_t reqlock = X_MUTEX_INIT; static xmutex_t reqlock = X_MUTEX_INIT;
static cond_t reqwait = X_COND_INIT; static xcond_t reqwait = X_COND_INIT;
#if !HAVE_PREADWRITE #if !HAVE_PREADWRITE
/* /*
@ -235,7 +236,7 @@ static cond_t reqwait = X_COND_INIT;
* normal read/write by using a mutex. slows down execution a lot, * normal read/write by using a mutex. slows down execution a lot,
* but that's your problem, not mine. * but that's your problem, not mine.
*/ */
static mutex_t preadwritelock = X_MUTEX_INIT; static xmutex_t preadwritelock = X_MUTEX_INIT;
#endif #endif
typedef struct etp_worker typedef struct etp_worker
@ -243,7 +244,7 @@ typedef struct etp_worker
/* locked by wrklock */ /* locked by wrklock */
struct etp_worker *prev, *next; struct etp_worker *prev, *next;
thread_t tid; xthread_t tid;
/* locked by reslock, reqlock or wrklock */ /* locked by reslock, reqlock or wrklock */
ETP_REQ *req; /* currently processed request */ ETP_REQ *req; /* currently processed request */

16
deps/libeio/xthread.h
View File

@ -35,23 +35,23 @@ typedef int ssize_t;
#define sigemptyset(s) #define sigemptyset(s)
#define sigfillset(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_MUTEX_INIT PTHREAD_MUTEX_INITIALIZER
#define X_LOCK(mutex) pthread_mutex_lock (&(mutex)) #define X_LOCK(mutex) pthread_mutex_lock (&(mutex))
#define X_UNLOCK(mutex) pthread_mutex_unlock (&(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_INIT PTHREAD_COND_INITIALIZER
#define X_COND_SIGNAL(cond) pthread_cond_signal (&(cond)) #define X_COND_SIGNAL(cond) pthread_cond_signal (&(cond))
#define X_COND_WAIT(cond,mutex) pthread_cond_wait (&(cond), &(mutex)) #define X_COND_WAIT(cond,mutex) pthread_cond_wait (&(cond), &(mutex))
#define X_COND_TIMEDWAIT(cond,mutex,to) pthread_cond_timedwait (&(cond), &(mutex), &(to)) #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_PROC(name) void *name (void *thr_arg)
#define X_THREAD_ATFORK(a,b,c) #define X_THREAD_ATFORK(a,b,c)
static int static int
thread_create (thread_t *tid, void *(*proc)(void *), void *arg) thread_create (xthread_t *tid, void *(*proc)(void *), void *arg)
{ {
int retval; int retval;
pthread_attr_t attr; pthread_attr_t attr;
@ -94,7 +94,7 @@ thread_create (thread_t *tid, void *(*proc)(void *), void *arg)
#include <limits.h> #include <limits.h>
#include <pthread.h> #include <pthread.h>
typedef pthread_mutex_t mutex_t; typedef pthread_mutex_t xmutex_t;
#if __linux && defined (PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP) #if __linux && defined (PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP)
# define X_MUTEX_INIT PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP # define X_MUTEX_INIT PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP
#else #else
@ -103,13 +103,13 @@ typedef pthread_mutex_t mutex_t;
#define X_LOCK(mutex) pthread_mutex_lock (&(mutex)) #define X_LOCK(mutex) pthread_mutex_lock (&(mutex))
#define X_UNLOCK(mutex) pthread_mutex_unlock (&(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_INIT PTHREAD_COND_INITIALIZER
#define X_COND_SIGNAL(cond) pthread_cond_signal (&(cond)) #define X_COND_SIGNAL(cond) pthread_cond_signal (&(cond))
#define X_COND_WAIT(cond,mutex) pthread_cond_wait (&(cond), &(mutex)) #define X_COND_WAIT(cond,mutex) pthread_cond_wait (&(cond), &(mutex))
#define X_COND_TIMEDWAIT(cond,mutex,to) pthread_cond_timedwait (&(cond), &(mutex), &(to)) #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_PROC(name) static void *name (void *thr_arg)
#define X_THREAD_ATFORK(prepare,parent,child) pthread_atfork (prepare, parent, child) #define X_THREAD_ATFORK(prepare,parent,child) pthread_atfork (prepare, parent, child)
@ -123,7 +123,7 @@ typedef pthread_t thread_t;
#endif #endif
static int static int
thread_create (thread_t *tid, void *(*proc)(void *), void *arg) thread_create (xthread_t *tid, void *(*proc)(void *), void *arg)
{ {
int retval; int retval;
sigset_t fullsigset, oldsigset; sigset_t fullsigset, oldsigset;

Write Preview
Loading…
Cancel
Save