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, &iop->input_timeout) > 0) {
+ while (empth_select(iop->fd, EMPTH_FD_READ, timeout) > 0) {
ret = read(iop->fd, buf, sizeof(buf));
if (ret <= 0)
break;
}
/*
- * 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;
- if ((iop->flags & IO_READ) == 0) {
- errno = EBADF;
+ if ((iop->flags & IO_READ) == 0)
return -1;
- }
- if (iop->flags & IO_ERROR) {
- errno = EBADF;
+ if (iop->flags & IO_ERROR)
return -1;
- }
if (iop->flags & IO_EOF)
return 0;
- /* Wait for the file to have input. */
- if (waitforinput) {
- res = empth_select(iop->fd, EMPTH_FD_READ, &iop->input_timeout);
+ 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;
}