diff options
| -rw-r--r-- | README.embed | 2 | ||||
| -rw-r--r-- | ev.c | 63 | ||||
| -rw-r--r-- | ev_win32.c | 109 |
3 files changed, 114 insertions, 60 deletions
diff --git a/README.embed b/README.embed index 1d04427..0ab2878 100644 --- a/README.embed +++ b/README.embed @@ -27,6 +27,8 @@ FILESETS ev.c ev_vars.h ev_wrap.h + ev_win32.c + ev_select.c only when select backend is enabled (which is by default) ev_poll.c only when poll backend is enabled (disabled by default) ev_epoll.c only when the epoll backend is enabled (disabled by default) @@ -150,64 +150,7 @@ typedef struct ev_watcher_time *WT; static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ -#if WIN32 -/* note: the comment below could not be substantiated, but what would I care */ -/* MSDN says this is required to handle SIGFPE */ -volatile double SIGFPE_REQ = 0.0f; - -static int -ev_socketpair_tcp (int filedes [2]) -{ - struct sockaddr_in addr = { 0 }; - int addr_size = sizeof (addr); - SOCKET listener; - SOCKET sock [2] = { -1, -1 }; - - if ((listener = socket (AF_INET, SOCK_STREAM, 0)) == INVALID_SOCKET) - return -1; - - addr.sin_family = AF_INET; - addr.sin_addr.s_addr = htonl (INADDR_LOOPBACK); - addr.sin_port = 0; - - if (bind (listener, (struct sockaddr *)&addr, addr_size)) - goto fail; - - if (getsockname(listener, (struct sockaddr *)&addr, &addr_size)) - goto fail; - - if (listen (listener, 1)) - goto fail; - - if ((sock [0] = socket (AF_INET, SOCK_STREAM, 0)) == INVALID_SOCKET) - goto fail; - - if (connect (sock[0], (struct sockaddr *)&addr, addr_size)) - goto fail; - - if ((sock[1] = accept (listener, 0, 0)) < 0) - goto fail; - - closesocket (listener); - - filedes [0] = sock [0]; - filedes [1] = sock [1]; - - return 0; - -fail: - closesocket (listener); - - if (sock [0] != INVALID_SOCKET) closesocket (sock [0]); - if (sock [1] != INVALID_SOCKET) closesocket (sock [1]); - - return -1; -} - -# define ev_pipe(filedes) ev_socketpair_tcp (filedes) -#else -# define ev_pipe(filedes) pipe (filedes) -#endif +#include "ev_win32.c" /*****************************************************************************/ @@ -830,7 +773,7 @@ loop_fork (EV_P) close (sigpipe [0]); close (sigpipe [1]); - while (ev_pipe (sigpipe)) + while (pipe (sigpipe)) syserr ("(libev) error creating pipe"); siginit (EV_A); @@ -883,7 +826,7 @@ int ev_default_loop (int methods) { if (sigpipe [0] == sigpipe [1]) - if (ev_pipe (sigpipe)) + if (pipe (sigpipe)) return 0; if (!default_loop) diff --git a/ev_win32.c b/ev_win32.c new file mode 100644 index 0000000..5821128 --- /dev/null +++ b/ev_win32.c @@ -0,0 +1,109 @@ +/* + * libev win32 compatibility cruft + * + * Copyright (c) 2007 Marc Alexander Lehmann <libev@schmorp.de> + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * * 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. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "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 COPYRIGHT + * OWNER OR CONTRIBUTORS 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. + */ + +#ifdef WIN32 + +#include <sys/timeb.h> + +/* note: the comment below could not be substantiated, but what would I care */ +/* MSDN says this is required to handle SIGFPE */ +volatile double SIGFPE_REQ = 0.0f; + +/* oh, the humanity! */ +static int +ev_pipe (int filedes [2]) +{ + struct sockaddr_in addr = { 0 }; + int addr_size = sizeof (addr); + SOCKET listener; + SOCKET sock [2] = { -1, -1 }; + + if ((listener = socket (AF_INET, SOCK_STREAM, 0)) == INVALID_SOCKET) + return -1; + + addr.sin_family = AF_INET; + addr.sin_addr.s_addr = htonl (INADDR_LOOPBACK); + addr.sin_port = 0; + + if (bind (listener, (struct sockaddr *)&addr, addr_size)) + goto fail; + + if (getsockname(listener, (struct sockaddr *)&addr, &addr_size)) + goto fail; + + if (listen (listener, 1)) + goto fail; + + if ((sock [0] = socket (AF_INET, SOCK_STREAM, 0)) == INVALID_SOCKET) + goto fail; + + if (connect (sock[0], (struct sockaddr *)&addr, addr_size)) + goto fail; + + if ((sock[1] = accept (listener, 0, 0)) < 0) + goto fail; + + closesocket (listener); + + filedes [0] = sock [0]; + filedes [1] = sock [1]; + + return 0; + +fail: + closesocket (listener); + + if (sock [0] != INVALID_SOCKET) closesocket (sock [0]); + if (sock [1] != INVALID_SOCKET) closesocket (sock [1]); + + return -1; +} + +#undef pipe +#define pipe(filedes) ev_pipe (filedes) + +static int +ev_gettimeofday (struct timeval *tv, struct timezone *tz) +{ + struct _timeb tb; + + _ftime (&tb); + + tv->tv_sec = (long)tb.time; + tv->tv_usec = ((long)tb.millitm) * 1000; + + return 0; +} + +#undef gettimeofday +#define gettimeofdy(tv,tz) ev_gettimeofday (tv, tz) + +#endif |