/*
* Empire - A multi-player, client/server Internet based war game.
- * Copyright (C) 1986-2008, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ * Copyright (C) 1986-2009, Dave Pare, Jeff Bailey, Thomas Ruschak,
* Ken Stevens, Steve McClure
*
* This program is free software; you can redistribute it and/or modify
* ---
*
* empthread.h: Definitions for Empire threading
- *
+ *
* Known contributors to this file:
* Sasha Mikheev
* Doug Hay, 1998
* Steve McClure, 1998
- * Markus Armbruster, 2005-2007
+ * Markus Armbruster, 2005-2008
+ * Ron Koenderink, 2005-2009
*/
/*
#ifndef EMPTHREAD_H
#define EMPTHREAD_H
+#include <sys/time.h>
#include <time.h>
#ifdef EMPTH_LWP
/*
* Create a new thread.
* ENTRY is the entry point. It will be called with argument UD.
+ * If it returns, the thread terminates as if it called empth_exit().
* Thread stack is at least SIZE bytes.
* FLAGS should be the same as were passed to empth_init(), or zero.
* NAME is the thread's name, it is used for logging and debugging.
*/
void empth_yield(void);
-/*
- * Terminate THREAD.
- * THREAD will not be scheduled again. Instead, it will terminate as
- * if it executed empth_exit(). It is unspecified when exactly that
- * happens.
- * THREAD must not be the current thread.
- * Naive use of this function almost always leads to resource leaks.
- * Terminating a thread that may hold locks is not a good idea.
- */
-void empth_terminate(empth_t *thread);
-
/*
* Put current thread to sleep until file descriptor FD is ready for I/O.
* If FLAGS & EMPTH_FD_READ, wake up if FD is ready for input.
* If FLAGS & EMPTH_FD_WRITE, wake up if FD is ready for output.
* At most one thread may sleep on the same file descriptor.
+ * TIMEOUT, if non-null, limits the sleep time.
+ * Return one when the FD is ready, zero on timeout, -1 on error with
+ * errno set.
* Note: Currently, Empire sleeps only on network I/O, i.e. FD is a
* socket. Implementations should not rely on that.
*/
-void empth_select(int fd, int flags);
+int empth_select(int fd, int flags, struct timeval *timeout);
/*
* Awaken THREAD if it is sleeping in empth_select() or empth_sleep().