diff options
| author | Jorge Chamorro Bieling <jorge@jorgechamorro.com> | 2010-11-17 10:41:30 +0100 |
|---|---|---|
| committer | Ryan Dahl <ry@tinyclouds.org> | 2010-12-30 20:50:59 -0800 |
| commit | ae91603dd7ef4ed31a24553dcc7a0c6451501f1e (patch) | |
| tree | c4c31db5a7ee70800055f179804612ba7b2d7178 | |
| parent | 40b6197d9b7b7c15809e27b41bc24a472519e4cf (diff) | |
| download | node-ae91603dd7ef4ed31a24553dcc7a0c6451501f1e.tar.gz | |
Apple's threaded write()s bug
fixes test/simple/test-fs-sir-writes-alot.js on mac
| -rw-r--r-- | deps/libeio/eio.c | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/deps/libeio/eio.c b/deps/libeio/eio.c index 6f61f5da8..07d15586a 100644 --- a/deps/libeio/eio.c +++ b/deps/libeio/eio.c @@ -230,6 +230,10 @@ static xmutex_t reslock = X_MUTEX_INIT; static xmutex_t reqlock = X_MUTEX_INIT; static xcond_t reqwait = X_COND_INIT; +#if defined (__APPLE__) +static xmutex_t apple_bug_writelock = X_MUTEX_INIT; +#endif + #if !HAVE_PREADWRITE /* * make our pread/pwrite emulation safe against themselves, but not against @@ -1579,9 +1583,19 @@ static void eio_execute (etp_worker *self, eio_req *req) req->result = req->offs >= 0 ? pread (req->int1, req->ptr2, req->size, req->offs) : read (req->int1, req->ptr2, req->size); break; - case EIO_WRITE: req->result = req->offs >= 0 + case EIO_WRITE: +#if defined (__APPLE__) + pthread_mutex_lock (&apple_bug_writelock); +#endif + + req->result = req->offs >= 0 ? pwrite (req->int1, req->ptr2, req->size, req->offs) - : write (req->int1, req->ptr2, req->size); break; + : write (req->int1, req->ptr2, req->size); + +#if defined (__APPLE__) + pthread_mutex_unlock (&apple_bug_writelock); +#endif + break; case EIO_READAHEAD: req->result = readahead (req->int1, req->offs, req->size); break; case EIO_SENDFILE: req->result = eio__sendfile (req->int1, req->int2, req->offs, req->size, self); break; |