From 99442c6f00c16502afa517e063ff15e20c00212a Mon Sep 17 00:00:00 2001 From: Niels Provos Date: Tue, 29 Mar 2005 06:54:36 +0000 Subject: [PATCH] windows fixes from Nick Mathewson svn:r135 --- WIN32-Code/config.h | 268 +++++++++++++++++++++++++-------------- WIN32-Code/win32.c | 301 +++++++++++++++++++++++++++++++++++++------- event.c | 7 -- event.h | 8 +- 4 files changed, 435 insertions(+), 149 deletions(-) diff --git a/WIN32-Code/config.h b/WIN32-Code/config.h index 71b373efa8..aed9774d46 100644 --- a/WIN32-Code/config.h +++ b/WIN32-Code/config.h @@ -1,149 +1,231 @@ -/* config.h. Generated by configure. */ -/* config.h.in. Generated from configure.in by autoheader. */ +/* config.h.in. Generated automatically from configure.in by autoheader. */ /* Define if kqueue works correctly with pipes */ -/* #undef HAVE_WORKING_KQUEUE */ +#undef HAVE_WORKING_KQUEUE /* Define to `unsigned long long' if doesn't define. */ -/* #undef u_int64_t */ +#undef u_int64_t /* Define to `unsigned int' if doesn't define. */ -/* #undef u_int32_t */ +#undef u_int32_t /* Define to `unsigned short' if doesn't define. */ -/* #undef u_int16_t */ +#undef u_int16_t /* Define to `unsigned char' if doesn't define. */ -/* #undef u_int8_t */ +#undef u_int8_t /* Define if timeradd is defined in */ -/* #undef HAVE_TIMERADD */ +#undef HAVE_TIMERADD #ifndef HAVE_TIMERADD -#define timeradd(tvp, uvp, vvp) \ - do { \ - (vvp)->tv_sec = (tvp)->tv_sec + (uvp)->tv_sec; \ - (vvp)->tv_usec = (tvp)->tv_usec + (uvp)->tv_usec; \ - if ((vvp)->tv_usec >= 1000000) { \ - (vvp)->tv_sec++; \ - (vvp)->tv_usec -= 1000000; \ - } \ - } while (0) -#define timersub(tvp, uvp, vvp) \ - do { \ - (vvp)->tv_sec = (tvp)->tv_sec - (uvp)->tv_sec; \ - (vvp)->tv_usec = (tvp)->tv_usec - (uvp)->tv_usec; \ - if ((vvp)->tv_usec < 0) { \ - (vvp)->tv_sec--; \ - (vvp)->tv_usec += 1000000; \ - } \ - } while (0) +#undef timersub +#define timeradd(tvp, uvp, vvp) \ + do { \ + (vvp)->tv_sec = (tvp)->tv_sec + (uvp)->tv_sec; \ + (vvp)->tv_usec = (tvp)->tv_usec + (uvp)->tv_usec; \ + if ((vvp)->tv_usec >= 1000000) { \ + (vvp)->tv_sec++; \ + (vvp)->tv_usec -= 1000000; \ + } \ + } while (0) +#define timersub(tvp, uvp, vvp) \ + do { \ + (vvp)->tv_sec = (tvp)->tv_sec - (uvp)->tv_sec; \ + (vvp)->tv_usec = (tvp)->tv_usec - (uvp)->tv_usec; \ + if ((vvp)->tv_usec < 0) { \ + (vvp)->tv_sec--; \ + (vvp)->tv_usec += 1000000; \ + } \ + } while (0) #endif /* !HAVE_TIMERADD */ +#undef HAVE_TIMERCLEAR +#ifndef HAVE_TIMERCLEAR +#define timerclear(tvp) (tvp)->tv_sec = (tvp)->tv_usec = 0 +#endif + +#define HAVE_TIMERCMP +#ifndef HAVE_TIMERCMP +#undef timercmp +#define timercmp(tvp, uvp, cmp) \ + (((tvp)->tv_sec == (uvp)->tv_sec) ? \ + ((tvp)->tv_usec cmp (uvp)->tv_usec) : \ + ((tvp)->tv_sec cmp (uvp)->tv_sec)) +#endif + +#undef HAVE_TIMERISSET +#ifndef HAVE_TIMERISSET +#undef timerisset +#define timerisset(tvp) ((tvp)->tv_sec || (tvp)->tv_usec) +#endif + /* Define if TAILQ_FOREACH is defined in */ -#define HAVE_TAILQFOREACH 1 +#define HAVE_TAILQFOREACH #ifndef HAVE_TAILQFOREACH -#define TAILQ_FIRST(head) ((head)->tqh_first) -#define TAILQ_END(head) NULL -#define TAILQ_NEXT(elm, field) ((elm)->field.tqe_next) -#define TAILQ_FOREACH(var, head, field) \ - for((var) = TAILQ_FIRST(head); \ - (var) != TAILQ_END(head); \ - (var) = TAILQ_NEXT(var, field)) -#define TAILQ_INSERT_BEFORE(listelm, elm, field) do { \ - (elm)->field.tqe_prev = (listelm)->field.tqe_prev; \ - (elm)->field.tqe_next = (listelm); \ - *(listelm)->field.tqe_prev = (elm); \ - (listelm)->field.tqe_prev = &(elm)->field.tqe_next; \ +#define TAILQ_FIRST(head) ((head)->tqh_first) +#define TAILQ_END(head) NULL +#define TAILQ_NEXT(elm, field) ((elm)->field.tqe_next) +#define TAILQ_FOREACH(var, head, field) \ + for((var) = TAILQ_FIRST(head); \ + (var) != TAILQ_END(head); \ + (var) = TAILQ_NEXT(var, field)) +#define TAILQ_INSERT_BEFORE(listelm, elm, field) do { \ + (elm)->field.tqe_prev = (listelm)->field.tqe_prev; \ + (elm)->field.tqe_next = (listelm); \ + *(listelm)->field.tqe_prev = (elm); \ + (listelm)->field.tqe_prev = &(elm)->field.tqe_next; \ } while (0) #endif /* TAILQ_FOREACH */ -/* Define to 1 if you have the `gettimeofday' function. */ + +/* Define if /dev/poll is available */ +#undef HAVE_DEVPOLL + +/* Define if your system supports the epoll system calls */ +#undef HAVE_EPOLL + +/* Define if you have the `epoll_ctl' function. */ +#undef HAVE_EPOLL_CTL + +/* Define if you have the `err' function. */ +#undef HAVE_ERR + +/* Define if you have the `fcntl' function. */ +#undef HAVE_FCNTL + +/* Define if you have the header file. */ +#undef HAVE_FCNTL_H + +/* Define if you have the `gettimeofday' function. */ #define HAVE_GETTIMEOFDAY 1 -/* Define to 1 if you have the header file. */ +/* Define if you have the header file. */ #define HAVE_INTTYPES_H 1 -/* Define to 1 if you have the `kqueue' function. */ -/* #undef HAVE_KQUEUE */ +/* Define if you have the `kqueue' function. */ +#undef HAVE_KQUEUE + +/* Define if you have the `socket' library (-lsocket). */ +#undef HAVE_LIBSOCKET -/* Define to 1 if you have the header file. */ +/* Define if you have the header file. */ #define HAVE_MEMORY_H 1 -/* Define to 1 if you have the `select' function. */ -/* #undef HAVE_SELECT */ +/* Define if you have the `poll' function. */ +#undef HAVE_POLL + +/* Define if you have the header file. */ +#undef HAVE_POLL_H + +/* Define if your system supports POSIX realtime signals */ +#undef HAVE_RTSIG + +/* Define if you have the `select' function. */ +#undef HAVE_SELECT + +/* Define if F_SETFD is defined in */ +#undef HAVE_SETFD + +/* Define if you have the header file. */ +#undef HAVE_SIGNAL_H + +/* Define if you have the `sigtimedwait' function. */ +#undef HAVE_SIGTIMEDWAIT -/* Define to 1 if you have the header file. */ -/* #undef HAVE_STDINT_H */ +/* Define if you have the header file. */ +#define HAVE_STDARG_H 1 -/* Define to 1 if you have the header file. */ +/* Define if you have the header file. */ +#undef HAVE_STDINT_H + +/* Define if you have the header file. */ #define HAVE_STDLIB_H 1 -/* Define to 1 if you have the header file. */ -#define HAVE_STRINGS_H 1 +/* Define if you have the header file. */ +#undef HAVE_STRINGS_H -/* Define to 1 if you have the header file. */ +/* Define if you have the header file. */ #define HAVE_STRING_H 1 -/* Define to 1 if you have the header file. */ -#define HAVE_SYS_EVENT_H 1 +/* Define if you have the header file. */ +#undef HAVE_SYS_DEVPOLL_H + +/* Define if you have the header file. */ +#undef HAVE_SYS_EPOLL_H + +/* Define if you have the header file. */ +#undef HAVE_SYS_EVENT_H + +/* Define if you have the header file. */ +#undef HAVE_SYS_IOCTL_H -/* Define to 1 if you have the header file. */ -#define HAVE_SYS_QUEUE_H 1 +/* Define if you have the header file. */ +#undef HAVE_SYS_QUEUE_H -/* Define to 1 if you have the header file. */ +/* Define if you have the header file. */ #define HAVE_SYS_STAT_H 1 -/* Define to 1 if you have the header file. */ -/* #undef HAVE_SYS_TIME_H */ +/* Define if you have the header file. */ +#undef HAVE_SYS_TIME_H -/* Define to 1 if you have the header file. */ +/* Define if you have the header file. */ #define HAVE_SYS_TYPES_H 1 -/* Define to 1 if you have the header file. */ -/* #undef HAVE_UNISTD_H */ +/* Define if TAILQ_FOREACH is defined in */ +#undef HAVE_TAILQFOREACH + +/* Define if timeradd is defined in */ +#undef HAVE_TIMERADD + +/* Define if you have the header file. */ +#undef HAVE_UNISTD_H -/* Define to 1 if you have the `warnx' function. */ -#define HAVE_WARNX 1 +/* Define if you have the `vasprintf' function. */ +#undef HAVE_VASPRINTF + +/* Define if kqueue works correctly with pipes */ +#undef HAVE_WORKING_KQUEUE + +/* Define if realtime signals work on pipes */ +#undef HAVE_WORKING_RTSIG /* Name of package */ #define PACKAGE "libevent" -/* Define to the address where bug reports for this package should be sent. */ -#define PACKAGE_BUGREPORT "" - -/* Define to the full name of this package. */ -#define PACKAGE_NAME "" +/* Define if you have the ANSI C header files. */ +#undef STDC_HEADERS -/* Define to the full name and version of this package. */ -#define PACKAGE_STRING "" +/* Define if you can safely include both and . */ +#undef TIME_WITH_SYS_TIME -/* Define to the one symbol short name of this package. */ -#define PACKAGE_TARNAME "" +/* Version number of package */ +#define VERSION "1.0b" -/* Define to the version of this package. */ -#define PACKAGE_VERSION "" +/* Define to empty if `const' does not conform to ANSI C. */ +#undef const -/* Define to 1 if you have the ANSI C header files. */ -#define STDC_HEADERS 1 +/* Define as `__inline' if that's what the C compiler calls it, or to nothing + if it is not supported. */ +#define inline __inline -/* Define to 1 if you can safely include both and . */ -#define TIME_WITH_SYS_TIME 1 +/* Define to `int' if does not define. */ +#undef pid_t -/* Version number of package */ -#define VERSION "0.6" +/* Define to `unsigned' if does not define. */ +#undef size_t -typedef unsigned char u_char; +/* Define to unsigned int if you dont have it */ +#undef socklen_t -/* Winsock compatibility */ -#define SHUT_WR SD_SEND +/* Define to `unsigned short' if does not define. */ +#undef u_int16_t -struct timeval; -struct timezone; -int gettimeofday(struct timeval *tv, struct timezone *tz); +/* Define to `unsigned int' if does not define. */ +#undef u_int32_t -#define read win_read -#define write win_write +/* Define to `unsigned long long' if does not define. */ +/* #undef u_int64_t */ -int win_read(int, void *, unsigned int); -int win_write(int, void *, unsigned int); -int socketpair(int d, int type, int protocol, int *sv); +/* Define to `unsigned char' if does not define. */ +/* #undef u_int8_t */ -#define __func__ __FILE__ \ No newline at end of file +/* Define to __FUNCTION__ or __file__ if your compiler doesn't have __func__ */ +#define __func__ __FUNCTION__ diff --git a/WIN32-Code/win32.c b/WIN32-Code/win32.c index a278dea910..f4cc2d8aef 100644 --- a/WIN32-Code/win32.c +++ b/WIN32-Code/win32.c @@ -27,6 +27,8 @@ */ #include "config.h" +#include + #include #include #include @@ -36,37 +38,49 @@ #include #include #include -#include +#include -#ifdef USE_LOG #include "log.h" -#else -#define LOG_DBG(x) -#define log_error(x) perror(x) -#endif - #include "event.h" #include "event-internal.h" -extern struct event_base *current_base; +#define XFREE(ptr) do { if (ptr) free(ptr); } while(0) + +extern struct event_list timequeue; +extern struct event_list addqueue; extern struct event_list signalqueue; -#define NEVENT 64 +struct win_fd_set { + u_int fd_count; + SOCKET fd_array[1]; +}; int evsigcaught[NSIG]; volatile sig_atomic_t signal_caught = 0; /* MSDN says this is required to handle SIGFPE */ -volatile double SIGFPE_REQ = 0.0f; +volatile double SIGFPE_REQ = 0.0f; int signal_handler(int sig); void signal_process(void); int signal_recalc(void); +struct win32op { + int fd_setsz; + struct win_fd_set *readset_in; + struct win_fd_set *writeset_in; + struct win_fd_set *readset_out; + struct win_fd_set *writeset_out; + struct win_fd_set *exset_out; + int n_events; + int n_events_alloc; + struct event **events; +}; + void *win32_init (void); int win32_insert (void *, struct event *); int win32_del (void *, struct event *); -int win32_recalc (void *, int); -int win32_dispatch (void *, struct timeval *); +int win32_recalc (struct event_base *base, void *, int); +int win32_dispatch (struct event_base *base, void *, struct timeval *); struct eventop win32ops = { "win32", @@ -77,67 +91,270 @@ struct eventop win32ops = { win32_dispatch }; -static int timeval_to_ms(struct timeval *tv) +#define FD_SET_ALLOC_SIZE(n) ((sizeof(struct win_fd_set) + ((n)-1)*sizeof(SOCKET))) + +static int +realloc_fd_sets(struct win32op *op, size_t new_size) +{ + size_t size; + + assert(new_size >= op->readset_in->fd_count && + new_size >= op->writeset_in->fd_count); + assert(new_size >= 1); + + size = FD_SET_ALLOC_SIZE(new_size); + if (!(op->readset_in = realloc(op->readset_in, size))) + return (-1); + if (!(op->writeset_in = realloc(op->writeset_in, size))) + return (-1); + if (!(op->readset_out = realloc(op->readset_out, size))) + return (-1); + if (!(op->exset_out = realloc(op->exset_out, size))) + return (-1); + if (!(op->writeset_out = realloc(op->writeset_out, size))) + return (-1); + op->fd_setsz = new_size; + return (0); +} + +static int +timeval_to_ms(struct timeval *tv) { return ((tv->tv_sec * 1000) + (tv->tv_usec / 1000)); } +static int +do_fd_set(struct win32op *op, SOCKET s, int read) +{ + unsigned int i; + struct win_fd_set *set = read ? op->readset_in : op->writeset_in; + for (i=0;ifd_count;++i) { + if (set->fd_array[i]==s) + return (0); + } + if (set->fd_count == op->fd_setsz) { + if (realloc_fd_sets(op, op->fd_setsz*2)) + return (-1); + } + set->fd_array[set->fd_count] = s; + return (set->fd_count++); +} + +static int +do_fd_clear(struct win32op *op, SOCKET s, int read) +{ + unsigned int i; + struct win_fd_set *set = read ? op->readset_in : op->writeset_in; + for (i=0;ifd_count;++i) { + if (set->fd_array[i]==s) { + if (--set->fd_count != i) { + set->fd_array[i] = set->fd_array[set->fd_count]; + } + return (0); + } + } + return (0); +} + +#define NEVENT 64 void * win32_init(void) { - return (&win32ops); + struct win32op *winop; + size_t size; + if (!(winop = calloc(1, sizeof(struct win32op)))) + return NULL; + winop->fd_setsz = NEVENT; + size = FD_SET_ALLOC_SIZE(NEVENT); + if (!(winop->readset_in = malloc(size))) + goto err; + if (!(winop->writeset_in = malloc(size))) + goto err; + if (!(winop->readset_out = malloc(size))) + goto err; + if (!(winop->writeset_out = malloc(size))) + goto err; + if (!(winop->exset_out = malloc(size))) + goto err; + winop->n_events = 0; + winop->n_events_alloc = NEVENT; + if (!(winop->events = malloc(NEVENT*sizeof(struct event*)))) + goto err; + winop->readset_in->fd_count = winop->writeset_in->fd_count = 0; + winop->readset_out->fd_count = winop->writeset_out->fd_count + = winop->exset_out->fd_count = 0; + + return (winop); + err: + XFREE(winop->readset_in); + XFREE(winop->writeset_in); + XFREE(winop->readset_out); + XFREE(winop->writeset_out); + XFREE(winop->exset_out); + XFREE(winop->events); + XFREE(winop); + return (NULL); } int -win32_recalc(void *arg, int max) +win32_recalc(struct event_base *base, void *arg, int max) { return (signal_recalc()); } int -win32_insert(struct win32op *wop, struct event *ev) +win32_insert(struct win32op *win32op, struct event *ev) { + int i; + if (ev->ev_events & EV_SIGNAL) { if (ev->ev_events & (EV_READ|EV_WRITE)) - errx(1, "%s: EV_SIGNAL incompatible use", - __func__); + event_errx(1, "%s: EV_SIGNAL incompatible use", + __func__); if((int)signal(EVENT_SIGNAL(ev), signal_handler) == -1) return (-1); return (0); } + if (!(ev->ev_events & (EV_READ|EV_WRITE))) + return (0); + + for (i=0;in_events;++i) { + if(win32op->events[i] == ev) { + event_debug(("%s: Event for %d already inserted.", + __func__, (int)ev->ev_fd)); + return (0); + } + } + event_debug(("%s: adding event for %d", __func__, (int)ev->ev_fd)); + if (ev->ev_events & EV_READ) { + if (do_fd_set(win32op, ev->ev_fd, 1)<0) + return (-1); + } + if (ev->ev_events & EV_WRITE) { + if (do_fd_set(win32op, ev->ev_fd, 0)<0) + return (-1); + } + + if (win32op->n_events_alloc == win32op->n_events) { + size_t sz; + win32op->n_events_alloc *= 2; + sz = sizeof(struct event*)*win32op->n_events_alloc; + if (!(win32op->events = realloc(win32op->events, sz))) + return (-1); + } + win32op->events[win32op->n_events++] = ev; return (0); } int -win32_dispatch(void *arg, struct timeval *tv) +win32_del(struct win32op *win32op, struct event *ev) +{ + int i, found; + + if (ev->ev_events & EV_SIGNAL) + return ((int)signal(EVENT_SIGNAL(ev), SIG_IGN)); + + found = -1; + for (i=0;in_events;++i) { + if(win32op->events[i] == ev) { + found = i; + break; + } + } + if (found < 0) { + event_debug(("%s: Unable to remove non-inserted event for %d", + __func__, ev->ev_fd)); + return (-1); + } + event_debug(("%s: Removing event for %d", __func__, ev->ev_fd)); + if (ev->ev_events & EV_READ) + do_fd_clear(win32op, ev->ev_fd, 1); + if (ev->ev_events & EV_WRITE) + do_fd_clear(win32op, ev->ev_fd, 0); + + if (i != --win32op->n_events) { + win32op->events[i] = win32op->events[win32op->n_events]; + } + + return 0; +} + +static void +fd_set_copy(struct win_fd_set *out, const struct win_fd_set *in) +{ + out->fd_count = in->fd_count; + memcpy(out->fd_array, in->fd_array, in->fd_count * (sizeof(SOCKET))); +} + +/* + static void dump_fd_set(struct win_fd_set *s) + { + unsigned int i; + printf("[ "); + for(i=0;ifd_count;++i) + printf("%d ",(int)s->fd_array[i]); + printf("]\n"); + } +*/ + +int +win32_dispatch(struct event_base *base, struct win32op *win32op, + struct timeval *tv) { int res = 0; - struct win32op *wop = arg; - struct event *ev; - int evres; + int i; + int fd_count; - TAILQ_FOREACH(ev, ¤t_base->eventqueue, ev_next) { - res = WaitForSingleObject(ev->ev_fd, timeval_to_ms(tv)); + fd_set_copy(win32op->readset_out, win32op->readset_in); + fd_set_copy(win32op->exset_out, win32op->readset_in); + fd_set_copy(win32op->writeset_out, win32op->writeset_in); - if(res == WAIT_TIMEOUT || res == WAIT_FAILED) { - signal_process(); - return (0); - } else if (signal_caught) - signal_process(); + fd_count = + (win32op->readset_out->fd_count > win32op->writeset_out->fd_count) ? + win32op->readset_out->fd_count : win32op->writeset_out->fd_count; - evres = 0; - if(ev->ev_events & EV_READ) - evres |= EV_READ; + if (!fd_count) { + /* Windows doesn't like you to call select() with no sockets */ + Sleep(timeval_to_ms(tv)); + signal_process(); + return (0); + } - if(ev->ev_events & EV_WRITE) - evres |= EV_WRITE; - if(evres) { - if(!(ev->ev_events & EV_PERSIST)) - event_del(ev); - event_active(ev, evres, 1); + res = select(fd_count, + (struct fd_set*)win32op->readset_out, + (struct fd_set*)win32op->writeset_out, + (struct fd_set*)win32op->exset_out, tv); + + event_debug(("%s: select returned %d", __func__, res)); + + if(res <= 0) { + signal_process(); + return res; + } + + for (i=0;in_events;++i) { + struct event *ev; + int got = 0; + ev = win32op->events[i]; + if ((ev->ev_events & EV_READ)) { + if (FD_ISSET(ev->ev_fd, win32op->readset_out) || + FD_ISSET(ev->ev_fd, win32op->exset_out)) { + got |= EV_READ; + } + } + if ((ev->ev_events & EV_WRITE)) { + if (FD_ISSET(ev->ev_fd, win32op->writeset_out)) { + got |= EV_WRITE; + } } + if (!got) + continue; + if (!(ev->ev_events & EV_PERSIST)) { + event_del(ev); + } + event_active(ev,got,1); } if (signal_recalc() == -1) @@ -146,13 +363,9 @@ win32_dispatch(void *arg, struct timeval *tv) return (0); } -int -win32_del(struct win32op *arg, struct event *ev) -{ - return ((int)signal(EVENT_SIGNAL(ev), SIG_IGN)); -} -static int signal_handler(int sig) +static int +signal_handler(int sig) { evsigcaught[sig]++; signal_caught = 1; diff --git a/event.c b/event.c index e0fce52da6..8bac4ede2c 100644 --- a/event.c +++ b/event.c @@ -24,9 +24,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #ifdef WIN32 #define WIN32_LEAN_AND_MEAN @@ -456,12 +454,7 @@ event_set(struct event *ev, int fd, short events, ev->ev_callback = callback; ev->ev_arg = arg; -#ifdef WIN32 - ev->ev_fd = (HANDLE)fd; - ev->overlap.hEvent = ev; -#else ev->ev_fd = fd; -#endif ev->ev_events = events; ev->ev_flags = EVLIST_INIT; ev->ev_ncalls = 0; diff --git a/event.h b/event.h index 5f39d24709..e57b3dfe3c 100644 --- a/event.h +++ b/event.h @@ -32,7 +32,10 @@ extern "C" { #endif #ifdef WIN32 +#define WIN32_LEAN_AND_MEAN #include +#undef WIN32_LEAN_AND_MEAN +typedef unsigned char u_char; #endif #define EVLIST_TIMEOUT 0x01 @@ -79,12 +82,7 @@ struct event { RB_ENTRY (event) ev_timeout_node; struct event_base *ev_base; -#ifdef WIN32 - HANDLE ev_fd; - OVERLAPPED overlap; -#else int ev_fd; -#endif short ev_events; short ev_ncalls; short *ev_pncalls; /* Allows deletes in callback */