X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=configure;h=6d672fe5ebda76596c332d0e9afbb0399f462593;hb=d05db492c6bc4263fba1088b33850bda35dc325b;hp=2671c325ce5db04c0824d3c43fae9d62916230c0;hpb=52a552e21ae25eb175f686935fe85a2956f949ce;p=fio.git diff --git a/configure b/configure index 2671c325..6d672fe5 100755 --- a/configure +++ b/configure @@ -44,7 +44,7 @@ print_config() { } # Default CFLAGS -CFLAGS="-D_GNU_SOURCE -include config-host.h" +CFLAGS="-D_GNU_SOURCE -include config-host.h $CFLAGS" BUILD_CFLAGS="" # Print a helpful header at the top of config.log @@ -133,6 +133,23 @@ output_sym() { echo "#define $1" >> $config_host_h } +check_min_lib_version() { + _feature=$3 + + if "${cross_prefix}"pkg-config --atleast-version="$2" "$1" > /dev/null 2>&1; then + return 0 + fi + : "${_feature:=${1}}" + if "${cross_prefix}"pkg-config --version > /dev/null 2>&1; then + if eval "echo \$$_feature" = "yes" ; then + feature_not_found "$_feature" "$1 >= $2" + fi + else + print_config "$1" "missing pkg-config, can't check $_feature version" + fi + return 1 +} + targetos="" cpu="" @@ -144,6 +161,7 @@ libhdfs="no" pmemblk="no" devdax="no" pmem="no" +cuda="no" disable_lex="" disable_pmem="no" disable_native="no" @@ -151,6 +169,8 @@ march_set="no" libiscsi="no" libnbd="no" libaio_uring="no" +libzbc="" +dynamic_engines="no" prefix=/usr/local # parse options @@ -201,7 +221,7 @@ for opt do ;; --disable-pmem) disable_pmem="yes" ;; - --enable-cuda) enable_cuda="yes" + --enable-cuda) cuda="yes" ;; --disable-native) disable_native="yes" ;; @@ -211,10 +231,14 @@ for opt do ;; --enable-libnbd) libnbd="yes" ;; + --disable-libzbc) libzbc="no" + ;; --disable-tcmalloc) disable_tcmalloc="yes" ;; --enable-libaio-uring) libaio_uring="yes" ;; + --dynamic-libengines) dynamic_engines="yes" + ;; --help) show_help="yes" ;; @@ -252,8 +276,10 @@ if test "$show_help" = "yes" ; then echo "--with-ime= Install path for DDN's Infinite Memory Engine" echo "--enable-libiscsi Enable iscsi support" echo "--enable-libnbd Enable libnbd (NBD engine) support" + echo "--disable-libzbc Disable libzbc even if found" echo "--disable-tcmalloc Disable tcmalloc support" echo "--enable-libaio-uring Enable libaio emulated over io_uring" + echo "--dynamic-libengines Lib-based ioengines as dynamic libraries" exit $exit_val fi @@ -381,15 +407,11 @@ CYGWIN*) # We now take the regular configuration path without having exit 0 here. # Flags below are still necessary mostly for MinGW. build_static="yes" - socklen_t="yes" rusage_thread="yes" fdatasync="yes" clock_gettime="yes" # clock_monotonic probe has dependency on this clock_monotonic="yes" - gettimeofday="yes" sched_idle="yes" - tcp_nodelay="yes" - ipv6="yes" ;; esac @@ -550,6 +572,25 @@ else fi print_config "Static build" "$build_static" +########################################## +# check for C11 atomics support +cat > $TMPC < +int main(void) +{ + _Atomic unsigned v; + atomic_load(&v); + return 0; +} +EOF +if ! compile_prog "" "" "C11 atomics"; then + echo + echo "Your compiler doesn't support C11 atomics. gcc 4.9/clang 3.6 are the" + echo "minimum versions with it - perhaps your compiler is too old?" + fatal "C11 atomics support not found" +fi + + ########################################## # check for wordsize wordsize="0" @@ -607,13 +648,16 @@ int main(void) return 0; } EOF - if test "$libaio_uring" = "yes" && compile_prog "" "-luring" "libaio io_uring" ; then - libaio=yes - LIBS="-luring $LIBS" + if test "$libaio_uring" = "yes"; then + if compile_prog "" "-luring" "libaio io_uring" ; then + libaio=yes + LIBS="-luring $LIBS" + else + feature_not_found "libaio io_uring" "" + fi elif compile_prog "" "-laio" "libaio" ; then libaio=yes libaio_uring=no - LIBS="-laio $LIBS" else if test "$libaio" = "yes" ; then feature_not_found "linux AIO" "libaio-dev or libaio-devel" @@ -621,8 +665,25 @@ EOF libaio=no libaio_uring=no fi + + cat > $TMPC < +#include +int main(void) +{ + io_prep_preadv2(NULL, 0, NULL, 0, 0, 0); + io_prep_pwritev2(NULL, 0, NULL, 0, 0, 0); + return 0; +} +EOF + if compile_prog "" "" "libaio rw flags" ; then + libaio_rw_flags=yes + else + libaio_rw_flags=no + fi fi print_config "Linux AIO support" "$libaio" +print_config "Linux AIO support rw flags" "$libaio_rw_flags" print_config "Linux AIO over io_uring" "$libaio_uring" ########################################## @@ -726,6 +787,27 @@ elif compile_prog "" "$LIBS -lpthread" "pthread_condattr_setclock" ; then fi print_config "pthread_condattr_setclock()" "$pthread_condattr_setclock" +########################################## +# pthread_sigmask() probe +if test "$pthread_sigmask" != "yes" ; then + pthread_sigmask="no" +fi +cat > $TMPC < /* NULL */ +#include /* pthread_sigmask() */ +int main(void) +{ + return pthread_sigmask(0, NULL, NULL); +} +EOF +if compile_prog "" "$LIBS" "pthread_sigmask" ; then + pthread_sigmask=yes +elif compile_prog "" "$LIBS -lpthread" "pthread_sigmask" ; then + pthread_sigmask=yes + LIBS="$LIBS -lpthread" +fi +print_config "pthread_sigmask()" "$pthread_sigmask" + ########################################## # solaris aio probe if test "$solaris_aio" != "yes" ; then @@ -820,12 +902,11 @@ cat > $TMPC << EOF int main(int argc, char **argv) { struct ibv_pd *pd = ibv_alloc_pd(NULL); - return 0; + return pd != NULL; } EOF if test "$disable_rdma" != "yes" && compile_prog "" "-libverbs" "libverbs" ; then libverbs="yes" - LIBS="-libverbs $LIBS" fi print_config "libverbs" "$libverbs" @@ -845,7 +926,6 @@ int main(int argc, char **argv) EOF if test "$disable_rdma" != "yes" && compile_prog "" "-lrdmacm" "rdma"; then rdmacm="yes" - LIBS="-lrdmacm $LIBS" fi print_config "rdmacm" "$rdmacm" @@ -875,7 +955,8 @@ cat > $TMPC << EOF int main(int argc, char **argv) { - return vasprintf(NULL, "%s", NULL) == 0; + va_list ap; + return vasprintf(NULL, "%s", ap) == 0; } EOF if compile_prog "" "" "have_vasprintf"; then @@ -1353,7 +1434,7 @@ cat > $TMPC << EOF #include int main(int argc, char **argv) { - int c = getopt_long_only(argc, argv, NULL, NULL, NULL); + int c = getopt_long_only(argc, argv, "", NULL, NULL); return c; } EOF @@ -1368,8 +1449,12 @@ if test "$inet_aton" != "yes" ; then inet_aton="no" fi cat > $TMPC << EOF +#ifdef _WIN32 +#include +#else #include #include +#endif #include int main(int argc, char **argv) { @@ -1388,7 +1473,12 @@ if test "$socklen_t" != "yes" ; then socklen_t="no" fi cat > $TMPC << EOF +#ifdef _WIN32 +#include +#include +#else #include +#endif int main(int argc, char **argv) { socklen_t len = 0; @@ -1448,18 +1538,17 @@ if test "$?" != "0" ; then echo "configure: gtk and gthread not found" exit 1 fi -if ! ${cross_prefix}pkg-config --atleast-version 2.18.0 gtk+-2.0; then - echo "GTK found, but need version 2.18 or higher" - gfio="no" -else +gfio="yes" +if check_min_lib_version gtk+-2.0 2.18.0 "gfio"; then if compile_prog "$GTK_CFLAGS" "$GTK_LIBS" "gfio" ; then - gfio="yes" GFIO_LIBS="$LIBS $GTK_LIBS" CFLAGS="$CFLAGS $GTK_CFLAGS" else echo "Please install gtk and gdk libraries" gfio="no" fi +else + gfio="no" fi LDFLAGS=$ORG_LDFLAGS fi @@ -1512,10 +1601,14 @@ if test "$tcp_nodelay" != "yes" ; then tcp_nodelay="no" fi cat > $TMPC << EOF +#ifdef _WIN32 +#include +#else #include #include #include #include +#endif int main(int argc, char **argv) { return getsockopt(0, 0, TCP_NODELAY, NULL, NULL); @@ -1523,6 +1616,9 @@ int main(int argc, char **argv) EOF if compile_prog "" "" "TCP_NODELAY"; then tcp_nodelay="yes" +elif compile_prog "" "-lws2_32" "TCP_NODELAY"; then + tcp_nodelay="yes" + LIBS="$LIBS -lws2_32" fi print_config "TCP_NODELAY" "$tcp_nodelay" @@ -1532,10 +1628,14 @@ if test "$window_size" != "yes" ; then window_size="no" fi cat > $TMPC << EOF +#ifdef _WIN32 +#include +#else #include #include #include #include +#endif int main(int argc, char **argv) { setsockopt(0, SOL_SOCKET, SO_SNDBUF, NULL, 0); @@ -1544,6 +1644,9 @@ int main(int argc, char **argv) EOF if compile_prog "" "" "SO_SNDBUF"; then window_size="yes" +elif compile_prog "" "-lws2_32" "SO_SNDBUF"; then + window_size="yes" + LIBS="$LIBS -lws2_32" fi print_config "Net engine window_size" "$window_size" @@ -1553,12 +1656,16 @@ if test "$mss" != "yes" ; then mss="no" fi cat > $TMPC << EOF +#ifdef _WIN32 +#include +#else #include #include #include #include #include #include +#endif int main(int argc, char **argv) { return setsockopt(0, IPPROTO_TCP, TCP_MAXSEG, NULL, 0); @@ -1566,6 +1673,9 @@ int main(int argc, char **argv) EOF if compile_prog "" "" "TCP_MAXSEG"; then mss="yes" +elif compile_prog "" "-lws2_32" "TCP_MAXSEG"; then + mss="yes" + LIBS="$LIBS -lws2_32" fi print_config "TCP_MAXSEG" "$mss" @@ -1630,10 +1740,15 @@ if test "$ipv6" != "yes" ; then ipv6="no" fi cat > $TMPC << EOF +#ifdef _WIN32 +#include +#include +#else #include #include #include #include +#endif #include int main(int argc, char **argv) { @@ -1700,10 +1815,8 @@ if test "$disable_http" != "yes"; then if compile_prog "" "$HTTP_LIBS" "curl-new-ssl"; then output_sym "CONFIG_HAVE_OPAQUE_HMAC_CTX" http="yes" - LIBS="$HTTP_LIBS $LIBS" elif mv $TMPC2 $TMPC && compile_prog "" "$HTTP_LIBS" "curl-old-ssl"; then http="yes" - LIBS="$HTTP_LIBS $LIBS" fi fi print_config "http engine" "$http" @@ -1732,7 +1845,6 @@ int main(int argc, char **argv) } EOF if test "$disable_rados" != "yes" && compile_prog "" "-lrados" "rados"; then - LIBS="-lrados $LIBS" rados="yes" fi print_config "Rados engine" "$rados" @@ -1763,7 +1875,6 @@ int main(int argc, char **argv) } EOF if test "$disable_rbd" != "yes" && compile_prog "" "-lrbd -lrados" "rbd"; then - LIBS="-lrbd -lrados $LIBS" rbd="yes" fi print_config "Rados Block Device engine" "$rbd" @@ -1854,7 +1965,6 @@ int main(int argc, char **argv) } EOF if test "$disable_gfapi" != "yes" && compile_prog "" "-lgfapi -lglusterfs" "gfapi"; then - LIBS="-lgfapi -lglusterfs $LIBS" gfapi="yes" fi print_config "Gluster API engine" "$gfapi" @@ -1968,7 +2078,7 @@ if test "$libhdfs" = "yes" ; then hdfs_conf_error=1 fi if test "$hdfs_conf_error" = "1" ; then - exit 1 + feature_not_found "libhdfs" "" fi FIO_HDFS_CPU=$cpu if test "$FIO_HDFS_CPU" = "x86_64" ; then @@ -2007,19 +2117,40 @@ if test "$libpmem" != "yes" ; then fi cat > $TMPC << EOF #include +#include int main(int argc, char **argv) { int rc; - rc = pmem_is_pmem(0, 0); + rc = pmem_is_pmem(NULL, NULL); return 0; } EOF if compile_prog "" "-lpmem" "libpmem"; then libpmem="yes" - LIBS="-lpmem $LIBS" fi print_config "libpmem" "$libpmem" +########################################## +# Check whether libpmem's version >= 1.5 +if test "$libpmem1_5" != "yes" ; then + libpmem1_5="no" +fi +if test "$libpmem" = "yes"; then + cat > $TMPC << EOF +#include +#include +int main(int argc, char **argv) +{ + pmem_memcpy(NULL, NULL, NULL, NULL); + return 0; +} +EOF + if compile_prog "" "-lpmem" "libpmem1_5"; then + libpmem1_5="yes" + fi +fi +print_config "libpmem1_5" "$libpmem1_5" + ########################################## # Check whether we have libpmemblk # libpmem is a prerequisite @@ -2038,15 +2169,16 @@ int main(int argc, char **argv) EOF if compile_prog "" "-lpmemblk" "libpmemblk"; then libpmemblk="yes" - LIBS="-lpmemblk $LIBS" fi fi print_config "libpmemblk" "$libpmemblk" -# Choose the ioengines +# Choose libpmem-based ioengines if test "$libpmem" = "yes" && test "$disable_pmem" = "no"; then - pmem="yes" devdax="yes" + if test "$libpmem1_5" = "yes"; then + pmem="yes" + fi if test "$libpmemblk" = "yes"; then pmemblk="yes" fi @@ -2088,33 +2220,26 @@ fi print_config "DDN's Infinite Memory Engine" "$libime" ########################################## -# Check if we have required environment variables configured for libiscsi -if test "$libiscsi" = "yes" ; then - if $(pkg-config --atleast-version=1.9.0 libiscsi); then +# Check if we have libiscsi +if test "$libiscsi" != "no" ; then + if check_min_lib_version libiscsi 1.9.0; then libiscsi="yes" libiscsi_cflags=$(pkg-config --cflags libiscsi) libiscsi_libs=$(pkg-config --libs libiscsi) else - if test "$libiscsi" = "yes" ; then - echo "libiscsi" "Install libiscsi >= 1.9.0" - fi libiscsi="no" fi fi print_config "iscsi engine" "$libiscsi" ########################################## -# Check if we have libnbd (for NBD support). -minimum_libnbd=0.9.8 -if test "$libnbd" = "yes" ; then - if $(pkg-config --atleast-version=$minimum_libnbd libnbd); then +# Check if we have libnbd (for NBD support) +if test "$libnbd" != "no" ; then + if check_min_lib_version libnbd 0.9.8; then libnbd="yes" libnbd_cflags=$(pkg-config --cflags libnbd) libnbd_libs=$(pkg-config --libs libnbd) else - if test "$libnbd" = "yes" ; then - echo "libnbd" "Install libnbd >= $minimum_libnbd" - fi libnbd="no" fi fi @@ -2327,6 +2452,7 @@ if compile_prog "" "" "valgrind_dev"; then fi print_config "Valgrind headers" "$valgrind_dev" +if test "$targetos" = "Linux" ; then ########################################## # probe if test "$linux_blkzoned" != "yes" ; then @@ -2344,6 +2470,50 @@ if compile_prog "" "" "linux_blkzoned"; then fi print_config "Zoned block device support" "$linux_blkzoned" +########################################## +# Check BLK_ZONE_REP_CAPACITY +cat > $TMPC << EOF +#include +int main(void) +{ + return BLK_ZONE_REP_CAPACITY; +} +EOF +if compile_prog "" "" "blkzoned report capacity"; then + output_sym "CONFIG_HAVE_REP_CAPACITY" + rep_capacity="yes" +else + rep_capacity="no" +fi +print_config "Zoned block device capacity" "$rep_capacity" +fi + +########################################## +# libzbc probe +cat > $TMPC << EOF +#include +int main(int argc, char **argv) +{ + struct zbc_device *dev = NULL; + + return zbc_open("foo=bar", O_RDONLY, &dev); +} +EOF +if test "$libzbc" != "no" ; then + if compile_prog "" "-lzbc" "libzbc"; then + libzbc="yes" + if ! check_min_lib_version libzbc 5; then + libzbc="no" + fi + else + if test "$libzbc" = "yes" ; then + feature_not_found "libzbc" "libzbc or libzbc/zbc.h" + fi + libzbc="no" + fi +fi +print_config "libzbc engine" "$libzbc" + ########################################## # check march=armv8-a+crc+crypto if test "$march_armv8_a_crc_crypto" != "yes" ; then @@ -2375,9 +2545,7 @@ print_config "march_armv8_a_crc_crypto" "$march_armv8_a_crc_crypto" ########################################## # cuda probe -if test "$cuda" != "yes" ; then - cuda="no" -fi +if test "$cuda" != "no" ; then cat > $TMPC << EOF #include int main(int argc, char **argv) @@ -2385,9 +2553,15 @@ int main(int argc, char **argv) return cuInit(0); } EOF -if test "$enable_cuda" = "yes" && compile_prog "" "-lcuda" "cuda"; then - cuda="yes" - LIBS="-lcuda $LIBS" + if compile_prog "" "-lcuda" "cuda"; then + cuda="yes" + LIBS="-lcuda $LIBS" + else + if test "$cuda" = "yes" ; then + feature_not_found "cuda" "" + fi + cuda="no" + fi fi print_config "cuda" "$cuda" @@ -2447,7 +2621,7 @@ fi print_config "__kernel_rwf_t" "$__kernel_rwf_t" ########################################## -# check if gcc has -Wimplicit-fallthrough +# check if gcc has -Wimplicit-fallthrough=2 fallthrough="no" cat > $TMPC << EOF int main(int argc, char **argv) @@ -2455,10 +2629,10 @@ int main(int argc, char **argv) return 0; } EOF -if compile_prog "-Wimplicit-fallthrough" "" "-Wimplicit-fallthrough"; then +if compile_prog "-Wimplicit-fallthrough=2" "" "-Wimplicit-fallthrough=2"; then fallthrough="yes" fi -print_config "-Wimplicit-fallthrough" "$fallthrough" +print_config "-Wimplicit-fallthrough=2" "$fallthrough" ########################################## # check for MADV_HUGEPAGE support @@ -2499,6 +2673,50 @@ if compile_prog "" "" "gettid"; then fi print_config "gettid" "$gettid" +########################################## +# check for statx(2) support by libc +statx="no" +cat > $TMPC << EOF +#include +#include + +int main(int argc, char **argv) +{ + struct statx st; + return statx(-1, *argv, 0, 0, &st); +} +EOF +if compile_prog "" "" "statx"; then + statx="yes" +fi +print_config "statx(2)/libc" "$statx" + +########################################## +# check for statx(2) support by kernel +statx_syscall="no" +cat > $TMPC << EOF +#include +#include +#include +#include + +static int _statx(int dfd, const char *pathname, int flags, unsigned int mask, + struct statx *buffer) +{ + return syscall(__NR_statx, dfd, pathname, flags, mask, buffer); +} + +int main(int argc, char **argv) +{ + struct statx st; + return _statx(-1, *argv, 0, 0, &st); +} +EOF +if compile_prog "" "" "statx_syscall"; then + statx_syscall="yes" +fi +print_config "statx(2)/syscall" "$statx_syscall" + ############################################################################# if test "$wordsize" = "64" ; then @@ -2518,6 +2736,9 @@ if test "$zlib" = "yes" ; then fi if test "$libaio" = "yes" ; then output_sym "CONFIG_LIBAIO" + if test "$libaio_rw_flags" = "yes" ; then + output_sym "CONFIG_LIBAIO_RW_FLAGS" + fi if test "$libaio_uring" = "yes" ; then output_sym "CONFIG_LIBAIO_URING" fi @@ -2534,6 +2755,9 @@ fi if test "$pthread_condattr_setclock" = "yes" ; then output_sym "CONFIG_PTHREAD_CONDATTR_SETCLOCK" fi +if test "$pthread_sigmask" = "yes" ; then + output_sym "CONFIG_PTHREAD_SIGMASK" +fi if test "$have_asprintf" = "yes" ; then output_sym "CONFIG_HAVE_ASPRINTF" fi @@ -2762,7 +2986,10 @@ if test "$valgrind_dev" = "yes"; then output_sym "CONFIG_VALGRIND_DEV" fi if test "$linux_blkzoned" = "yes" ; then - output_sym "CONFIG_LINUX_BLKZONED" + output_sym "CONFIG_HAS_BLKZONED" +fi +if test "$libzbc" = "yes" ; then + output_sym "CONFIG_LIBZBC" fi if test "$zlib" = "no" ; then echo "Consider installing zlib-dev (zlib-devel, some fio features depend on it." @@ -2788,6 +3015,12 @@ fi if test "$gettid" = "yes"; then output_sym "CONFIG_HAVE_GETTID" fi +if test "$statx" = "yes"; then + output_sym "CONFIG_HAVE_STATX" +fi +if test "$statx_syscall" = "yes"; then + output_sym "CONFIG_HAVE_STATX_SYSCALL" +fi if test "$fallthrough" = "yes"; then CFLAGS="$CFLAGS -Wimplicit-fallthrough" fi @@ -2806,17 +3039,26 @@ if test "$libnbd" = "yes" ; then echo "LIBNBD_CFLAGS=$libnbd_cflags" >> $config_host_mak echo "LIBNBD_LIBS=$libnbd_libs" >> $config_host_mak fi +if test "$dynamic_engines" = "yes" ; then + output_sym "CONFIG_DYNAMIC_ENGINES" +fi +print_config "Lib-based ioengines dynamic" "$dynamic_engines" cat > $TMPC << EOF int main(int argc, char **argv) { return 0; } EOF -if test "$disable_tcmalloc" != "yes" && compile_prog "" "-ltcmalloc" "tcmalloc"; then - LIBS="-ltcmalloc $LIBS" - tcmalloc="yes" -else - tcmalloc="no" +if test "$disable_tcmalloc" != "yes"; then + if compile_prog "" "-ltcmalloc" "tcmalloc"; then + tcmalloc="yes" + LIBS="-ltcmalloc $LIBS" + elif compile_prog "" "-l:libtcmalloc_minimal.so.4" "tcmalloc_minimal4"; then + tcmalloc="yes" + LIBS="-l:libtcmalloc_minimal.so.4 $LIBS" + else + tcmalloc="no" + fi fi print_config "TCMalloc support" "$tcmalloc"