/*
* Empire - A multi-player, client/server Internet based war game.
- * Copyright (C) 1986-2009, Dave Pare, Jeff Bailey, Thomas Ruschak,
- * Ken Stevens, Steve McClure
+ * Copyright (C) 1986-2011, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ * Ken Stevens, Steve McClure, Markus Armbruster
*
- * This program is free software; you can redistribute it and/or modify
+ * Empire 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
+ * the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* 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
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*
* ---
*
* io.c: Arrange for input and output on a file descriptor to be queued.
*
* Known contributors to this file:
- * Doug Hay, 1998
- * Steve McClure, 1998
- * Ron Koenderink, 2009
+ * Doug Hay, 1998
+ * Steve McClure, 1998
+ * Markus Armbruster, 2004-2010
+ * Ron Koenderink, 2009
*/
/*
#include <unistd.h>
#include "empio.h"
#include "empthread.h"
+#include "file.h"
#include "ioqueue.h"
#include "misc.h"
#include "queue.h"
struct iovec iov[16];
int n, res, cc;
+ if (wait)
+ ef_make_stale();
+
if (!ioq_qsize(iop->output))
return 0;
if (iop->flags & IO_ERROR)
return -1;
- n = ioq_makeiov(iop->output, iov, IO_BUFSIZE);
-
if (wait) {
res = empth_select(iop->fd, EMPTH_FD_WRITE, NULL);
if (res == 0)
}
}
+ n = ioq_makeiov(iop->output, iov, IO_BUFSIZE);
cc = writev(iop->fd, iov, n);
if (cc < 0) {
if (errno == EAGAIN || errno == EWOULDBLOCK)
if (CANT_HAPPEN(iop->last_out > len))
iop->last_out = 0;
- if (len - iop->last_out < iop->bufsize)
+ if (len - iop->last_out < iop->bufsize) {
+ if (wait)
+ ef_make_stale();
return 0;
+ }
return io_output(iop, wait);
}