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

(io_output_all,update_main,update_wait): Do not block on writing when

Browse source 
aborting commands for an update.  Move update_pending to the start of
the update sequence where the commands are aborted.
This commit is contained in:
Ron Koenderink 2005-08-21 17:17:38 +00:00
parent ef0dbf6790
commit a7fa7dee30
3 changed files with 14 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/server/update.c
View file

@ -120,6 +120,7 @@ update_wait(void *unused)
while (1) {
empth_sem_wait(update_sem);
update_pending = 1;
running = 0;
for (p = player_next(0); p != 0; p = player_next(p)) {
if (p->state != PS_PLAYING)
@ -137,8 +138,10 @@ update_wait(void *unused)
empth_sleep(now + 2);
}
if (*pre_update_hook) {
if (run_hook(pre_update_hook, "pre-update"))
if (run_hook(pre_update_hook, "pre-update")) {
update_pending = 0;
continue;
}
}
/*
* we rely on the fact that update's priority is the highest
@ -147,6 +150,7 @@ update_wait(void *unused)
dp = player_new(0, 0);
if (!dp) {
logerror("can't create dummy player for update");
update_pending = 0;
continue;
}
stacksize = 100000 +