/*
* Empire - A multi-player, client/server Internet based war game.
- * Copyright (C) 1986-2005, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ * Copyright (C) 1986-2008, Dave Pare, Jeff Bailey, Thomas Ruschak,
* Ken Stevens, Steve McClure
*
* This program is free software; you can redistribute it and/or modify
*
* ---
*
- * See the "LEGAL", "LICENSE", "CREDITS" and "README" files for all the
- * related information and legal notices. It is expected that any future
- * projects/authors will amend these files as needed.
+ * See files README, COPYING and CREDITS in the root of the source
+ * tree for related information and legal notices. It is expected
+ * that future projects/authors will amend these files as needed.
*
* ---
*
*
* Known contributors to this file:
* Sasha Mikheev
+ * Markus Armbruster, 2006-2007
*/
-#include <stdio.h>
-#include "prototypes.h"
+#include <config.h>
+
+#include <signal.h>
+#include <time.h>
#include "empthread.h"
+#include "misc.h"
+
+/* Flags that were passed to empth_init() */
+static int empth_flags;
-#ifdef _EMPTH_LWP
int
empth_init(void **ctx, int flags)
{
- lwpInitSystem(7, (char **)ctx, flags);
+ sigset_t set;
+
+ empth_flags = flags;
+ empth_init_signals();
+ sigemptyset(&set);
+ sigaddset(&set, SIGHUP);
+ sigaddset(&set, SIGINT);
+ sigaddset(&set, SIGTERM);
+ lwpInitSystem(1, ctx, flags, &set);
return 0;
}
empth_t *
-empth_create(int prio, void (*entry)(void *), int size, int flags,
- char *name, char *desc, void *ud)
+empth_create(void (*entry)(void *), int size, int flags,
+ char *name, void *ud)
{
- /* inherit flags */
if (!flags)
- flags = LwpCurrent->flags;
- return lwpCreate(prio, entry, size, flags, name, desc, 0, 0, ud);
+ flags = empth_flags;
+ return lwpCreate(1, entry, size, flags, name, 0, 0, ud);
}
empth_t *
void
empth_exit(void)
{
- time_t now;
-
- /* We want to leave the main thread around forever, until it's time
- for it to die for real (in a shutdown) */
- if (!strcmp(LwpCurrent->name, "Main")) {
- while (1) {
- time(&now);
- lwpSleepUntil(now + 60);
- }
- }
lwpExit();
}
void
empth_yield(void)
{
- /* a hack! */
- lwpReschedule();
+ lwpYield();
}
void
void
empth_wakeup(empth_t *a)
{
- lwpWakeupFd(a);
+ lwpWakeup(a);
}
-void
+int
empth_sleep(time_t until)
{
- lwpSleepUntil(until);
+ return lwpSleepUntil(until);
}
+int
+empth_wait_for_signal(void)
+{
+ sigset_t set;
+ int sig, err;
+ time_t now;
-empth_sem_t *
-empth_sem_create(char *name, int cnt)
+ sigemptyset(&set);
+ sigaddset(&set, SIGHUP);
+ sigaddset(&set, SIGINT);
+ sigaddset(&set, SIGTERM);
+ for (;;) {
+ err = lwpSigWait(&set, &sig);
+ if (CANT_HAPPEN(err)) {
+ time(&now);
+ lwpSleepUntil(now + 60);
+ continue;
+ }
+ return sig;
+ }
+}
+
+empth_rwlock_t *
+empth_rwlock_create(char *name)
+{
+ return lwp_rwlock_create(name);
+}
+
+void
+empth_rwlock_destroy(empth_rwlock_t *rwlock)
{
- return lwpCreateSem(name, cnt);
+ lwp_rwlock_destroy(rwlock);
}
void
-empth_sem_signal(empth_sem_t *sm)
+empth_rwlock_wrlock(empth_rwlock_t *rwlock)
{
- lwpSignal(sm);
+ lwp_rwlock_wrlock(rwlock);
}
void
-empth_sem_wait(empth_sem_t *sm)
+empth_rwlock_rdlock(empth_rwlock_t *rwlock)
{
- lwpWait(sm);
+ lwp_rwlock_rdlock(rwlock);
}
void
-empth_alarm(int sig)
+empth_rwlock_unlock(empth_rwlock_t *rwlock)
{
- /* no way we can be here while using LWP threads */
- panic(sig);
+ lwp_rwlock_unlock(rwlock);
}
-#endif