#include <stdarg.h>
#include <sys/types.h>
#include <time.h>
-#include <winsock2.h>
-#undef NS_ALL
#include <windows.h>
#include <process.h>
-/* Note: unistd.h(posixio.c) is not thread-safe.
- * It may be used *only* while holding hThreadMutex.
- */
-#include "unistd.h"
#include "misc.h"
#include "empthread.h"
+#include "file.h"
#include "prototypes.h"
#include "server.h"
+#include "sys/socket.h"
#define loc_MIN_THREAD_STACK 16384
* any state:
* nwrite >= 0
* nread >= 0
-
+ *
* if unlocked:
* can_read set
* can_write set
loc_Exit_Handler(DWORD fdwCtrlType)
{
switch (fdwCtrlType) {
- case CTRL_C_EVENT:
- case CTRL_CLOSE_EVENT:
- case CTRL_BREAK_EVENT:
- case CTRL_LOGOFF_EVENT:
- case CTRL_SHUTDOWN_EVENT:
- empth_request_shutdown();
- return TRUE;
- default:
- return FALSE;
+ case CTRL_C_EVENT:
+ case CTRL_CLOSE_EVENT:
+ case CTRL_BREAK_EVENT:
+ case CTRL_LOGOFF_EVENT:
+ case CTRL_SHUTDOWN_EVENT:
+ empth_request_shutdown();
+ return TRUE;
+ default:
+ return FALSE;
}
}
empth_t *pThread = NULL;
loc_debug("creating new thread %s", name);
+ ef_make_stale();
pThread = malloc(sizeof(*pThread));
if (!pThread) {
empth_yield();
return pThread;
- bad:
+bad:
if (pThread) {
loc_FreeThreadInfo(pThread);
}
empth_t *pThread = TlsGetValue(dwTLSIndex);
loc_debug("empth_exit");
+ ef_make_stale();
loc_BlockThisThread();
TlsSetValue(dwTLSIndex, NULL);
void
empth_yield(void)
{
+ ef_make_stale();
loc_BlockThisThread();
Sleep(0);
loc_RunThisThread(NULL);
int
empth_select(int fd, int flags, struct timeval *timeout)
{
- int handle;
+ SOCKET sock;
WSAEVENT hEventObject[2];
long events;
DWORD result, msec;
loc_debug("%s select on %d",
flags == EMPTH_FD_READ ? "read" : "write", fd);
+ ef_make_stale();
loc_BlockThisThread();
hEventObject[0] = WSACreateEvent();
hEventObject[1] = pThread->hThreadEvent;
- handle = posix_fd2socket(fd);
- CANT_HAPPEN(handle < 0);
+ sock = w32_fd2socket(fd);
+ CANT_HAPPEN(sock == (SOCKET)-1);
events = 0;
if (flags & EMPTH_FD_READ)
events |= FD_READ | FD_ACCEPT | FD_CLOSE;
if (flags & EMPTH_FD_WRITE)
events |= FD_WRITE | FD_CLOSE;
- WSAEventSelect(handle, hEventObject[0], events);
+ WSAEventSelect(sock, hEventObject[0], events);
if (timeout)
msec = timeout->tv_sec * 1000L + timeout->tv_usec / 1000L;
result = WSAWaitForMultipleEvents(2, hEventObject, FALSE, msec, FALSE);
switch (result) {
+ case WSA_WAIT_EVENT_0:
+ res = 1;
+ break;
+ case WSA_WAIT_EVENT_0 + 1:
case WSA_WAIT_TIMEOUT:
res = 0;
break;
case WSA_WAIT_FAILED:
- errno = WSAGetLastError();
+ w32_set_winsock_errno();
res = -1;
break;
default:
- res = 1;
+ CANT_REACH();
+ errno = EINVAL;
+ res = -1;
}
- WSAEventSelect(handle, hEventObject[0], 0);
+ WSAEventSelect(sock, hEventObject[0], 0);
WSACloseEvent(hEventObject[0]);
int
empth_sleep(time_t until)
{
- long lSec = until - time(0) > 0 ? until - time(0) : 0;
+ time_t now;
+ long lSec;
empth_t *pThread = TlsGetValue(dwTLSIndex);
- int iReturn = 0;
+ DWORD result;
+
+ ef_make_stale();
+ loc_BlockThisThread();
do {
- loc_BlockThisThread();
+ now = time(NULL);
+ lSec = until >= now ? until - now : 0;
loc_debug("going to sleep %ld sec", lSec);
+ result = WaitForSingleObject(pThread->hThreadEvent, lSec * 1000L);
+ } while (result != WAIT_TIMEOUT && result != WAIT_OBJECT_0);
- if (WaitForSingleObject(pThread->hThreadEvent, lSec * 1000L) !=
- WAIT_TIMEOUT)
- iReturn = -1;
-
- loc_debug("sleep done. Waiting to run.");
- loc_RunThisThread(NULL);
- } while (!iReturn && ((lSec = until - time(0)) > 0));
+ loc_debug("sleep done. Waiting to run.");
+ loc_RunThisThread(NULL);
- return iReturn;
+ return result == WAIT_TIMEOUT ? 0 : -1;
}
/************************
int
empth_wait_for_signal(void)
{
+ ef_make_stale();
loc_BlockThisThread();
loc_RunThisThread(hShutdownEvent);
return SIGTERM;
if ((rwlock->can_read = CreateEvent(NULL, TRUE, TRUE, NULL)) == NULL) {
logerror("rwlock_create: failed to create reader event %s at %s:%d",
- name, __FILE__, __LINE__);
+ name, __FILE__, __LINE__);
free(rwlock->name);
free(rwlock);
return NULL;
if ((rwlock->can_write = CreateEvent(NULL, FALSE, TRUE, NULL)) == NULL) {
logerror("rwlock_create: failed to create writer event %s at %s:%d",
- name, __FILE__, __LINE__);
+ name, __FILE__, __LINE__);
free(rwlock->name);
CloseHandle(rwlock->can_read);
free(rwlock);
void
empth_rwlock_wrlock(empth_rwlock_t *rwlock)
{
+ ef_make_stale();
/* block any new readers */
ResetEvent(rwlock->can_read);
rwlock->nwrite++;
void
empth_rwlock_rdlock(empth_rwlock_t *rwlock)
{
+ ef_make_stale();
loc_BlockThisThread();
loc_RunThisThread(rwlock->can_read);
ResetEvent(rwlock->can_write);
{
if (CANT_HAPPEN(!rwlock->nread && !rwlock->nwrite))
return;
- if (rwlock->nread) { /* holding read lock */
+ if (rwlock->nread) { /* holding read lock */
rwlock->nread--;
if (rwlock->nread == 0)
SetEvent(rwlock->can_write);