/*
* Empire - A multi-player, client/server Internet based war game.
- * Copyright (C) 1986-2007, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ * Copyright (C) 1986-2009, Dave Pare, Jeff Bailey, Thomas Ruschak,
* Ken Stevens, Steve McClure
*
* This program is free software; you can redistribute it and/or modify
* ---
*
* pthread.c: Interface from Empire threads to POSIX threads
- *
+ *
* Known contributors to this file:
* Sasha Mikheev
* Steve McClure, 1998
- * Markus Armbruster, 2005-2007
- * Ron Koenderink, 2007
+ * Markus Armbruster, 2005-2009
+ * Ron Koenderink, 2007-2009
*/
/* Required for PTHREAD_STACK_MIN on some systems, e.g. Solaris: */
#include <stdlib.h>
#include <string.h>
#include <sys/types.h>
-#if !defined(_WIN32)
#include <sys/time.h>
#include <unistd.h>
-#endif
-
#include "misc.h"
#include "empthread.h"
#include "prototypes.h"
-#define EMPTH_KILLED 1
-
struct empth_t {
char *name; /* thread name */
void *ud; /* user data */
- int state; /* my state */
+ int wakeup;
void (*ep)(void *); /* entry point */
pthread_t id; /* thread id */
};
-struct empth_sem_t {
- pthread_mutex_t mtx_update; /* use it to update count */
- int count;
- char name[80];
- pthread_mutex_t mtx_sem;
- pthread_cond_t cnd_sem;
-};
-
struct empth_rwlock_t {
char *name;
pthread_rwlock_t lock;
ctx->ep = 0;
ctx->ud = 0;
ctx->id = pthread_self();
- ctx->state = 0;
+ ctx->wakeup = 0;
pthread_setspecific(ctx_key, ctx);
pthread_mutex_lock(&mtx_ctxsw);
logerror("pthreads initialized");
}
-/*
- * prio can be used for setting scheeduling policy but...
- * it seems to be optional in POSIX threads and Solaris
- * for example just ignores it.
- * More then that priority is not needed even in lwp threads.
- */
empth_t *
-empth_create(int prio, void (*entry)(void *), int size, int flags,
+empth_create(void (*entry)(void *), int size, int flags,
char *name, void *ud)
{
pthread_t t;
}
ctx->name = strdup(name);
ctx->ud = ud;
- ctx->state = 0;
+ ctx->wakeup = 0;
ctx->ep = entry;
eno = pthread_attr_init(&attr);
ctx_ptr = pthread_getspecific(ctx_key);
*udata = ctx_ptr->ud;
- if (ctx_ptr->state == EMPTH_KILLED) {
- empth_status("i am dead");
- empth_exit();
- }
+ ctx_ptr->wakeup = 0;
empth_status("context restored");
}
return pthread_getspecific(ctx_key);
}
+char *
+empth_name(empth_t *thread)
+{
+ return thread->name;
+}
+
+void
+empth_set_name(empth_t *thread, char *name)
+{
+ if (thread->name)
+ free(thread->name);
+ thread->name = strdup(name);
+}
+
void
empth_exit(void)
{
empth_restorectx();
}
-void
-empth_terminate(empth_t *a)
-{
- empth_status("killing thread %s", a->name);
- a->state = EMPTH_KILLED;
- pthread_kill(a->id, SIGALRM);
-}
-
-void
-empth_select(int fd, int flags)
+int
+empth_select(int fd, int flags, struct timeval *timeout)
{
-
fd_set readmask;
fd_set writemask;
struct timeval tv;
int n;
+ empth_t *ctx;
+ int res = 0;
pthread_mutex_unlock(&mtx_ctxsw);
- empth_status("%s select on %d",
- flags == EMPTH_FD_READ ? "read" : "write", fd);
- while (1) {
- tv.tv_sec = 1000000;
- tv.tv_usec = 0;
-
- FD_ZERO(&readmask);
- FD_ZERO(&writemask);
-
- switch (flags) {
- case EMPTH_FD_READ:
- FD_SET(fd, &readmask);
- break;
- case EMPTH_FD_WRITE:
- FD_SET(fd, &writemask);
- break;
- default:
- logerror("bad flag %d passed to empth_select", flags);
- empth_exit();
- }
-
- n = select(fd + 1, &readmask, &writemask, (fd_set *) 0, &tv);
-
- if (n < 0) {
- if (errno == EINTR) {
- /* go handle the signal */
- empth_status("select broken by signal");
- goto done;
- return;
- }
- /* strange but we dont get EINTR on select broken by signal */
+ empth_status("select on %d for %d", fd, flags);
+
+again:
+ FD_ZERO(&readmask);
+ FD_ZERO(&writemask);
+ if (flags & EMPTH_FD_READ)
+ FD_SET(fd, &readmask);
+ if (flags & EMPTH_FD_WRITE)
+ FD_SET(fd, &writemask);
+
+ if (timeout)
+ tv = *timeout;
+ n = select(fd + 1, &readmask, &writemask, NULL, timeout ? &tv : NULL);
+ if (n < 0) {
+ ctx = pthread_getspecific(ctx_key);
+ if (ctx->wakeup) {
+ empth_status("select woken up");
+ res = 0;
+ } else if (errno == EINTR) {
+ empth_status("select broken by signal");
+ goto again;
+ } else {
empth_status("select failed (%s)", strerror(errno));
- goto done;
- return;
- }
-
- if (flags == EMPTH_FD_READ && FD_ISSET(fd, &readmask)) {
- empth_status("input ready");
- break;
- }
- if (flags == EMPTH_FD_WRITE && FD_ISSET(fd, &writemask)) {
- empth_status("output ready");
- break;
+ res = -1;
}
+ } else if (n == 0) {
+ empth_status("select timed out");
+ res = 0;
+ } else if (flags == EMPTH_FD_READ && FD_ISSET(fd, &readmask)) {
+ empth_status("input ready");
+ res = 1;
+ } else if (flags == EMPTH_FD_WRITE && FD_ISSET(fd, &writemask)) {
+ empth_status("output ready");
+ res = 1;
}
- done:
pthread_mutex_lock(&mtx_ctxsw);
empth_restorectx();
+ return res;
}
static void
* Nothing to do --- we handle this signal just to let
* empth_wakeup() interrupt system calls.
*/
- empth_status("got alarm signal");
}
void
empth_wakeup(empth_t *a)
{
empth_status("waking up thread %s", a->name);
+ a->wakeup = 1;
pthread_kill(a->id, SIGALRM);
}
-void
+int
empth_sleep(time_t until)
{
+ empth_t *ctx = pthread_getspecific(ctx_key);
struct timeval tv;
+ int res;
empth_status("going to sleep %ld sec", until - time(0));
pthread_mutex_unlock(&mtx_ctxsw);
- tv.tv_sec = until - time(NULL);
- tv.tv_usec = 0;
do {
- select(0, NULL, NULL, NULL, &tv);
- } while ((tv.tv_sec = until - time(NULL)) > 0);
+ tv.tv_sec = until - time(NULL);
+ tv.tv_usec = 0;
+ res = select(0, NULL, NULL, NULL, &tv);
+ } while (res < 0 && !ctx->wakeup);
empth_status("sleep done. Waiting for lock");
pthread_mutex_lock(&mtx_ctxsw);
empth_restorectx();
+ return res;
}
int
}
}
-empth_sem_t *
-empth_sem_create(char *name, int cnt)
-{
- empth_sem_t *sm;
-
- sm = malloc(sizeof(empth_sem_t));
- if (!sm) {
- logerror("out of memory at %s:%d", __FILE__, __LINE__);
- return NULL;
- }
- strncpy(sm->name, name, sizeof(sm->name) - 1);
- sm->count = cnt;
- pthread_mutex_init(&sm->mtx_update, NULL);
- pthread_mutex_init(&sm->mtx_sem, NULL);
- pthread_cond_init(&sm->cnd_sem, NULL);
- return sm;
-}
-
-void
-empth_sem_signal(empth_sem_t *sm)
-{
- empth_status("signal on semaphore %s:%d", sm->name, sm->count);
- pthread_mutex_lock(&sm->mtx_update);
- if (sm->count++ < 0) {
- pthread_mutex_unlock(&sm->mtx_update);
- pthread_mutex_lock(&sm->mtx_sem);
- pthread_cond_signal(&sm->cnd_sem);
- pthread_mutex_unlock(&sm->mtx_sem);
- } else
- pthread_mutex_unlock(&sm->mtx_update);
-}
-
-void
-empth_sem_wait(empth_sem_t *sm)
-{
- empth_status("wait on semaphore %s:%d", sm->name, sm->count);
- pthread_mutex_lock(&sm->mtx_update);
- if (--sm->count < 0) {
- pthread_mutex_unlock(&sm->mtx_update);
- empth_status("blocking");
- pthread_mutex_unlock(&mtx_ctxsw);
- pthread_mutex_lock(&sm->mtx_sem);
- pthread_cond_wait(&sm->cnd_sem, &sm->mtx_sem);
- empth_status("waking up");
- pthread_mutex_unlock(&sm->mtx_sem);
- pthread_mutex_lock(&mtx_ctxsw);
- empth_restorectx();
- } else
- pthread_mutex_unlock(&sm->mtx_update);
-}
-
empth_rwlock_t *
empth_rwlock_create(char *name)
{
projects / empserver / blobdiff