Recent changes (master)
The following changes since commit 03eabd8a7a53c80a6c9d1376b38a9b7ddce2268a:
Merge branch 'guasi_fixes' of https://github.com/sitsofe/fio into master (2020-09-06 16:14:58 -0600)
are available in the Git repository at:
git://git.kernel.dk/fio.git master
for you to fetch changes up to be23e6be4fadb723f925824f88fbaedbd3502251:
Kill off old GUASI IO engine (2020-09-07 13:38:03 -0600)
----------------------------------------------------------------
Alexey Dobriyan (1):
fio: cap io_size=N% at 100%, update man page
Jens Axboe (1):
Kill off old GUASI IO engine
HOWTO | 8 -- Makefile | 5 -- configure | 22 ----- engines/guasi.c | 270 -------------------------------------------------------- fio.1 | 8 +- io_u.h | 6 -- options.c | 11 ++- parse.h | 5 ++ 8 files changed, 12 insertions(+), 323 deletions(-) delete mode 100644 engines/guasi.c
---
Diff of recent changes:
HOWTO +0 -8
@@ -1901,14 +1901,6 @@ I/O engine single CPU at the desired rate. A job never finishes unless there is at least one non-cpuio job. - **guasi** - The GUASI I/O engine is the Generic Userspace Asynchronous Syscall - Interface approach to async I/O. See - - http://www.xmailserver.org/guasi-lib.html - - for more info on GUASI. - **rdma** The RDMA I/O engine supports both RDMA memory semantics (RDMA_WRITE/RDMA_READ) and channel semantics (Send/Recv) for the
Makefile +0 -5
@@ -106,11 +106,6 @@ endif ifdef CONFIG_LINUX_SPLICE SOURCE += engines/splice.c endif -ifdef CONFIG_GUASI - guasi_SRCS = engines/guasi.c - guasi_LIBS = -lguasi - ENGINES += guasi -endif ifdef CONFIG_SOLARISAIO SOURCE += engines/solarisaio.c endif
configure +0 -22
@@ -1311,25 +1311,6 @@ if compile_prog "" "" "linux splice"; then fi print_config "Linux splice(2)" "$linux_splice" -########################################## -# GUASI probe -if test "$guasi" != "yes" ; then - guasi="no" -fi -cat > $TMPC << EOF -#include <guasi.h> -#include <guasi_syscalls.h> -int main(int argc, char **argv) -{ - guasi_t ctx = guasi_create(0, 0, 0); - return 0; -} -EOF -if compile_prog "" "-lguasi" "guasi"; then - guasi="yes" -fi -print_config "GUASI" "$guasi" - ########################################## # libnuma probe if test "$libnuma" != "yes" ; then
@@ -2847,9 +2828,6 @@ fi if test "$linux_splice" = "yes" ; then output_sym "CONFIG_LINUX_SPLICE" fi -if test "$guasi" = "yes" ; then - output_sym "CONFIG_GUASI" -fi if test "$libnuma_v2" = "yes" ; then output_sym "CONFIG_LIBNUMA" fi
engines/guasi.c deleted +0 -270
270 lines not on this page · raw message
fio.1 +2 -6
@@ -1561,7 +1561,8 @@ if \fBsize\fR is set to 20GiB and \fBio_size\fR is set to 5GiB, fio will perform I/O within the first 20GiB but exit when 5GiB have been done. The opposite is also possible \-\- if \fBsize\fR is set to 20GiB, and \fBio_size\fR is set to 40GiB, then fio will do 40GiB of I/O within -the 0..20GiB region. +the 0..20GiB region. Value can be set as percentage: \fBio_size\fR=N%. +In this case \fBio_size\fR multiplies \fBsize\fR= value. .TP .BI filesize \fR=\fPirange(int) Individual file sizes. May be a range, in which case fio will select sizes
@@ -1674,11 +1675,6 @@ to get desired CPU usage, as the cpuload only loads a single CPU at the desired rate. A job never finishes unless there is at least one non-cpuio job. .TP -.B guasi -The GUASI I/O engine is the Generic Userspace Asynchronous Syscall -Interface approach to async I/O. See \fIhttp://www.xmailserver.org/guasi-lib.html\fR -for more info on GUASI. -.TP .B rdma The RDMA I/O engine supports both RDMA memory semantics (RDMA_WRITE/RDMA_READ) and channel semantics (Send/Recv) for the
io_u.h +0 -6
@@ -11,9 +11,6 @@#ifdef CONFIG_LIBAIO #include <libaio.h> #endif -#ifdef CONFIG_GUASI -#include <guasi.h> -#endif enum {IO_U_F_FREE =1 <<0 ,
@@ -125,9 +122,6 @@ struct io_u {#ifdef FIO_HAVE_SGIO struct sg_io_hdr hdr;#endif -#ifdef CONFIG_GUASI -guasi_req_t greq; -#endif #ifdef CONFIG_SOLARISAIO aio_result_t resultp;#endif
options.c +5 -6
@@ -1481,9 +1481,13 @@ static int str_io_size_cb(void *data, unsigned long long *__val)struct thread_data *td =cb_data_to_td (data);unsigned long long v = *__val; -if (parse_is_percent (v)) { +if (parse_is_percent_uncapped (v)) { td->o.io_size =0 ; td->o.io_size_percent =-1ULL - v; +if (td->o.io_size_percent >100 ) { +log_err ("fio: io_size values greater than 100%% aren't supported\n" ); +return 1 ; + }dprint (FD_PARSE ,"SET io_size_percent %d\n" , td->o.io_size_percent); }else
@@ -1868,11 +1872,6 @@ struct fio_option fio_options[FIO_MAX_OPTS] = { { .ival = "cpuio", .help = "CPU cycle burner engine", }, -#ifdef CONFIG_GUASI - { .ival = "guasi", - .help = "GUASI IO engine", - }, -#endif#ifdef CONFIG_RDMA { .ival = "rdma", .help = "RDMA IO engine",
parse.h +5 -0
@@ -133,6 +133,11 @@ static inline int parse_is_percent(unsigned long long val)return val <=-1ULL && val >= (-1ULL -100ULL ); } +static inline int parse_is_percent_uncapped (unsigned long long val) +{ +return (long long )val <=-1 ; +} +struct print_option {struct flist_head list;char *name;