Markus Armbruster
1b4496253d
Player threads may only sleep under certain conditions. In
particular, they must not sleep while a command is being aborted by
the update or shutdown.
io.c should not know about that. Yet io_output_all() does, because it
needs to give up when update or shutdown interrupt it. The function
was introduced in Empire 2, but it didn't give up then. Fixed in
commit a7fa7dee, v4.2.22. The fix dragged unwanted knowledge of
command abortion into io.c.
To clean up this mess, io_output_all() has to go.
First user is io_write(). io_write() automatically flushes the queue.
In wait-mode, it calls io_output_all() when the queue is longer than
the bufsize, to attempt flushing the queue completely. In
no-wait-mode, it calls io_output() every bufsize bytes. Except the
test for that is screwy, so it actually misses some of the flush
conditions.
The automatic flush makes io_write() differ from io_gets(), which is
ugly. It wasn't present in BSD Empire 1.1. Remove it again, dropping
io_write()'s last argument.
Flush the queue in its callers pr_player() and upr_player() instead.
Provide new io_output_if_queue_long() for them. Requires new struct
iop member last_out to keep track of queue growth. pr_player() and
upr_player() call repeatedly until it makes no more progress. This
flushes a bit less eagerly in wait-mode, and a bit more eagerly in
non-wait mode.
Second user is recvclient(). It needs to flush the queue before
potentially sleeping in io_input(). Do that with a simple loop around
io_output(). No functional change there.
63 lines
2.1 KiB
C
63 lines
2.1 KiB
C
/*
|
|
* Empire - A multi-player, client/server Internet based war game.
|
|
* 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
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
*
|
|
* ---
|
|
*
|
|
* See files README, COPYING and CREDITS in the root of the source
|
|
* tree for related information and legal notices. It is expected
|
|
* that future projects/authors will amend these files as needed.
|
|
*
|
|
* ---
|
|
*
|
|
* empio.h: Describes io pointers used in Empire
|
|
*
|
|
* Known contributors to this file:
|
|
*
|
|
*/
|
|
|
|
#ifndef EMPIO_H
|
|
#define EMPIO_H
|
|
#include <sys/time.h>
|
|
|
|
#define IO_READ 0x1
|
|
#define IO_WRITE 0x2
|
|
#define IO_EOF 0x10
|
|
#define IO_ERROR 0x40
|
|
|
|
#define IO_BUFSIZE 4096
|
|
|
|
extern struct iop *io_open(int, int, int, struct timeval);
|
|
extern void io_init(void);
|
|
extern void io_close(struct iop *);
|
|
extern int io_input(struct iop *, int);
|
|
extern int io_inputwaiting(struct iop *);
|
|
extern int io_outputwaiting(struct iop *);
|
|
extern int io_output(struct iop *, int);
|
|
extern int io_output_if_queue_long(struct iop *, int);
|
|
extern int io_peek(struct iop *, char *, int);
|
|
extern int io_read(struct iop *, char *, int);
|
|
extern int io_write(struct iop *, char *, int);
|
|
extern int io_gets(struct iop *, char *, int);
|
|
extern int io_puts(struct iop *, char *);
|
|
extern int io_shutdown(struct iop *, int);
|
|
extern int io_error(struct iop *);
|
|
extern int io_eof(struct iop *);
|
|
extern int io_fileno(struct iop *);
|
|
|
|
#endif
|