[or-cvs] r8421: added directory for bsockets libevent hack (in bsockets/trunk/contrib: . libevent)
chiussi at seul.org
chiussi at seul.org
Tue Sep 19 17:33:08 UTC 2006
Author: chiussi
Date: 2006-09-19 13:33:07 -0400 (Tue, 19 Sep 2006)
New Revision: 8421
Added:
bsockets/trunk/contrib/libevent/
bsockets/trunk/contrib/libevent/win32.c
Log:
added directory for bsockets libevent hack
Added: bsockets/trunk/contrib/libevent/win32.c
===================================================================
--- bsockets/trunk/contrib/libevent/win32.c 2006-09-19 17:30:05 UTC (rev 8420)
+++ bsockets/trunk/contrib/libevent/win32.c 2006-09-19 17:33:07 UTC (rev 8421)
@@ -0,0 +1,442 @@
+/*
+ * Copyright 2000-2002 Niels Provos <provos at citi.umich.edu>
+ * Copyright 2003 Michael A. Davis <mike at datanerds.net>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+#include "config.h"
+
+#include <winsock2.h>
+
+#include <windows.h>
+#include <sys/types.h>
+#include <sys/queue.h>
+#include <sys/tree.h>
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+#include <assert.h>
+
+#include "log.h"
+#include "event.h"
+#include "event-internal.h"
+
+struct socket_env *__GLOBAL_BSOCKET_ENV_;
+
+
+#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;
+
+#include <bsocket.h>
+
+int evsigcaught[NSIG];
+volatile sig_atomic_t signal_caught = 0;
+/* MSDN says this is required to handle SIGFPE */
+volatile double SIGFPE_REQ = 0.0f;
+
+static int signal_handler(int sig);
+
+void signal_process(void);
+int signal_recalc(void);
+
+struct win32op {
+ int fd_setsz;
+ bfd_set *readset_in;
+ bfd_set *writeset_in;
+ bfd_set *readset_out;
+ bfd_set *writeset_out;
+ bfd_set *exset_out;
+ int n_events;
+ int n_events_alloc;
+ struct event **events;
+};
+
+void *win32_init (void);
+int win32_insert (struct win32op *, struct event *);
+int win32_del (struct win32op *, struct event *);
+int win32_recalc (struct event_base *base, void *, int);
+int win32_dispatch (struct event_base *base, struct win32op *, struct timeval *);
+
+struct eventop win32ops = {
+ "win32",
+ win32_init,
+ (int (*) (void*, struct event*)) win32_insert,
+ (int (*) (void*, struct event*)) win32_del,
+ win32_recalc,
+ (int (*) (struct event_base*, void*, struct timeval*)) win32_dispatch
+};
+
+
+#define FD_SET_ALLOC_SIZE(n) ((sizeof(bfd_set) + ((n)-1)*sizeof(int)))
+
+static int
+realloc_fd_sets(struct win32op *op, size_t new_size)
+{
+ size_t size;
+
+ assert(new_size >= op->readset_in->count &&
+ new_size >= op->writeset_in->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, int s, int read)
+{
+
+ bfd_set *set = read ? op->readset_in : op->writeset_in;
+
+ //printf("%d\n",
+ // ((set)->hash[s] >= 0)
+ // &&
+ // ((set)->hash[s] < (set)->count)
+ // &&
+ // ((set)->list[(set)->hash[s]] == s));
+
+ BFD_SET(s,set);
+/*
+if (
+((set)->hash[s] >= 0)\
+ &&\
+((set)->hash[s] < (set)->count)\
+ &&\
+( (set)->list[(set)->hash[s]] == s)
+) {
+ (set)->hash[s] = (set)->count;
+ (set)->list[(set)->count] = s;
+ (set)->count++;
+ }\
+*/
+ return 0;
+}
+
+static int
+do_fd_clear(struct win32op *op, int s, int read)
+{
+ bfd_set *set = read ? op->readset_in : op->writeset_in;
+ BFD_CLR(s,set)
+
+ return (0);
+}
+
+#define NEVENT 64
+void *
+win32_init(void)
+{
+ 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->count = winop->writeset_in->count = 0;
+ winop->readset_out->count = winop->writeset_out->count
+ = winop->exset_out->count = 0;
+
+
+ BFD_ZERO(winop->readset_in);
+ BFD_ZERO(winop->writeset_in);
+ BFD_ZERO(winop->writeset_out);
+ BFD_ZERO(winop->readset_out);
+ BFD_ZERO(winop->exset_out);
+
+ 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(struct event_base *base, void *arg, int max)
+{
+ return (signal_recalc());
+}
+
+int
+win32_insert(struct win32op *win32op, struct event *ev)
+{
+ int i;
+
+ if (ev->ev_events & EV_SIGNAL) {
+ if (ev->ev_events & (EV_READ|EV_WRITE))
+ event_errx(1, "%s: EV_SIGNAL incompatible use",
+ __func__);
+
+#ifndef __GNUC__
+ if((int)signal(EVENT_SIGNAL(ev), signal_handler) == -1)
+#else
+ if((int)signal(EVENT_SIGNAL(ev), (void*) signal_handler) == -1)
+#endif
+
+ return (-1);
+ return (0);
+ }
+ if (!(ev->ev_events & (EV_READ|EV_WRITE)))
+ return (0);
+
+ for (i=0;i<win32op->n_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) {
+
+ //printf("%d\n",win32op);
+ //fflush(stdout);
+
+ 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_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;i<win32op->n_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(bfd_set *out, const bfd_set *in)
+{
+ BFD_COPY(out,in);
+}
+
+/*
+ static void dump_fd_set(struct win_fd_set *s)
+ {
+ unsigned int i;
+ printf("[ ");
+ for(i=0;i<s->fd_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;
+ int i;
+ int fd_count;
+
+ 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);
+
+ fd_count =
+ (win32op->readset_out->count > win32op->writeset_out->count) ?
+ win32op->readset_out->count : win32op->writeset_out->count;
+
+ if (!fd_count) {
+ /* Windows doesn't like you to call select() with no sockets */
+ Sleep(timeval_to_ms(tv));
+ signal_process();
+ return (0);
+ }
+
+
+ res = bselect(fd_count,
+ (struct bfd_set*)win32op->readset_out,
+ (struct bfd_set*)win32op->writeset_out,
+ (struct bfd_set*)win32op->exset_out, NULL);
+
+ event_debug(("%s: select returned %d", __func__, res));
+
+ if(res <= 0) {
+ signal_process();
+ return res;
+ }
+
+ for (i=0;i<win32op->n_events;++i) {
+ struct event *ev;
+ int got = 0;
+ ev = win32op->events[i];
+ if ((ev->ev_events & EV_READ)) {
+ if (BFD_ISSET(ev->ev_fd, win32op->readset_out) ||
+ BFD_ISSET(ev->ev_fd, win32op->exset_out)) {
+ got |= EV_READ;
+ //printf("%d\n",ev->ev_fd);
+ //fflush(stdout);
+
+ }
+ }
+ if ((ev->ev_events & EV_WRITE)) {
+ if (BFD_ISSET(ev->ev_fd, win32op->writeset_out)) {
+ got |= EV_WRITE;
+ //printf("%d\n",ev->ev_fd);
+ //fflush(stdout);
+ }
+ }
+ if (!got)
+ continue;
+ if (!(ev->ev_events & EV_PERSIST)) {
+ event_del(ev);
+ }
+ event_active(ev,got,1);
+ }
+
+ if (signal_recalc() == -1)
+ return (-1);
+
+ return (0);
+}
+
+
+static int
+signal_handler(int sig)
+{
+ evsigcaught[sig]++;
+ signal_caught = 1;
+
+ return 0;
+}
+
+int
+signal_recalc(void)
+{
+ struct event *ev;
+
+ /* Reinstall our signal handler. */
+ TAILQ_FOREACH(ev, &signalqueue, ev_signal_next) {
+#ifndef __GNUC__
+ if((int)signal(EVENT_SIGNAL(ev), signal_handler) == -1)
+#else
+ if((int)signal(EVENT_SIGNAL(ev), (void*) signal_handler) == -1)
+#endif
+ return (-1);
+
+ }
+ return (0);
+}
+
+void
+signal_process(void)
+{
+ struct event *ev;
+ short ncalls;
+
+ TAILQ_FOREACH(ev, &signalqueue, ev_signal_next) {
+ ncalls = evsigcaught[EVENT_SIGNAL(ev)];
+ if (ncalls) {
+ if (!(ev->ev_events & EV_PERSIST))
+ event_del(ev);
+ event_active(ev, EV_SIGNAL, ncalls);
+ }
+ }
+
+ memset(evsigcaught, 0, sizeof(evsigcaught));
+ signal_caught = 0;
+}
Property changes on: bsockets/trunk/contrib/libevent/win32.c
___________________________________________________________________
Name: svn:executable
+ *
More information about the tor-commits
mailing list