/*
* Empire - A multi-player, client/server Internet based war game.
- * Copyright (C) 1986-2006, Dave Pare, Jeff Bailey, Thomas Ruschak,
- * Ken Stevens, Steve McClure
+ * Copyright (C) 1986-2020, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ * Ken Stevens, Steve McClure, Markus Armbruster
*
- * This program is free software; you can redistribute it and/or modify
+ * Empire is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*
* ---
*
* ---
*
* lwp.c: Interface from Empire threads to LWP threads
- *
+ *
* Known contributors to this file:
* Sasha Mikheev
+ * Markus Armbruster, 2006-2020
*/
#include <config.h>
#include <signal.h>
#include <time.h>
#include "empthread.h"
+#include "file.h"
+#include "misc.h"
/* Flags that were passed to empth_init() */
static int empth_flags;
-
int
empth_init(void **ctx, int flags)
{
- sigset_t set;
-
+ static int sig[] = { SIGHUP, SIGINT, SIGTERM, 0 };
empth_flags = flags;
empth_init_signals();
- sigemptyset(&set);
- sigaddset(&set, SIGINT);
- sigaddset(&set, SIGTERM);
- lwpInitSystem(PP_MAIN, ctx, flags, &set);
+ lwpInitSystem(1, ctx, flags, sig);
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)
{
if (!flags)
flags = empth_flags;
- return lwpCreate(prio, entry, size, flags, name, desc, 0, 0, ud);
+ ef_make_stale();
+ return lwpCreate(1, entry, size, flags, name, 0, NULL, ud);
}
empth_t *
return LwpCurrent;
}
-void
-empth_exit(void)
+char *
+empth_name(empth_t *thread)
{
- lwpExit();
+ return lwpName(thread);
}
void
-empth_yield(void)
+empth_set_name(empth_t *thread, char *name)
{
- lwpYield();
+ lwpSetName(thread, name);
}
void
-empth_terminate(empth_t *a)
+empth_exit(void)
{
- lwpTerminate(a);
+ ef_make_stale();
+ lwpExit();
}
void
-empth_select(int fd, int flags)
+empth_yield(void)
{
- lwpSleepFd(fd, flags);
+ ef_make_stale();
+ lwpYield();
+}
+
+int
+empth_select(int fd, int flags, struct timeval *timeout)
+{
+ ef_make_stale();
+ return lwpSleepFd(fd, flags, timeout);
}
void
empth_wakeup(empth_t *a)
{
- lwpWakeupFd(a);
+ lwpWakeup(a);
}
-void
+int
empth_sleep(time_t until)
{
- lwpSleepUntil(until);
+ ef_make_stale();
+ return lwpSleepUntil(until);
}
int
-empth_wait_for_shutdown(void)
+empth_wait_for_signal(void)
{
- sigset_t set;
int sig, err;
time_t now;
- sigemptyset(&set);
- sigaddset(&set, SIGINT);
- sigaddset(&set, SIGTERM);
+ ef_make_stale();
for (;;) {
- err = lwpSigWait(&set, &sig);
+ err = lwpSigWait(&sig);
if (CANT_HAPPEN(err)) {
time(&now);
lwpSleepUntil(now + 60);
}
}
-empth_sem_t *
-empth_sem_create(char *name, int cnt)
+empth_rwlock_t *
+empth_rwlock_create(char *name)
+{
+ return lwp_rwlock_create(name);
+}
+
+void
+empth_rwlock_destroy(empth_rwlock_t *rwlock)
+{
+ lwp_rwlock_destroy(rwlock);
+}
+
+void
+empth_rwlock_wrlock(empth_rwlock_t *rwlock)
{
- return lwpCreateSem(name, cnt);
+ ef_make_stale();
+ lwp_rwlock_wrlock(rwlock);
}
void
-empth_sem_signal(empth_sem_t *sm)
+empth_rwlock_rdlock(empth_rwlock_t *rwlock)
{
- lwpSignal(sm);
+ ef_make_stale();
+ lwp_rwlock_rdlock(rwlock);
}
void
-empth_sem_wait(empth_sem_t *sm)
+empth_rwlock_unlock(empth_rwlock_t *rwlock)
{
- lwpWait(sm);
+ lwp_rwlock_unlock(rwlock);
}