empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't log out player when update aborts a command with pthreads

Browse source 
pthread.c's empth_select() returned -1 when empth_wakeup() interrupted
select().  The failure then got propagated all the way up, and the
player got logged out.  Fix by returning 0 in that case.  While there,
retry on EINTR, to match LWP.  Also clarify comments.
This commit is contained in:
Markus Armbruster 2009-03-01 11:34:50 +01:00
parent 5073b022fd
commit eea9e76bf8
3 changed files with 21 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

6
include/empthread.h
View file

@ -160,8 +160,8 @@ void empth_yield(void);
* 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.
* Return one when the FD is ready, zero on timeout or early wakeup by
* empth_wakeup(), -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.
*/
@ -169,7 +169,7 @@ int empth_select(int fd, int flags, struct timeval *timeout);
/*
* Awaken THREAD if it is sleeping in empth_select() or empth_sleep().
* Note: This must not awaken threads sleeping in other functions.
* This does not awaken threads sleeping in other functions.
* Does not yield the processor.
*/
void empth_wakeup(empth_t *thread);