diff options
Diffstat (limited to 'ev_select.c')
| -rw-r--r-- | ev_select.c | 91 |
1 files changed, 68 insertions, 23 deletions
diff --git a/ev_select.c b/ev_select.c index 60cc084..d9fdf92 100644 --- a/ev_select.c +++ b/ev_select.c @@ -32,6 +32,7 @@ /* for unix systems */ #ifdef WIN32 typedef unsigned int uint32_t; +# define EV_SELECT_USE_FD_SET 1 #else # include <sys/select.h> # include <inttypes.h> @@ -42,33 +43,47 @@ typedef unsigned int uint32_t; static void select_modify (EV_P_ int fd, int oev, int nev) { - int offs = fd >> 3; - int mask = 1 << (fd & 7); - if (oev == nev) return; - if (vec_max < (fd >> 5) + 1) - { - int new_max = (fd >> 5) + 1; - - vec_ri = (unsigned char *)ev_realloc (vec_ri, new_max * 4); - vec_ro = (unsigned char *)ev_realloc (vec_ro, new_max * 4); /* could free/malloc */ - vec_wi = (unsigned char *)ev_realloc (vec_wi, new_max * 4); - vec_wo = (unsigned char *)ev_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; - if (!(nev & EV_READ)) - vec_ri [offs] &= ~mask; +#if EV_SELECT_USE_FD_SET + if (nev & EV_READ) + FD_SET (fd, (struct fd_set *)vec_ri); + else + FD_CLR (fd, (struct fd_set *)vec_ri); - vec_wi [offs] |= mask; - if (!(nev & EV_WRITE)) - vec_wi [offs] &= ~mask; + if (nev & EV_WRITE) + FD_SET (fd, (struct fd_set *)vec_wi); + else + FD_CLR (fd, (struct fd_set *)vec_wi); +#else + { + int offs = fd >> 3; + int mask = 1 << (fd & 7); + + if (vec_max < (fd >> 5) + 1) + { + int new_max = (fd >> 5) + 1; + + vec_ri = (unsigned char *)ev_realloc (vec_ri, new_max * 4); + vec_ro = (unsigned char *)ev_realloc (vec_ro, new_max * 4); /* could free/malloc */ + vec_wi = (unsigned char *)ev_realloc (vec_wi, new_max * 4); + vec_wo = (unsigned char *)ev_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; + if (!(nev & EV_READ)) + vec_ri [offs] &= ~mask; + + vec_wi [offs] |= mask; + if (!(nev & EV_WRITE)) + vec_wi [offs] &= ~mask; + } +#endif } static void @@ -78,8 +93,13 @@ select_poll (EV_P_ ev_tstamp timeout) struct timeval tv; int res; +#if EV_SELECT_USE_FD_SET + memcpy (vec_ro, vec_ri, sizeof (struct fd_set)); + memcpy (vec_wo, vec_wi, sizeof (struct fd_set)); +#else memcpy (vec_ro, vec_ri, vec_max * 4); memcpy (vec_wo, vec_wi, vec_max * 4); +#endif tv.tv_sec = (long)timeout; tv.tv_usec = (long)((timeout - (ev_tstamp)tv.tv_sec) * 1e6); @@ -88,6 +108,11 @@ select_poll (EV_P_ ev_tstamp timeout) if (res < 0) { +#ifdef WIN32 + if (errno == WSAEINTR ) errno = EINTR; + if (errno == WSAENOTSOCK) errno = EBADF; +#endif + if (errno == EBADF) fd_ebadf (EV_A); else if (errno == ENOMEM && !syserr_cb) @@ -98,6 +123,17 @@ select_poll (EV_P_ ev_tstamp timeout) return; } +#if EV_SELECT_USE_FD_SET + for (word = 0; word < FD_SETSIZE; ++word) + { + int events = 0; + if (FD_ISSET (word, (struct fd_set *)vec_ro)) events |= EV_READ; + if (FD_ISSET (word, (struct fd_set *)vec_wo)) events |= EV_WRITE; + + if (events) + fd_event (EV_A_ word, events); + } +#else for (word = vec_max; word--; ) { if (((uint32_t *)vec_ro) [word] | ((uint32_t *)vec_wo) [word]) @@ -120,6 +156,7 @@ select_poll (EV_P_ ev_tstamp timeout) } } } +#endif } static int @@ -129,11 +166,19 @@ select_init (EV_P_ int flags) method_modify = select_modify; method_poll = select_poll; +#if EV_SELECT_USE_FD_SET + vec_max = FD_SETSIZE / 32; + vec_ri = ev_malloc (sizeof (struct fd_set)); FD_ZERO ((struct fd_set *)vec_ri); + vec_ro = ev_malloc (sizeof (struct fd_set)); + vec_wi = ev_malloc (sizeof (struct fd_set)); FD_ZERO ((struct fd_set *)vec_wi); + vec_wo = ev_malloc (sizeof (struct fd_set)); +#else vec_max = 0; vec_ri = 0; vec_ri = 0; vec_wo = 0; vec_wo = 0; +#endif return EVMETHOD_SELECT; } |