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

Comparing libev/ev_epoll.c (file contents):
Revision 1.67 by root, Wed Jun 20 12:39:53 2012 UTC vs.
Revision 1.72 by root, Wed Jun 21 14:42:30 2017 UTC

… …
177 * we assume that fd is always in range, as we never shrink the anfds array 177 * we assume that fd is always in range, as we never shrink the anfds array
178 */ 178 */
179 if (expect_false ((uint32_t)anfds [fd].egen != (uint32_t)(ev->data.u64 >> 32))) 179 if (expect_false ((uint32_t)anfds [fd].egen != (uint32_t)(ev->data.u64 >> 32)))
180 { 180 {
181 /* recreate kernel state */ 181 /* recreate kernel state */
182 postfork = 1; 182 postfork |= 2;
183 continue; 183 continue;
184 } 184 }
185 185
186 if (expect_false (got & ~want)) 186 if (expect_false (got & ~want))
187 { 187 {
… …
201 201
202 /* pre-2.6.9 kernels require a non-null pointer with EPOLL_CTL_DEL, */ 202 /* pre-2.6.9 kernels require a non-null pointer with EPOLL_CTL_DEL, */
203 /* which is fortunately easy to do for us. */ 203 /* which is fortunately easy to do for us. */
204 if (epoll_ctl (backend_fd, want ? EPOLL_CTL_MOD : EPOLL_CTL_DEL, fd, ev)) 204 if (epoll_ctl (backend_fd, want ? EPOLL_CTL_MOD : EPOLL_CTL_DEL, fd, ev))
205 { 205 {
206 postfork = 1; /* an error occurred, recreate kernel state */ 206 postfork |= 2; /* an error occurred, recreate kernel state */
207 continue; 207 continue;
208 } 208 }
209 } 209 }
210 210
211 fd_event (EV_A_ fd, got); 211 fd_event (EV_A_ fd, got);
… …
226 unsigned char events = anfds [fd].events & (EV_READ | EV_WRITE); 226 unsigned char events = anfds [fd].events & (EV_READ | EV_WRITE);
227 227
228 if (anfds [fd].emask & EV_EMASK_EPERM && events) 228 if (anfds [fd].emask & EV_EMASK_EPERM && events)
229 fd_event (EV_A_ fd, events); 229 fd_event (EV_A_ fd, events);
230 else 230 else
231 {
231 epoll_eperms [i] = epoll_eperms [--epoll_epermcnt]; 232 epoll_eperms [i] = epoll_eperms [--epoll_epermcnt];
233 anfds [fd].emask = 0;
234 }
232 } 235 }
233} 236}
234 237
235int inline_size 238inline_size
239int
236epoll_init (EV_P_ int flags) 240epoll_init (EV_P_ int flags)
237{ 241{
238#ifdef EPOLL_CLOEXEC 242#if defined EPOLL_CLOEXEC && !defined __ANDROID__
239 backend_fd = epoll_create1 (EPOLL_CLOEXEC); 243 backend_fd = epoll_create1 (EPOLL_CLOEXEC);
240 244
241 if (backend_fd < 0 && (errno == EINVAL || errno == ENOSYS)) 245 if (backend_fd < 0 && (errno == EINVAL || errno == ENOSYS))
242#endif 246#endif
243 backend_fd = epoll_create (256); 247 backend_fd = epoll_create (256);
… …
255 epoll_events = (struct epoll_event *)ev_malloc (sizeof (struct epoll_event) * epoll_eventmax); 259 epoll_events = (struct epoll_event *)ev_malloc (sizeof (struct epoll_event) * epoll_eventmax);
256 260
257 return EVBACKEND_EPOLL; 261 return EVBACKEND_EPOLL;
258} 262}
259 263
260void inline_size 264inline_size
265void
261epoll_destroy (EV_P) 266epoll_destroy (EV_P)
262{ 267{
263 ev_free (epoll_events); 268 ev_free (epoll_events);
264 array_free (epoll_eperm, EMPTY); 269 array_free (epoll_eperm, EMPTY);
265} 270}
266 271
267void inline_size 272inline_size
273void
268epoll_fork (EV_P) 274epoll_fork (EV_P)
269{ 275{
270 close (backend_fd); 276 close (backend_fd);
271 277
272 while ((backend_fd = epoll_create (256)) < 0) 278 while ((backend_fd = epoll_create (256)) < 0)

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines