lwp: Increase EventHandler's stack size from 16 KiB to 64 KiB

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

diff --git a/src/lib/lwp/lwp.c b/src/lib/lwp/lwp.c
index c9ceda4a41c87c53c60eb80a090628b5ffaf96fe..8af0fcc05b4e89e64f1b1dbebc25d668833fcb67 100644 (file)
--- a/src/lib/lwp/lwp.c
+++ b/src/lib/lwp/lwp.c
@@ -1,12 +1,12 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1994-2008, Dave Pare, Jeff Bailey, Thomas Ruschak,
- *                           Ken Stevens, Steve McClure
+ *  Copyright (C) 1994-2013, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *                Ken Stevens, Steve McClure, Markus Armbruster
  *  Copyright (C) 1991-3 Stephen Crane
  *
- *  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,
@@ -15,8 +15,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/>.
  *
  *  ---
  *
@@ -27,9 +26,9 @@
  *  ---
  *
  *  lwp.c: lightweight process creation, destruction and manipulation
- * 
+ *
  *  Known contributors to this file:
- *     Markus Armbruster, 2004-2008
+ *     Markus Armbruster, 2004-2010
  */
 
 #include <config.h>
@@ -98,12 +97,12 @@ lwpReschedule(void)
            } else {
                lwpDestroy(nextp);
            }
-           nextp = 0;
+           nextp = NULL;
        }
        if (nextp)
            break;
     }
-    if (CANT_HAPPEN(LwpCurrent == 0 && nextp == 0))
+    if (CANT_HAPPEN(!nextp))
        abort();
     if (LwpCurrent != nextp) {
        struct lwpProc *oldp = LwpCurrent;
@@ -112,7 +111,7 @@ lwpReschedule(void)
        LwpCurrent = nextp;
        *LwpContextPtr = nextp->ud;
        lwpSwitchContext(oldp, nextp);
-       lwpStatus(nextp, "switch in %d", nextp->pri);
+       lwpStatus(nextp, "switch in");
     }
 }
 
@@ -315,18 +314,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, 65536, flags, "EventHandler", 0,
+                   NULL, NULL);
     lwpInitSelect(sel);
     return LwpCurrent;
 }
@@ -405,3 +405,26 @@ 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);
+}