Commit 3ffb94e9 authored by Rusty Russell's avatar Rusty Russell

io: add io_fd_block() helper.

It's a common thing to want to do, so add helper here.
Signed-off-by: default avatarRusty Russell <rusty@rustcorp.com.au>
parent e846b1a9
...@@ -60,7 +60,7 @@ static void create_clients(struct sockaddr_un *addr, int waitfd) ...@@ -60,7 +60,7 @@ static void create_clients(struct sockaddr_un *addr, int waitfd)
if (connect(sock[i], (void *)addr, sizeof(*addr)) != 0) if (connect(sock[i], (void *)addr, sizeof(*addr)) != 0)
err(1, "connecting socket"); err(1, "connecting socket");
/* Make nonblocking. */ /* Make nonblocking. */
fcntl(sock[i], F_SETFD, fcntl(sock[i], F_GETFD)|O_NONBLOCK); io_fd_block(sock[i], false);
done[i] = 0; done[i] = 0;
} }
......
...@@ -66,7 +66,7 @@ static void create_clients(struct sockaddr_un *addr, int waitfd) ...@@ -66,7 +66,7 @@ static void create_clients(struct sockaddr_un *addr, int waitfd)
if (connect(sock[i], (void *)addr, sizeof(*addr)) != 0) if (connect(sock[i], (void *)addr, sizeof(*addr)) != 0)
err(1, "connecting socket"); err(1, "connecting socket");
/* Make nonblocking. */ /* Make nonblocking. */
fcntl(sock[i], F_SETFD, fcntl(sock[i], F_GETFD)|O_NONBLOCK); io_fd_block(sock[i], false);
done[i] = 0; done[i] = 0;
} }
......
...@@ -72,16 +72,19 @@ static bool next_plan(struct io_conn *conn, struct io_plan *plan) ...@@ -72,16 +72,19 @@ static bool next_plan(struct io_conn *conn, struct io_plan *plan)
return true; return true;
} }
static void set_blocking(int fd, bool block) bool io_fd_block(int fd, bool block)
{ {
int flags = fcntl(fd, F_GETFL); int flags = fcntl(fd, F_GETFL);
if (flags == -1)
return false;
if (block) if (block)
flags &= ~O_NONBLOCK; flags &= ~O_NONBLOCK;
else else
flags |= O_NONBLOCK; flags |= O_NONBLOCK;
fcntl(fd, F_SETFL, flags); return fcntl(fd, F_SETFL, flags) != -1;
} }
struct io_conn *io_new_conn_(const tal_t *ctx, int fd, struct io_conn *io_new_conn_(const tal_t *ctx, int fd,
...@@ -103,7 +106,7 @@ struct io_conn *io_new_conn_(const tal_t *ctx, int fd, ...@@ -103,7 +106,7 @@ struct io_conn *io_new_conn_(const tal_t *ctx, int fd,
return tal_free(conn); return tal_free(conn);
/* Keep our I/O async. */ /* Keep our I/O async. */
set_blocking(fd, false); io_fd_block(fd, false);
/* We start with out doing nothing, and in doing our init. */ /* We start with out doing nothing, and in doing our init. */
conn->plan[IO_OUT].status = IO_UNSET; conn->plan[IO_OUT].status = IO_UNSET;
...@@ -436,7 +439,7 @@ struct io_plan *io_close_cb(struct io_conn *conn, void *next_arg) ...@@ -436,7 +439,7 @@ struct io_plan *io_close_cb(struct io_conn *conn, void *next_arg)
struct io_plan *io_close_taken_fd(struct io_conn *conn) struct io_plan *io_close_taken_fd(struct io_conn *conn)
{ {
set_blocking(conn->fd.fd, true); io_fd_block(conn->fd.fd, true);
cleanup_conn_without_close(conn); cleanup_conn_without_close(conn);
return io_close(conn); return io_close(conn);
...@@ -507,7 +510,7 @@ bool io_flush_sync(struct io_conn *conn) ...@@ -507,7 +510,7 @@ bool io_flush_sync(struct io_conn *conn)
return true; return true;
/* Synchronous please. */ /* Synchronous please. */
set_blocking(io_conn_fd(conn), true); io_fd_block(io_conn_fd(conn), true);
again: again:
switch (plan->io(conn->fd.fd, &plan->arg)) { switch (plan->io(conn->fd.fd, &plan->arg)) {
...@@ -527,6 +530,6 @@ again: ...@@ -527,6 +530,6 @@ again:
abort(); abort();
} }
set_blocking(io_conn_fd(conn), false); io_fd_block(io_conn_fd(conn), false);
return ok; return ok;
} }
...@@ -692,6 +692,16 @@ int io_conn_fd(const struct io_conn *conn); ...@@ -692,6 +692,16 @@ int io_conn_fd(const struct io_conn *conn);
*/ */
bool io_flush_sync(struct io_conn *conn); bool io_flush_sync(struct io_conn *conn);
/**
* io_fd_block - helper to set an fd blocking/nonblocking.
* @fd: the file descriptor
* @block: true to set blocking, false to set non-blocking.
*
* Generally only fails is @fd isn't a valid file descriptor, otherwise
* returns true.
*/
bool io_fd_block(int fd, bool block);
/** /**
* io_time_override - override the normal call for time. * io_time_override - override the normal call for time.
* @nowfn: the function to call. * @nowfn: the function to call.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment