Recent changes (master)
The following changes since commit f310970e737975088e41ea14c399450ba8ae3a49:
t/aio-ring: cleanup the code a bit (2019-01-05 07:42:30 -0700)
are available in the Git repository at:
git://git.kernel.dk/fio.git master
for you to fetch changes up to 6e70fd303855575c99c520e8c46b7d85c9f21dc8:
io_uring.h should include <linux/fs.h> (2019-01-08 05:43:38 -0700)
----------------------------------------------------------------
Jens Axboe (3):
Rename t/aio-ring to t/io_uring
Rename aioring engine to io_uring
io_uring.h should include <linux/fs.h>
Makefile | 15 +-
arch/arch-x86_64.h | 2 +-
engines/{aioring.c => io_uring.c} | 283 ++++++++++++++------------------------
options.c | 8 +-
os/io_uring.h | 101 ++++++++++++++
t/{aio-ring.c => io_uring.c} | 121 ++++++----------
6 files changed, 254 insertions(+), 276 deletions(-)
rename engines/{aioring.c => io_uring.c} (58%)
create mode 100644 os/io_uring.h
rename t/{aio-ring.c => io_uring.c} (81%)---
Diff of recent changes:
Makefile +6 -9
@@ -68,9 +68,6 @@ endif ifdef CONFIG_LIBAIO SOURCE += engines/libaio.c endif -ifdef CONFIG_LIBAIO - SOURCE += engines/aioring.c -endif ifdef CONFIG_RDMA SOURCE += engines/rdma.c endif
@@ -154,7 +151,7 @@ endif ifeq ($(CONFIG_TARGET_OS), Linux) SOURCE += diskutil.c fifo.c blktrace.c cgroup.c trim.c engines/sg.c \ - oslib/linux-dev-lookup.c + oslib/linux-dev-lookup.c engines/io_uring.c LIBS += -lpthread -ldl LDFLAGS += -rdynamic endif
@@ -266,8 +263,8 @@ T_VS_PROGS = t/fio-verify-state T_PIPE_ASYNC_OBJS = t/read-to-pipe-async.o T_PIPE_ASYNC_PROGS = t/read-to-pipe-async -T_AIO_RING_OBJS = t/aio-ring.o -T_AIO_RING_PROGS = t/aio-ring +T_IOU_RING_OBJS = t/io_uring.o +T_IOU_RING_PROGS = t/io_uring T_MEMLOCK_OBJS = t/memlock.o T_MEMLOCK_PROGS = t/memlock
@@ -287,7 +284,7 @@ T_OBJS += $(T_VS_OBJS) T_OBJS += $(T_PIPE_ASYNC_OBJS) T_OBJS += $(T_MEMLOCK_OBJS) T_OBJS += $(T_TT_OBJS) -T_OBJS += $(T_AIO_RING_OBJS) +T_OBJS += $(T_IOU_RING_OBJS) ifneq (,$(findstring CYGWIN,$(CONFIG_TARGET_OS))) T_DEDUPE_OBJS += os/windows/posix.o lib/hweight.o
@@ -447,8 +444,8 @@ cairo_text_helpers.o: cairo_text_helpers.c cairo_text_helpers.h printing.o: printing.c printing.h $(QUIET_CC)$(CC) $(CFLAGS) $(GTK_CFLAGS) $(CPPFLAGS) -c $< -t/aio-ring: $(T_AIO_RING_OBJS) - $(QUIET_LINK)$(CC) $(LDFLAGS) $(CFLAGS) -o $@ $(T_AIO_RING_OBJS) $(LIBS) +t/io_uring: $(T_IOU_RING_OBJS) + $(QUIET_LINK)$(CC) $(LDFLAGS) $(CFLAGS) -o $@ $(T_IOU_RING_OBJS) $(LIBS) t/read-to-pipe-async: $(T_PIPE_ASYNC_OBJS) $(QUIET_LINK)$(CC) $(LDFLAGS) $(CFLAGS) -o $@ $(T_PIPE_ASYNC_OBJS) $(LIBS)
arch/arch-x86_64.h +1 -1
@@ -44,7 +44,7 @@ static inline unsigned long long get_cpu_clock(void)#define ARCH_HAVE_FFZ #define ARCH_HAVE_SSE4_2 #define ARCH_HAVE_CPU_CLOCK -#define ARCH_HAVE_AIORING +#define ARCH_HAVE_IOURING #define RDRAND_LONG ".byte 0x48,0x0f,0xc7,0xf0"#define RDSEED_LONG ".byte 0x48,0x0f,0xc7,0xf8"
engines/io_uring.c renamed from engines/aioring.c +104 -179
587 lines not on this page · raw message
options.c +3 -5
@@ -1773,13 +1773,11 @@ struct fio_option fio_options[FIO_MAX_OPTS] = { .help = "Linux native asynchronous IO", },#endif -#ifdef CONFIG_LIBAIO -#ifdef ARCH_HAVE_AIORING - { .ival = "aio-ring", - .help = "Linux native asynchronous IO", +#ifdef ARCH_HAVE_IOURING + { .ival = "io_uring", + .help = "Fast Linux native aio", }, #endif -#endif #ifdef CONFIG_POSIXAIO { .ival = "posixaio", .help = "POSIX asynchronous IO",
os/io_uring.h new file +101 -0
101 lines not on this page · raw message
t/io_uring.c renamed from t/aio-ring.c +39 -82
233 lines not on this page · raw message