Changeset 222

Timestamp:

23/05/07 15:09:05 (18 months ago)

Author:

ono

Message:

mio fixed for Windows platform:
* select requires 3rd exception parameter
* lowfd added for select, because Winsock doesn't start from 1 with descriptors
Services shall use MIO_MAXFD instead of 1024 when calling mio_new, so we are not capped to 1024 on Windows select, since descriptors usually start above.
On Windows we use FD_SETSIZE which is defined to 16k in win32 projects.
Add JABBERD2_API implementation for "mio", required to build proper jabberd2.dll on Windows.
Renamed WIN32 to _WIN32 checks.

Location:

trunk/mio

Files:

• mio.h (modified) (2 diffs)
• mio_impl.h (modified) (3 diffs)
• mio_select.h (modified) (5 diffs)

trunk/mio/mio.h

@@ -27 +27 @@
 
 #include "ac-stdint.h"
+
+/* jabberd2 Windows DLL */
+#ifndef JABBERD2_API
+# ifdef _WIN32
+#  ifdef JABBERD2_EXPORTS
+#   define JABBERD2_API  __declspec(dllexport)
+#  else /* JABBERD2_EXPORTS */
+#   define JABBERD2_API  __declspec(dllimport)
+#  endif /* JABBERD2_EXPORTS */
+# else /* _WIN32 */
+#  define JABBERD2_API extern
+# endif /* _WIN32 */
+#endif /* JABBERD2_API */
+
+#ifdef _WIN32
+# define MIO_MAXFD FD_SETSIZE
+#else
+# define MIO_MAXFD 1024
+#endif
 
 #include <stdio.h>
@@ -110 +129 @@
 
 /** create/free the mio subsytem */
-mio_t mio_new(int maxfd); /* returns NULL if failed */
+JABBERD2_API mio_t mio_new(int maxfd); /* returns NULL if failed */
 
 #define mio_free(m) (*m)->mio_free(m)

trunk/mio/mio_impl.h

@@ -26 +26 @@
 #include "util/inaddr.h"
 
+/* win32 wrappers around strerror */
+#ifdef _WIN32
+#define close(x) closesocket(x)
+#ifdef MIO_DEBUG
+char *ws_strerror(int code)
+{
+    static char buff[128];
+    int len;
+    if(FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM,
+                NULL, WSAGetLastError(), 0, buff,
+                sizeof(buff), NULL))
+        return buff;
+    return strerror(code);
+}
+#define strerror(x) ws_strerror(x)
+#endif
+#endif /* _WIN32 */
+
 /** our internal wrapper around a fd */
 typedef enum { 
@@ -392 +410 @@
 
     /* gotta wait till later */
+#ifdef _WIN32
+    if(flag == -1 && WSAGetLastError() == WSAEWOULDBLOCK)
+#else
     if(flag == -1 && errno == EINPROGRESS)
+#endif
     {
         mio_fd = _mio_setup_fd(m,fd,app,arg);
@@ -432 +454 @@
     mio_t m;
 
+    /* init winsock if we are in Windows */
+#ifdef _WIN32
+    WSADATA wsaData;
+    if (WSAStartup(MAKEWORD( 1, 1 ), &wsaData))
+        return NULL;
+#endif
+
     /* allocate and zero out main memory */
     if((m = malloc(sizeof(struct mio_priv_st))) == NULL) return NULL;

trunk/mio/mio_select.h

@@ -34 +34 @@
         }                                                               \
         m->highfd = 0;                                                  \
+        m->lowfd = m->maxfd;                                            \
     }                                                                   \
                                                                         \
@@ -39 +40 @@
     {                                                                   \
         if(fd > m->highfd) m->highfd = fd;                              \
+        if(fd < m->lowfd) m->lowfd = fd;                                \
         return &m->fds[fd].mio_fd;                                      \
     }                                                                   \
@@ -51 +53 @@
         tv.tv_sec = t;                                                  \
         tv.tv_usec = 0;                                                 \
-        return select(m->highfd + 1, &m->rfds_out, &m->wfds_out, NULL, &tv); \
+        return select(m->highfd + 1, &m->rfds_out, &m->wfds_out, &m->wfds_out, &tv); \
     }
 
@@ -58 +60 @@
 #define MIO_VARS \
     struct mio_priv_fd_st *fds;                                         \
+    int lowfd;                                                          \
     int highfd;                                                         \
     fd_set rfds_in, wfds_in, rfds_out, wfds_out;
@@ -106 +109 @@
 
 #define MIO_ITERATE_RESULTS(m, retval, iter) \
-    for(iter = 0; iter <= MIO(m)->highfd; iter++)
+    for(iter = MIO(m)->lowfd; iter <= MIO(m)->highfd; iter++)
 
 #define MIO_ITERATOR_FD(m, iter) \