Update known contributors comments

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

diff --git a/src/lib/lwp/lwp.c b/src/lib/lwp/lwp.c
index 85a2636d410111240490c553e45b0d34e118bd64..8c97162637f1576c0aee6b4ff4106fc3b46b7623 100644 (file)
--- a/src/lib/lwp/lwp.c
+++ b/src/lib/lwp/lwp.c
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1994-2008, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1994-2009, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                           Ken Stevens, Steve McClure
  *  Copyright (C) 1991-3 Stephen Crane
  *
@@ -27,9 +27,9 @@
  *  ---
  *
  *  lwp.c: lightweight process creation, destruction and manipulation
- * 
+ *
  *  Known contributors to this file:
- *     Markus Armbruster, 2004-2007
+ *     Markus Armbruster, 2004-2009
  */
 
 #include <config.h>
@@ -39,12 +39,12 @@
 #include "lwpint.h"
 #include "prototypes.h"
 
-struct lwpQueue LwpSchedQ[LWP_MAX_PRIO], LwpDeadQ;
+static struct lwpQueue LwpSchedQ[LWP_MAX_PRIO], LwpDeadQ;
 
 struct lwpProc *LwpCurrent = NULL;
-void **LwpContextPtr;
-int LwpMaxpri = 0;             /* maximum priority so far */
-int LwpStackGrowsDown;
+static void **LwpContextPtr;
+static int LwpMaxpri = 0;      /* maximum priority so far */
+static int LwpStackGrowsDown;
 
 static void lwpDestroy(struct lwpProc *proc);
 static void lwpStackCheckInit(struct lwpProc *newp);
@@ -98,12 +98,12 @@ lwpReschedule(void)
            } else {
                lwpDestroy(nextp);
            }
-           nextp = 0;
+           nextp = NULL;
        }
        if (nextp)
            break;
     }
-    if (CANT_HAPPEN(LwpCurrent == 0 && nextp == 0))
+    if (CANT_HAPPEN(!LwpCurrent && !nextp))
        abort();
     if (LwpCurrent != nextp) {
        struct lwpProc *oldp = LwpCurrent;
@@ -112,7 +112,7 @@ lwpReschedule(void)
        LwpCurrent = nextp;
        *LwpContextPtr = nextp->ud;
        lwpSwitchContext(oldp, nextp);
-       lwpStatus(nextp, "switch in %d", nextp->pri);
+       lwpStatus(nextp, "switch in");
     }
 }
 
@@ -315,18 +315,19 @@ lwpInitSystem(int pri, void **ctxptr, int flags, sigset_t *waitset)
        pri = LWP_MAX_PRIO - 1;
     if (LwpMaxpri < pri)
        LwpMaxpri = pri;
-    LwpCurrent->next = 0;
+    LwpCurrent->next = NULL;
     LwpCurrent->sbtm = stack;  /* dummy stack for "main" */
     LwpCurrent->pri = pri;
     LwpCurrent->dead = 0;
     LwpCurrent->flags = flags & ~LWP_STACKCHECK;
     LwpCurrent->name = "Main";
     for (i = LWP_MAX_PRIO, q = LwpSchedQ; i--; q++)
-       q->head = q->tail = 0;
-    LwpDeadQ.head = LwpDeadQ.tail = 0;
+       q->head = q->tail = NULL;
+    LwpDeadQ.head = LwpDeadQ.tail = NULL;
     lwpInitSigWait(waitset);
     /* must be lower in priority than us for this to work right */
-    sel = lwpCreate(0, lwpSelect, 16384, flags, "EventHandler", 0, 0, 0);
+    sel = lwpCreate(0, lwpSelect, 16384, flags, "EventHandler", 0,
+                   NULL, NULL);
     lwpInitSelect(sel);
     return LwpCurrent;
 }
@@ -405,3 +406,27 @@ lwpStackCheckUsed(struct lwpProc *newp)
     lwpStatus(newp, "Thread stack %d used, %d left, %d total",
              used, total - used, total);
 }
+
+/* lwpName
+ *
+ * Return the name of the thread.
+ */
+char *
+lwpName(struct lwpProc *proc)
+{
+    return proc->name;
+}
+
+/* lwpSetName
+ *
+ * Set the name of the thread.
+ */
+void
+lwpSetName(struct lwpProc *proc, char *name)
+{
+    if (proc->name != NULL)
+       free(proc->name);
+
+    proc->name = strdup(name);
+}
+