X-Git-Url: https://git.llucax.com/software/libev.git/blobdiff_plain/b7186278d06b224100f3bbaed1976d014246bbd9..89c65248d571a6a0ba88e2e0290db2c03f1e992c:/ev_select.c?ds=inline diff --git a/ev_select.c b/ev_select.c index 1262f48..0dfa312 100644 --- a/ev_select.c +++ b/ev_select.c @@ -49,12 +49,16 @@ select_modify (int fd, int oev, int nev) if (vec_max < (fd >> 5) + 1) { - vec_max = (fd >> 5) + 1; + int new_max = (fd >> 5) + 1; - vec_ri = (unsigned char *)realloc (vec_ri, vec_max * 4); - vec_ro = (unsigned char *)realloc (vec_ro, vec_max * 4); /* could free/malloc */ - vec_wi = (unsigned char *)realloc (vec_wi, vec_max * 4); - vec_wo = (unsigned char *)realloc (vec_wo, vec_max * 4); /* could free/malloc */ + vec_ri = (unsigned char *)realloc (vec_ri, new_max * 4); + vec_ro = (unsigned char *)realloc (vec_ro, new_max * 4); /* could free/malloc */ + vec_wi = (unsigned char *)realloc (vec_wi, new_max * 4); + vec_wo = (unsigned char *)realloc (vec_wo, new_max * 4); /* could free/malloc */ + + for (; vec_max < new_max; ++vec_max) + ((uint32_t *)vec_ri)[vec_max] = + ((uint32_t *)vec_wi)[vec_max] = 0; } vec_ri [offs] |= mask; @@ -66,7 +70,8 @@ select_modify (int fd, int oev, int nev) vec_wi [offs] &= ~mask; } -static void select_poll (ev_tstamp timeout) +static void +select_poll (ev_tstamp timeout) { struct timeval tv; int res; @@ -106,9 +111,15 @@ static void select_poll (ev_tstamp timeout) } } } + else if (res < 0) + { + if (errno == EBADF) + fd_recheck (); + } } -void select_init (int flags) +static void +select_init (int flags) { ev_method = EVMETHOD_SELECT; method_fudge = 1e-2; /* needed to compensate for select returning early, very conservative */ @@ -116,4 +127,3 @@ void select_init (int flags) method_poll = select_poll; } -