luo980/libuv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sunos: workaround OS bug to prevent fs.watch() from spinning

Browse Source 
Fixes joyent/node#3768.
This commit is contained in:
Bryan Cantrill 2012-07-29 20:51:40 -03:00 committed by Ben Noordhuis
parent 8f66bfcee0
commit cfb06db5e5
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/unix/sunos.c
View File

@ -127,7 +127,7 @@ static void uv__fs_event_rearm(uv_fs_event_t *handle) {
static void uv__fs_event_read(uv_loop_t* loop, uv__io_t* w, int revents) { static void uv__fs_event_read(uv_loop_t* loop, uv__io_t* w, int revents) {
uv_fs_event_t *handle; uv_fs_event_t *handle = NULL;
timespec_t timeout; timespec_t timeout;
port_event_t pe; port_event_t pe;
int events; int events;
@ -137,14 +137,23 @@ static void uv__fs_event_read(uv_loop_t* loop, uv__io_t* w, int revents) {
(void) revents; (void) revents;
do { do {
/* TODO use port_getn() */ uint_t n = 1;
/*
* Note that our use of port_getn() here (and not port_get()) is deliberate:
* there is a bug in event ports (Sun bug 6456558) whereby a zeroed timeout
* causes port_get() to return success instead of ETIME when there aren't
* actually any events (!); by using port_getn() in lieu of port_get(),
* we can at least workaround the bug by checking for zero returned events
* and treating it as we would ETIME.
*/
do { do {
memset(&timeout, 0, sizeof timeout); memset(&timeout, 0, sizeof timeout);
r = port_get(loop->fs_fd, &pe, &timeout); r = port_getn(loop->fs_fd, &pe, 1, &n, &timeout);
} }
while (r == -1 && errno == EINTR); while (r == -1 && errno == EINTR);
if (r == -1 && errno == ETIME) if ((r == -1 && errno == ETIME) || n == 0)
break; break;
handle = (uv_fs_event_t *)pe.portev_user; handle = (uv_fs_event_t *)pe.portev_user;
@ -161,7 +170,7 @@ static void uv__fs_event_read(uv_loop_t* loop, uv__io_t* w, int revents) {
} }
while (handle->fd != PORT_DELETED); while (handle->fd != PORT_DELETED);
if (handle->fd != PORT_DELETED) if (handle != NULL && handle->fd != PORT_DELETED)
uv__fs_event_rearm(handle); uv__fs_event_rearm(handle);
} }