/*
* Empire - A multi-player, client/server Internet based war game.
- * Copyright (C) 1994-2007, Dave Pare, Jeff Bailey, Thomas Ruschak,
- * Ken Stevens, Steve McClure
+ * Copyright (C) 1994-2018, 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,
* 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: lightweight process creation, destruction and manipulation
- *
+ *
* Known contributors to this file:
- * Markus Armbruster, 2004-2007
+ * Markus Armbruster, 2004-2017
*/
#include <config.h>
#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);
static struct lwpProc *nextp;
static int i;
- if (LwpCurrent && (LwpCurrent->flags & LWP_STACKCHECK)) {
+ if (LwpCurrent->flags & LWP_STACKCHECK) {
lwpStackCheck(LwpCurrent);
}
} 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;
LwpCurrent = nextp;
*LwpContextPtr = nextp->ud;
lwpSwitchContext(oldp, nextp);
- lwpStatus(nextp, "switch in %d", nextp->pri);
+ lwpStatus(nextp, "switch in");
}
}
lwpExit();
}
+static int
+lwpNewStack(struct lwpProc *newp, int stacksz)
+{
+ char *s;
+ int size, redsize;
+
+ /* Make size a multiple of sizeof(long) to keep things aligned */
+ stacksz = (stacksz + sizeof(long) - 1) & -sizeof(long);
+ /* Add a red zone on each side of the stack for LWP_STACKCHECK */
+ redsize = newp->flags & LWP_STACKCHECK ? LWP_REDZONE : 0;
+ size = stacksz + 2 * redsize;
+
+ s = malloc(size);
+ if (!s)
+ return -1;
+
+ newp->sbtm = s;
+ newp->size = size;
+ newp->ustack = s + redsize;
+ newp->usize = stacksz;
+
+ if (newp->flags & LWP_STACKCHECK)
+ lwpStackCheckInit(newp);
+ return 0;
+}
+
/*
* lwpCreate -- create a process.
*/
newp->dead = 0;
newp->runtime = (time_t)-1;
newp->fd = -1;
+ newp->sbtm = NULL;
if (LWP_MAX_PRIO <= priority)
priority = LWP_MAX_PRIO - 1;
if (LwpMaxpri < (newp->pri = priority))
LwpMaxpri = priority;
- if (lwpNewContext(newp, stacksz) < 0) {
+ if (lwpNewStack(newp, stacksz) < 0 || lwpNewContext(newp) < 0) {
+ free(newp->sbtm);
free(newp->name);
free(newp);
return NULL;
}
lwpStatus(newp, "creating process structure %p (sbtm %p)",
newp, newp->sbtm);
- if (flags & LWP_STACKCHECK)
- lwpStackCheckInit(newp);
lwpReady(newp);
lwpReady(LwpCurrent);
lwpReschedule();
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;
}
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);
+}