Integer type name change.

[silc.git] / lib / silcutil / win32 / silcwin32schedule.c

diff --git a/lib/silcutil/win32/silcwin32schedule.c b/lib/silcutil/win32/silcwin32schedule.c
index e9315898a4f88bf4ae8f2271052f1c27ac58e383..f3bf02cc0f894d5ef98083bcd8baf7e8483917b2 100644 (file)
--- a/lib/silcutil/win32/silcwin32schedule.c
+++ b/lib/silcutil/win32/silcwin32schedule.c
@@ -20,6 +20,7 @@
 /* $Id$ */
 
 #include "silcincludes.h"
+#include "silcschedule_i.h"
 
 /* Our "select()" for WIN32. This mimics the behaviour of select() system
    call. It does not call the Winsock's select() though. Its functions
@@ -28,8 +29,7 @@
    This makes following assumptions, which I don't know whether they
    are correct or not:
 
-   o writefds are ignored, if set this will return immediately.
-   o exceptfds are ignored totally
+   o SILC_TASK_WRITE is ignored, if set this will return immediately.
    o If all arguments except timeout are NULL then this will register
      a timeout with SetTimer and will wait just for Windows messages
      with WaitMessage.
@@ -50,28 +50,30 @@
 
 */
 
-int silc_select(int n, fd_set *readfds, fd_set *writefds,
-               fd_set *exceptfds, struct timeval *timeout)
+int silc_select(SilcScheduleFd fds, SilcUInt32 fds_count, struct timeval *timeout)
 {
   HANDLE handles[MAXIMUM_WAIT_OBJECTS];
   DWORD ready, curtime, timeo;
   int nhandles = 0, i;
   MSG msg;
 
-  /* Check fd sets (ignoring the exceptfds) */
-  if (readfds) {
-    for (i = 0; i < n - 1; i++)
-      if (FD_ISSET(i, readfds))
-       handles[nhandles++] = (HANDLE)i;
+  if (fds_count > MAXIMUM_WAIT_OBJECTS)
+    fds_count = MAXIMUM_WAIT_OBJECTS;
 
-    FD_ZERO(readfds);
-  }
+  for (i = 0; i < fds_count; i++) {
+    if (!fds[i].events)
+      continue;
+
+    if (fds[i].events & SILC_TASK_READ)
+      handles[nhandles++] = (HANDLE)fds[i].fd;
+
+    /* If writing then just set the bit and return */
+    if (fds[i].events & SILC_TASK_WRITE) {
+      fds[i].revents = SILC_TASK_WRITE;
+      return 1;
+    }
 
-  /* If writefds is set then return immediately */
-  if (writefds) {
-    for (i = 0; i < n - 1; i++)
-      if (FD_ISSET(i, writefds))
-       return 1;
+    fds[i].revents = 0;
   }
 
   timeo = (timeout ? (timeout->tv_sec * 1000) + (timeout->tv_usec / 1000) :
@@ -113,7 +115,6 @@ int silc_select(int n, fd_set *readfds, fd_set *writefds,
     /* Wait failed with error */
     SILC_LOG_WARNING(("WaitForMultipleObjects() failed"));
     return -1;
-
   } else if (ready >= WAIT_ABANDONED_0 &&
             ready < WAIT_ABANDONED_0 + nhandles) {
     /* Signal abandoned */
@@ -142,27 +143,31 @@ int silc_select(int n, fd_set *readfds, fd_set *writefds,
 
     /* Give the wait another try */
    goto retry;
-  } else if (ready >= WAIT_OBJECT_0 && ready < WAIT_OBJECT_0 + nhandles &&
-            readfds) {
+  } else if (ready >= WAIT_OBJECT_0 && ready < WAIT_OBJECT_0 + nhandles) {
     /* Some other event, like SOCKET or something. */
 
     /* Go through all fds even though only one was set. This is to avoid
        starvation of high numbered fds. */
     ready -= WAIT_OBJECT_0;
-    i = 0;
     do {
-      /* Set the handle to fd set */
-      FD_SET((int)handles[ready], readfds);
-      i++;
+      for (i = 0; i < fds_count; i++) {
+       if (!fds[i].events)
+         continue;
+       
+       if (fds[i].fd == (int)handles[ready]) {
+         fds[i].revents |= SILC_TASK_READ;
+         break;
+       }
+      }
 
-      /* Check the status of the next handle and set it's fd to the fd
+      /* Check the status of the next handle and set its fd to the fd
         set if data is available. */
-      while (++ready < n)
+      while (++ready < fds_count)
        if (WaitForSingleObject(handles[ready], 0) == WAIT_OBJECT_0)
          break;
-    } while (ready < n);
+    } while (ready < fds_count);
 
-    return i;
+    return i + 1;
   }
 
   return -1;
@@ -190,7 +195,7 @@ SILC_TASK_CALLBACK(silc_schedule_wakeup_cb)
    It is guaranteed that the scheduler will automatically free any
    registered tasks in this queue. This is system specific routine. */
 
-void *silc_schedule_wakeup_init(void *queue)
+void *silc_schedule_wakeup_init(SilcSchedule schedule)
 {
 #ifdef SILC_THREADS
   SilcWin32Wakeup wakeup;
@@ -203,10 +208,11 @@ void *silc_schedule_wakeup_init(void *queue)
     return NULL;
   }
 
-  wakeup->wakeup_task = silc_task_register(queue, (int)wakeup->wakeup_sema,
-                                          silc_schedule_wakeup_cb, wakeup,
-                                          0, 0, SILC_TASK_FD, 
-                                          SILC_TASK_PRI_NORMAL);
+  wakeup->wakeup_task = 
+    silc_schedule_task_add(schedule, (int)wakeup->wakeup_sema,
+                          silc_schedule_wakeup_cb, wakeup,
+                          0, 0, SILC_TASK_FD, 
+                          SILC_TASK_PRI_NORMAL);
   if (!wakeup->wakeup_task) {
     CloseHandle(wakeup->wakeup_sema);
     silc_free(wakeup);