/*
* Empire - A multi-player, client/server Internet based war game.
- * Copyright (C) 1994-2006, 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
*
* ---
*
* lwp.c: lightweight process creation, destruction and manipulation
- *
+ *
* Known contributors to this file:
- * Markus Armbruster, 2004-2006
+ * Markus Armbruster, 2004-2009
*/
#include <config.h>
-#include <stdio.h>
-#include <stdlib.h>
#include <string.h>
#include "lwp.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;
-char **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 void lwpStackCheck(struct lwpProc *newp);
static void lwpStackCheckUsed(struct lwpProc *newp);
lwpStackCheck(LwpCurrent);
}
+ lwpSigWakeup();
+ lwpWakeupSleep();
+
/* destroy dead threads */
lwpStatus(LwpCurrent, "Cleaning dead queue");
while (NULL != (nextp = lwpGetFirst(&LwpDeadQ))) {
} 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;
LwpCurrent = nextp;
*LwpContextPtr = nextp->ud;
lwpSwitchContext(oldp, nextp);
- lwpStatus(nextp, "switch in %d", nextp->pri);
+ lwpStatus(nextp, "switch in");
}
}
void
lwpEntryPoint(void)
{
- *LwpContextPtr = LwpCurrent->ud;
lwpStatus(LwpCurrent, "starting at entry point");
(*LwpCurrent->entry)(LwpCurrent->ud);
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.
*/
struct lwpProc *
-lwpCreate(int priority, void (*entry)(void *), int stacksz, int flags, char *name, char *desc, int argc, char **argv, void *ud)
+lwpCreate(int priority, void (*entry)(void *), int stacksz,
+ int flags, char *name, int argc, char **argv, void *ud)
{
struct lwpProc *newp;
return NULL;
newp->flags = flags;
newp->name = strdup(name);
- newp->desc = strdup(desc);
newp->entry = entry;
newp->argc = argc;
newp->argv = argv;
newp->ud = ud;
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->desc);
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();
return newp;
}
-void
+static void
lwpDestroy(struct lwpProc *proc)
{
if (proc->flags & LWP_STACKCHECK) {
lwpStatus(proc, "destroying sbtm: %p", proc->sbtm);
free(proc->sbtm);
free(proc->name);
- free(proc->desc);
free(proc);
}
p->ud = ud;
}
-/*
- * set name & desc
- */
-void
-lwpSetDesc(struct lwpProc *p, char *name, char *desc)
-{
- if (!p)
- p = LwpCurrent;
- free(p->name);
- free(p->desc);
- p->name = strdup(name);
- p->desc = strdup(desc);
-}
-
/*
* lwpYield -- yield the processor to another thread.
*/
{
lwpStatus(p, "terminating process");
p->dead = 1;
- if (p->fd >= 0)
- lwpWakeupFd(p);
+ lwpWakeup(p);
}
/*
* initialise the coroutine structures
*/
struct lwpProc *
-lwpInitSystem(int pri, char **ctxptr, int flags)
+lwpInitSystem(int pri, void **ctxptr, int flags, sigset_t *waitset)
{
struct lwpQueue *q;
int i, *stack, marker;
LwpContextPtr = ctxptr;
if (pri < 1)
pri = 1;
- /* *LwpContextPtr = 0; */
LwpStackGrowsDown = growsdown(&marker);
if (!(LwpCurrent = calloc(1, sizeof(struct lwpProc))))
return NULL;
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",
- "Select (main loop) Event Handler", 0, 0, 0);
+ sel = lwpCreate(0, lwpSelect, 16384, 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);
+}
+
projects / empserver / blobdiff