X-Git-Url: http://git.silcnet.org/gitweb/?p=silc.git;a=blobdiff_plain;f=lib%2Fsilcutil%2Fwin32%2Fsilcwin32schedule.c;h=f3bf02cc0f894d5ef98083bcd8baf7e8483917b2;hp=6db27fd7e24b6133095188a02bf5509cfca817d3;hb=a818c5b5411bbc4436d1c5f011236985c96bb787;hpb=9bfa4fe340a4ebe5a55c82e6f683864f37f7759d diff --git a/lib/silcutil/win32/silcwin32schedule.c b/lib/silcutil/win32/silcwin32schedule.c index 6db27fd7..f3bf02cc 100644 --- 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. @@ -44,51 +44,65 @@ url=/library/en-us/winui/hh/winui/messques_77zk.asp o http://msdn.microsoft.com/library/default.asp? url=/library/en-us/winsock/hh/winsock/apistart_9g1e.asp + o http://msdn.microsoft.com/library/default.asp? + url=/library/en-us/dnmgmt/html/msdn_getpeek.asp o http://developer.novell.com/support/winsock/doc/toc.htm */ -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) : + timeo = (timeout ? (timeout->tv_sec * 1000) + (timeout->tv_usec / 1000) : INFINITE); /* If we have nothing to wait and timeout is set then register a timeout and wait just for windows messages. */ if (nhandles == 0 && timeout) { UINT timer = SetTimer(NULL, 0, timeo, NULL); - if (timer) { + curtime = GetTickCount(); + while (timer) { WaitMessage(); - KillTimer(NULL, timer); while (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE)) { + if (msg.message == WM_TIMER) { + KillTimer(NULL, timer); + return 0; + } TranslateMessage(&msg); DispatchMessage(&msg); } - return 0; + KillTimer(NULL, timer); + if (timeo != INFINITE) { + timeo -= GetTickCount() - curtime; + if (timeo < 0) + timeo = 0; + } + timer = SetTimer(NULL, 0, timeo, NULL); } } @@ -101,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 */ @@ -130,28 +143,113 @@ 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(handle[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) - if (WaitForSingleObject(handle[ready], 0) == WAIT_OBJECT_0) + 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; } + +#ifdef SILC_THREADS + +/* Internal wakeup context. */ +typedef struct { + HANDLE wakeup_sema; + SilcTask wakeup_task; +} *SilcWin32Wakeup; + +SILC_TASK_CALLBACK(silc_schedule_wakeup_cb) +{ + /* Nothing */ +} + +#endif /* SILC_THREADS */ + +/* Initializes the wakeup of the scheduler. In multi-threaded environment + the scheduler needs to be wakenup when tasks are added or removed from + the task queues. This will initialize the wakeup for the scheduler. + Any tasks that needs to be registered must be registered to the `queue'. + 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(SilcSchedule schedule) +{ +#ifdef SILC_THREADS + SilcWin32Wakeup wakeup; + + wakeup = silc_calloc(1, sizeof(*wakeup)); + + wakeup->wakeup_sema = CreateSemaphore(NULL, 0, 100, NULL); + if (!wakeup->wakeup_sema) { + silc_free(wakeup); + return NULL; + } + + 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); + return NULL; + } + + return (void *)wakeup; +#else + return NULL; +#endif +} + +/* Uninitializes the system specific wakeup. */ + +void silc_schedule_wakeup_uninit(void *context) +{ +#ifdef SILC_THREADS + SilcWin32Wakeup wakeup = (SilcWin32Wakeup)context; + + if (!wakeup) + return; + + CloseHandle(wakeup->wakeup_sema); + silc_free(wakeup); +#endif +} + +/* Wakes up the scheduler */ + +void silc_schedule_wakeup_internal(void *context) +{ +#ifdef SILC_THREADS + SilcWin32Wakeup wakeup = (SilcWin32Wakeup)context; + + if (!wakeup) + return; + + ReleaseSemaphore(wakeup->wakeup_sema, 1, NULL); +#endif +}