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

Add deadline support to io_output(), io_output_if_queue_long()

Browse source 
Replace parameter wait by deadline.  Non-zero wait argument becomes
(time_t)-1 argument, zero wait argument becomes zero deadline
argument.  No functional change, yet.
This commit is contained in:
Markus Armbruster 2012-03-11 09:04:44 +01:00
parent ddbcce12c3
commit 7a3cbf037a
5 changed files with 38 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/lib/subs/pr.c
View file

@ -30,7 +30,7 @@
* Dave Pare, 1986, 1989
* Steve McClure, 1998-2000
* Ron Koenderink, 2005
* Markus Armbruster, 2005-2011
* Markus Armbruster, 2005-2012
*/
/*
@ -223,6 +223,7 @@ pr_player(struct player *pl, int id, char *buf)
char *p;
char *bp;
int len;
time_t deadline;
journal_output(pl, id, buf);
@ -247,8 +248,9 @@ pr_player(struct player *pl, int id, char *buf)
}
if (player == pl) {
while (io_output_if_queue_long(pl->iop,
pl->may_sleep == PLAYER_SLEEP_FREELY) > 0)
deadline = (time_t)(pl->may_sleep == PLAYER_SLEEP_FREELY
? -1 : 0);
while (io_output_if_queue_long(pl->iop, deadline) > 0)
;
}
}
@ -266,6 +268,7 @@ upr_player(struct player *pl, int id, char *buf)
int standout = 0;
char printbuf[2];
char ch;
time_t deadline;
journal_output(pl, id, buf);
@ -305,8 +308,9 @@ upr_player(struct player *pl, int id, char *buf)
}
if (player == pl) {
while (io_output_if_queue_long(pl->iop,
pl->may_sleep == PLAYER_SLEEP_FREELY) > 0)
deadline = (time_t)(pl->may_sleep == PLAYER_SLEEP_FREELY
? -1 : 0);
while (io_output_if_queue_long(pl->iop, deadline) > 0)
;
}
}