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

sunos: replace ev_io with uv__io_t

Browse Source
This commit is contained in:
Ben Noordhuis 2012-06-22 15:09:56 +00:00
parent f01e9d708a
commit c222f075c3
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/uv-private/uv-unix.h
View File

@ -102,7 +102,7 @@ struct uv__io_s {
int inotify_fd;
#elif defined(PORT_SOURCE_FILE)
# define UV_LOOP_PRIVATE_PLATFORM_FIELDS \
ev_io fs_event_watcher; \
uv__io_t fs_event_watcher; \
int fs_fd;
#else
# define UV_LOOP_PRIVATE_PLATFORM_FIELDS

13
src/unix/sunos.c
View File

@ -128,26 +128,27 @@ static void uv__fs_event_rearm(uv_fs_event_t *handle) {
}
static void uv__fs_event_read(EV_P_ ev_io* 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_loop_t *loop_;
timespec_t timeout;
port_event_t pe;
int events;
int r;
loop_ = container_of(w, uv_loop_t, fs_event_watcher);
(void) w;
(void) revents;
do {
/* TODO use port_getn() */
do {
memset(&timeout, 0, sizeof timeout);
r = port_get(loop_->fs_fd, &pe, &timeout);
r = port_get(loop->fs_fd, &pe, &timeout);
}
while (r == -1 && errno == EINTR);
if (r == -1 && errno == ETIME)
break;
handle = (uv_fs_event_t *)pe.portev_user;
assert((r == 0) && "unexpected port_get() error");
@ -199,8 +200,8 @@ int uv_fs_event_init(uv_loop_t* loop,
uv__fs_event_rearm(handle);
if (first_run) {
ev_io_init(&loop->fs_event_watcher, uv__fs_event_read, portfd, EV_READ);
ev_io_start(loop->ev, &loop->fs_event_watcher);
uv__io_init(&loop->fs_event_watcher, uv__fs_event_read, portfd, UV__IO_READ);
uv__io_start(loop, &loop->fs_event_watcher);
}
return 0;