Error check fcntl() calls
Add a helper to mark an fd as non-blocking, so we can check
and complain in one place.
Signed-off-by: Jens Axboe <axboe@fb.com>
diff --git a/engines/binject.c b/engines/binject.c
index fb19062..0264d0a 100644
--- a/engines/binject.c
+++ b/engines/binject.c
@@ -109,10 +109,9 @@
/*
* don't block for min events == 0
*/
- if (!min) {
- bd->fd_flags[i] = fcntl(bf->fd, F_GETFL);
- fcntl(bf->fd, F_SETFL, bd->fd_flags[i] | O_NONBLOCK);
- }
+ if (!min)
+ fio_set_fd_nonblocking(bf->fd, "binject");
+
bd->pfds[i].fd = bf->fd;
bd->pfds[i].events = POLLIN;
}
diff --git a/engines/sg.c b/engines/sg.c
index 88d9125..fcd9c41 100644
--- a/engines/sg.c
+++ b/engines/sg.c
@@ -77,10 +77,9 @@
/*
* don't block for min events == 0
*/
- if (!min) {
- sd->fd_flags[i] = fcntl(f->fd, F_GETFL);
- fcntl(f->fd, F_SETFL, sd->fd_flags[i] | O_NONBLOCK);
- }
+ if (!min)
+ fio_set_fd_nonblocking(f->fd, "sg");
+
sd->pfds[i].fd = f->fd;
sd->pfds[i].events = POLLIN;
}
diff --git a/fio.h b/fio.h
index 1445913..25f6052 100644
--- a/fio.h
+++ b/fio.h
@@ -441,6 +441,7 @@
extern int ioengine_load(struct thread_data *);
extern int parse_dryrun(void);
extern int fio_running_or_pending_io_threads(void);
+extern void fio_set_fd_nonblocking(int, const char *);
extern uintptr_t page_mask;
extern uintptr_t page_size;
diff --git a/libfio.c b/libfio.c
index 3fde492..5ed8c60 100644
--- a/libfio.c
+++ b/libfio.c
@@ -27,6 +27,7 @@
#include <signal.h>
#include <stdint.h>
#include <locale.h>
+#include <fcntl.h>
#include "fio.h"
#include "smalloc.h"
@@ -233,6 +234,21 @@
return 0;
}
+void fio_set_fd_nonblocking(int fd, const char *who)
+{
+ int flags;
+
+ flags = fcntl(fd, F_GETFL);
+ if (flags < 0)
+ log_err("fio: %s failed to get file flags: %s\n", who, strerror(errno));
+ else {
+ flags |= O_NONBLOCK;
+ flags = fcntl(fd, F_SETFL, flags);
+ if (flags < 0)
+ log_err("fio: %s failed to get file flags: %s\n", who, strerror(errno));
+ }
+}
+
static int endian_check(void)
{
union {
diff --git a/server.c b/server.c
index ab3bece..1c4c494 100644
--- a/server.c
+++ b/server.c
@@ -4,7 +4,6 @@
#include <unistd.h>
#include <limits.h>
#include <errno.h>
-#include <fcntl.h>
#include <sys/poll.h>
#include <sys/types.h>
#include <sys/wait.h>
@@ -843,14 +842,12 @@
struct sockaddr_in6 addr6;
socklen_t len = use_ipv6 ? sizeof(addr6) : sizeof(addr);
struct pollfd pfd;
- int ret = 0, sk, flags, exitval = 0;
+ int ret = 0, sk, exitval = 0;
FLIST_HEAD(conn_list);
dprint(FD_NET, "server enter accept loop\n");
- flags = fcntl(listen_sk, F_GETFL);
- flags |= O_NONBLOCK;
- fcntl(listen_sk, F_SETFL, flags);
+ fio_set_fd_nonblocking(listen_sk, "server");
while (!exit_backend) {
const char *from;