--- libev/ev_select.c 2007/10/31 17:55:55 1.5 +++ libev/ev_select.c 2007/11/04 00:24:17 1.11 @@ -1,4 +1,6 @@ /* + * libev select fd activity backend + * * Copyright (c) 2007 Marc Alexander Lehmann * All rights reserved. * @@ -33,16 +35,15 @@ #include /* for unix systems */ -#include +#ifndef WIN32 +# include +#endif #include #include -static unsigned char *vec_ri, *vec_ro, *vec_wi, *vec_wo; -static int vec_max; - static void -select_modify (int fd, int oev, int nev) +select_modify (EV_P_ int fd, int oev, int nev) { int offs = fd >> 3; int mask = 1 << (fd & 7); @@ -70,7 +71,8 @@ vec_wi [offs] &= ~mask; } -static void select_poll (ev_tstamp timeout) +static void +select_poll (EV_P_ ev_tstamp timeout) { struct timeval tv; int res; @@ -105,7 +107,7 @@ events |= byte_w & (1 << bit) ? EV_WRITE : 0; if (events) - fd_event (idx * 8 + bit, events); + fd_event (EV_A_ idx * 8 + bit, events); } } } @@ -113,16 +115,19 @@ else if (res < 0) { if (errno == EBADF) - fd_recheck (); + fd_ebadf (EV_A); + else if (errno == ENOMEM) + fd_enomem (EV_A); } } -void select_init (int flags) +static int +select_init (EV_P_ int flags) { - ev_method = EVMETHOD_SELECT; method_fudge = 1e-2; /* needed to compensate for select returning early, very conservative */ method_modify = select_modify; method_poll = select_poll; -} + return EVMETHOD_SELECT; +}