ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/libev/ev_kqueue.c
(Generate patch)

Comparing libev/ev_kqueue.c (file contents):
Revision 1.43 by root, Sat Mar 27 02:41:13 2010 UTC vs.
Revision 1.47 by root, Fri Oct 15 22:48:25 2010 UTC

95 kqueue_eventmax = array_nextsize (sizeof (struct kevent), kqueue_eventmax, kqueue_changecnt); 95 kqueue_eventmax = array_nextsize (sizeof (struct kevent), kqueue_eventmax, kqueue_changecnt);
96 kqueue_events = (struct kevent *)ev_malloc (sizeof (struct kevent) * kqueue_eventmax); 96 kqueue_events = (struct kevent *)ev_malloc (sizeof (struct kevent) * kqueue_eventmax);
97 } 97 }
98 98
99 EV_RELEASE_CB; 99 EV_RELEASE_CB;
100 ts.tv_sec = (time_t)timeout; 100 EV_TS_SET (ts, timeout);
101 ts.tv_nsec = (long)((timeout - (ev_tstamp)ts.tv_sec) * 1e9);
102 res = kevent (backend_fd, kqueue_changes, kqueue_changecnt, kqueue_events, kqueue_eventmax, &ts); 101 res = kevent (backend_fd, kqueue_changes, kqueue_changecnt, kqueue_events, kqueue_eventmax, &ts);
103 EV_ACQUIRE_CB; 102 EV_ACQUIRE_CB;
104 kqueue_changecnt = 0; 103 kqueue_changecnt = 0;
105 104
106 if (expect_false (res < 0)) 105 if (expect_false (res < 0))
115 { 114 {
116 int fd = kqueue_events [i].ident; 115 int fd = kqueue_events [i].ident;
117 116
118 if (expect_false (kqueue_events [i].flags & EV_ERROR)) 117 if (expect_false (kqueue_events [i].flags & EV_ERROR))
119 { 118 {
120 int err = kqueue_events [i].data; 119 int err = kqueue_events [i].data;
121 120
122 /* we are only interested in errors for fds that we are interested in :) */ 121 /* we are only interested in errors for fds that we are interested in :) */
123 if (anfds [fd].events) 122 if (anfds [fd].events)
124 { 123 {
125 if (err == ENOENT) /* resubmit changes on ENOENT */ 124 if (err == ENOENT) /* resubmit changes on ENOENT */
126 kqueue_modify (EV_A_ fd, 0, anfds [fd].events); 125 kqueue_modify (EV_A_ fd, 0, anfds [fd].events);
127 else if (err == EBADF) /* on EBADF, we re-check the fd */ 126 else if (err == EBADF) /* on EBADF, we re-check the fd */
128 { 127 {
129 if (fd_valid (fd)) 128 if (fd_valid (fd))
131 else 130 else
132 fd_kill (EV_A_ fd); 131 fd_kill (EV_A_ fd);
133 } 132 }
134 else /* on all other errors, we error out on the fd */ 133 else /* on all other errors, we error out on the fd */
135 fd_kill (EV_A_ fd); 134 fd_kill (EV_A_ fd);
136 } 135 }
137 } 136 }
138 else 137 else
139 fd_event ( 138 fd_event (
140 EV_A_ 139 EV_A_
141 fd, 140 fd,
154} 153}
155 154
156int inline_size 155int inline_size
157kqueue_init (EV_P_ int flags) 156kqueue_init (EV_P_ int flags)
158{ 157{
159 /* Initalize the kernel queue */ 158 /* Initialize the kernel queue */
160 if ((backend_fd = kqueue ()) < 0) 159 if ((backend_fd = kqueue ()) < 0)
161 return 0; 160 return 0;
162 161
163 fcntl (backend_fd, F_SETFD, FD_CLOEXEC); /* not sure if necessary, hopefully doesn't hurt */ 162 fcntl (backend_fd, F_SETFD, FD_CLOEXEC); /* not sure if necessary, hopefully doesn't hurt */
164 163

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines