Update copyright notice

[empserver] / src / lib / empthread / lwp.c

diff --git a/src/lib/empthread/lwp.c b/src/lib/empthread/lwp.c
index 9863a4253174adb99ea05ac214cda637b59e8fd4..38b2d383049d77e6f85f550f3168312cbc7604e1 100644 (file)
--- a/src/lib/empthread/lwp.c
+++ b/src/lib/empthread/lwp.c
@@ -1,11 +1,11 @@
 /*
  *  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-2012, 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,
@@ -14,8 +14,7 @@
  *  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/>.
  *
  *  ---
  *
@@ -26,10 +25,10 @@
  *  ---
  *
  *  lwp.c: Interface from Empire threads to LWP threads
- * 
+ *
  *  Known contributors to this file:
  *     Sasha Mikheev
- *     Markus Armbruster, 2006
+ *     Markus Armbruster, 2006-2009
  */
 
 #include <config.h>
@@ -37,6 +36,7 @@
 #include <signal.h>
 #include <time.h>
 #include "empthread.h"
+#include "file.h"
 #include "misc.h"
 
 /* Flags that were passed to empth_init() */
@@ -54,18 +54,19 @@ empth_init(void **ctx, int flags)
     sigaddset(&set, SIGHUP);
     sigaddset(&set, SIGINT);
     sigaddset(&set, SIGTERM);
-    lwpInitSystem(PP_MAIN, ctx, flags, &set);
+    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)
 {
     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 *
@@ -74,40 +75,50 @@ empth_self(void)
     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)
+{
+    ef_make_stale();
+    lwpYield();
+}
+
+int
+empth_select(int fd, int flags, struct timeval *timeout)
 {
-    lwpSleepFd(fd, flags);
+    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
@@ -117,6 +128,7 @@ empth_wait_for_signal(void)
     int sig, err;
     time_t now;
 
+    ef_make_stale();
     sigemptyset(&set);
     sigaddset(&set, SIGHUP);
     sigaddset(&set, SIGINT);
@@ -132,20 +144,34 @@ empth_wait_for_signal(void)
     }
 }
 
-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);
 }