* Known contributors to this file:
* Doug Hay, 1998
* Steve McClure, 1998
- * Markus Armbruster, 2004-2010
+ * Markus Armbruster, 2004-2012
* Ron Koenderink, 2009
*/
int flags;
int bufsize;
int last_out;
- struct timeval input_timeout;
};
void
}
struct iop *
-io_open(int fd, int flags, int bufsize, struct timeval timeout)
+io_open(int fd, int flags, int bufsize)
{
int fdfl;
struct iop *iop;
iop->flags = flags;
iop->last_out = 0;
iop->bufsize = bufsize;
- iop->input_timeout = timeout;
if (flags & IO_READ)
iop->input = ioq_create(bufsize);
if (flags & IO_WRITE)
}
void
-io_close(struct iop *iop)
+io_close(struct iop *iop, struct timeval *timeout)
{
-
+ char buf[IO_BUFSIZE];
+ int ret;
+
+ while (io_output(iop, 1) > 0) ;
+ shutdown(iop->fd, SHUT_WR);
+ while (empth_select(iop->fd, EMPTH_FD_READ, timeout) > 0) {
+ ret = read(iop->fd, buf, sizeof(buf));
+ if (ret <= 0)
+ break;
+ }
if (iop->input)
ioq_destroy(iop->input);
if (iop->output)
}
/*
- * Return number of bytes read on success, zero on timeout, early
- * wakeup or EOF, -1 on error, with errno set appropriately. In
- * particular, return -1 with errno set to EAGAIN or EWOULDBLOCK when
- * no data is available for non-blocking input (WAITFORINPUT false).
- * Use io_eof() to distinguish timeout and early wakeup from EOF.
+ * Read input from IOP and enqueue it.
+ * If TIMEOUT is non-null, wait at most that long for input to arrive.
+ * Does not yield the processor when timeout is zero.
+ * A wait for input can be cut short by empth_wakeup().
+ * Return number of bytes read on success, -1 on error.
+ * In particular, return zero on timeout, early wakeup or EOF. Use
+ * io_eof() to distinguish timeout and early wakeup from EOF.
*/
int
-io_input(struct iop *iop, int waitforinput)
+io_input(struct iop *iop, struct timeval *timeout)
{
char buf[IO_BUFSIZE];
int cc;
int res;
- /* Not a read IOP */
- if ((iop->flags & IO_READ) == 0) {
- errno = EBADF;
+ if ((iop->flags & IO_READ) == 0)
return -1;
- }
- /* IOP is markes as in error. */
- if (iop->flags & IO_ERROR) {
- errno = EBADF;
+ if (iop->flags & IO_ERROR)
return -1;
- }
- /* Wait for the file to have input. */
- if (waitforinput) {
- res = empth_select(iop->fd, EMPTH_FD_READ, &iop->input_timeout);
+ if (iop->flags & IO_EOF)
+ return 0;
+
+ if (!timeout || timeout->tv_sec || timeout->tv_usec) {
+ res = empth_select(iop->fd, EMPTH_FD_READ, timeout);
if (res < 0) {
iop->flags |= IO_ERROR;
return -1;
return 0;
}
- /* Do the actual read. */
cc = read(iop->fd, buf, sizeof(buf));
if (cc < 0) {
- if (errno != EAGAIN && errno != EWOULDBLOCK)
- /* Some form of file error occurred... */
- iop->flags |= IO_ERROR;
+ if (errno == EAGAIN || errno == EWOULDBLOCK)
+ return 0;
+ iop->flags |= IO_ERROR;
return -1;
}
-
- /* We eof'd */
if (cc == 0) {
iop->flags |= IO_EOF;
return 0;
}
- /* Append the input to the IOQ. */
ioq_append(iop->input, buf, cc);
return cc;
}
if (wait)
ef_make_stale();
- if (!ioq_qsize(iop->output))
- return 0;
-
if ((iop->flags & IO_WRITE) == 0)
return -1;
if (iop->flags & IO_ERROR)
return -1;
+ if (!ioq_qsize(iop->output))
+ return 0;
+
if (wait) {
res = empth_select(iop->fd, EMPTH_FD_WRITE, NULL);
if (res == 0)
return io_output(iop, wait);
}
-
int
io_peek(struct iop *iop, char *buf, int nbytes)
{
return iop->flags & IO_EOF;
}
+/*
+ * Discard IOP's buffered input and set its EOF flag.
+ * No more input can be read from IOP.
+ */
+void
+io_set_eof(struct iop *iop)
+{
+ ioq_drain(iop->input);
+ iop->flags |= IO_EOF;
+}
+
int
io_fileno(struct iop *iop)
{