X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=configure;h=749cb1fba35697399480ed9fad4344312453f944;hp=93351242a5c5e30b1e9459e14c09fb9d4f240c89;hb=b73af7389a47bb04d841d749eb8a4e996eb5a271;hpb=06eac6b2318da7759a055c4a3ac01c2c1e8aa764 diff --git a/configure b/configure index 93351242..749cb1fb 100755 --- a/configure +++ b/configure @@ -37,6 +37,11 @@ fatal() { exit 1 } +# Print result for each configuration test +print_config() { + printf "%-30s%s\n" "$1" "$2" +} + # Default CFLAGS CFLAGS="-D_GNU_SOURCE -include config-host.h" BUILD_CFLAGS="" @@ -161,11 +166,12 @@ for opt do ;; --build-static) build_static="yes" ;; - --enable-gfio) - gfio_check="yes" + --enable-gfio) gfio_check="yes" ;; --disable-numa) disable_numa="yes" ;; + --disable-rdma) disable_rdma="yes" + ;; --disable-rbd) disable_rbd="yes" ;; --disable-rbd-blkin) disable_rbd_blkin="yes" @@ -184,6 +190,8 @@ for opt do ;; --disable-pmem) disable_pmem="yes" ;; + --enable-cuda) enable_cuda="yes" + ;; --help) show_help="yes" ;; @@ -204,6 +212,7 @@ if test "$show_help" = "yes" ; then echo "--esx Configure build options for esx" echo "--enable-gfio Enable building of gtk gfio" echo "--disable-numa Disable libnuma even if found" + echo "--disable-rdma Disable RDMA support even if found" echo "--disable-gfapi Disable gfapi" echo "--enable-libhdfs Enable hdfs support" echo "--disable-lex Disable use of lex/yacc for math" @@ -211,11 +220,25 @@ if test "$show_help" = "yes" ; then echo "--enable-lex Enable use of lex/yacc for math" echo "--disable-shm Disable SHM support" echo "--disable-optimizations Don't enable compiler optimizations" + echo "--enable-cuda Enable GPUDirect RDMA support" exit $exit_val fi cross_prefix=${cross_prefix-${CROSS_COMPILE}} -cc="${CC-${cross_prefix}gcc}" +# Preferred compiler (can be overriden later after we know the platform): +# ${CC} (if set) +# ${cross_prefix}gcc (if cross-prefix specified) +# gcc if available +# clang if available +if test -z "${CC}${cross_prefix}"; then + if has gcc; then + cc=gcc + elif has clang; then + cc=clang + fi +else + cc="${CC-${cross_prefix}gcc}" +fi if check_define __ANDROID__ ; then targetos="Android" @@ -251,8 +274,9 @@ fi # cross-compiling to one of these OSes then you'll need to specify # the correct CPU with the --cpu option. case $targetos in -AIX) +AIX|OpenBSD) # Unless explicitly enabled, turn off lex. + # OpenBSD will hit syntax error when enabled. if test -z "$disable_lex" ; then disable_lex="yes" else @@ -290,16 +314,16 @@ SunOS) CYGWIN*) # We still force some options, so keep this message here. echo "Forcing some known good options on Windows" - if test -z "$CC" ; then + if test -z "${CC}${cross_prefix}"; then if test ! -z "$build_32bit_win" && test "$build_32bit_win" = "yes"; then - CC="i686-w64-mingw32-gcc" + cc="i686-w64-mingw32-gcc" if test -e "../zlib/contrib/vstudio/vc14/x86/ZlibStatReleaseWithoutAsm/zlibstat.lib"; then echo "Building with zlib support" output_sym "CONFIG_ZLIB" echo "LIBS=../zlib/contrib/vstudio/vc14/x86/ZlibStatReleaseWithoutAsm/zlibstat.lib" >> $config_host_mak fi else - CC="x86_64-w64-mingw32-gcc" + cc="x86_64-w64-mingw32-gcc" if test -e "../zlib/contrib/vstudio/vc14/x64/ZlibStatReleaseWithoutAsm/zlibstat.lib"; then echo "Building with zlib support" output_sym "CONFIG_ZLIB" @@ -329,11 +353,24 @@ CYGWIN*) tls_thread="yes" static_assert="yes" ipv6="yes" - echo "CC=$CC" >> $config_host_mak echo "BUILD_CFLAGS=$CFLAGS -I../zlib -include config-host.h -D_GNU_SOURCE" >> $config_host_mak ;; esac +# Now we know the target platform we can have another guess at the preferred +# compiler when it wasn't explictly set +if test -z "${CC}${cross_prefix}"; then + if test "$targetos" = "FreeBSD" || test "$targetos" = "Darwin"; then + if has clang; then + cc=clang + fi + fi +fi +if test -z "$cc"; then + echo "configure: failed to find compiler" + exit 1 +fi + if test ! -z "$cpu" ; then # command line argument : @@ -404,18 +441,6 @@ case "$cpu" in ;; esac -if test -z "$CC" ; then - if test "$targetos" = "FreeBSD"; then - if has clang; then - CC=clang - else - CC=gcc - fi - fi -fi - -cc="${CC-${cross_prefix}gcc}" - ########################################## # check cross compile @@ -469,11 +494,11 @@ EOF fi -echo "Operating system $targetos" -echo "CPU $cpu" -echo "Big endian $bigendian" -echo "Compiler $cc" -echo "Cross compile $cross_compile" +print_config "Operating system" "$targetos" +print_config "CPU" "$cpu" +print_config "Big endian" "$bigendian" +print_config "Compiler" "$cc" +print_config "Cross compile" "$cross_compile" echo ########################################## @@ -484,7 +509,7 @@ if test "$build_static" = "yes" ; then else build_static="no" fi -echo "Static build $build_static" +print_config "Static build" "$build_static" ########################################## # check for wordsize @@ -505,7 +530,7 @@ elif compile_prog "-DWORDSIZE=64" "" "wordsize"; then else fatal "Unknown wordsize" fi -echo "Wordsize $wordsize" +print_config "Wordsize" "$wordsize" ########################################## # zlib probe @@ -526,7 +551,7 @@ if compile_prog "" "-lz" "zlib" ; then zlib=yes LIBS="-lz $LIBS" fi -echo "zlib $zlib" +print_config "zlib" "$zlib" ########################################## # linux-aio probe @@ -553,7 +578,7 @@ EOF libaio=no fi fi -echo "Linux AIO support $libaio" +print_config "Linux AIO support" "$libaio" ########################################## # posix aio probe @@ -579,8 +604,8 @@ elif compile_prog "" "-lrt" "posixaio"; then posix_aio_lrt="yes" LIBS="-lrt $LIBS" fi -echo "POSIX AIO support $posix_aio" -echo "POSIX AIO support needs -lrt $posix_aio_lrt" +print_config "POSIX AIO support" "$posix_aio" +print_config "POSIX AIO support needs -lrt" "$posix_aio_lrt" ########################################## # posix aio fsync probe @@ -602,11 +627,13 @@ EOF posix_aio_fsync=yes fi fi -echo "POSIX AIO fsync $posix_aio_fsync" +print_config "POSIX AIO fsync" "$posix_aio_fsync" ########################################## # POSIX pshared attribute probe -posix_pshared="no" +if test "$posix_pshared" != "yes" ; then + posix_pshared="no" +fi cat > $TMPC < int main(void) @@ -630,7 +657,7 @@ EOF if compile_prog "" "$LIBS" "posix_pshared" ; then posix_pshared=yes fi -echo "POSIX pshared support $posix_pshared" +print_config "POSIX pshared support" "$posix_pshared" ########################################## # solaris aio probe @@ -652,7 +679,7 @@ if compile_prog "" "-laio" "solarisaio" ; then solaris_aio=yes LIBS="-laio $LIBS" fi -echo "Solaris AIO support $solaris_aio" +print_config "Solaris AIO support" "$solaris_aio" ########################################## # __sync_fetch_and_add test @@ -676,7 +703,7 @@ EOF if compile_prog "" "" "__sync_fetch_and_add()" ; then sfaa="yes" fi -echo "__sync_fetch_and_add $sfaa" +print_config "__sync_fetch_and_add" "$sfaa" ########################################## # libverbs probe @@ -684,19 +711,18 @@ if test "$libverbs" != "yes" ; then libverbs="no" fi cat > $TMPC << EOF -#include -#include +#include int main(int argc, char **argv) { struct ibv_pd *pd = ibv_alloc_pd(NULL); return 0; } EOF -if compile_prog "" "-libverbs" "libverbs" ; then +if test "$disable_rdma" != "yes" && compile_prog "" "-libverbs" "libverbs" ; then libverbs="yes" LIBS="-libverbs $LIBS" fi -echo "libverbs $libverbs" +print_config "libverbs" "$libverbs" ########################################## # rdmacm probe @@ -712,11 +738,11 @@ int main(int argc, char **argv) return 0; } EOF -if compile_prog "" "-lrdmacm" "rdma"; then +if test "$disable_rdma" != "yes" && compile_prog "" "-lrdmacm" "rdma"; then rdmacm="yes" LIBS="-lrdmacm $LIBS" fi -echo "rdmacm $rdmacm" +print_config "rdmacm" "$rdmacm" ########################################## # Linux fallocate probe @@ -736,7 +762,7 @@ EOF if compile_prog "" "" "linux_fallocate"; then linux_fallocate="yes" fi -echo "Linux fallocate $linux_fallocate" +print_config "Linux fallocate" "$linux_fallocate" ########################################## # POSIX fadvise probe @@ -755,7 +781,7 @@ EOF if compile_prog "" "" "posix_fadvise"; then posix_fadvise="yes" fi -echo "POSIX fadvise $posix_fadvise" +print_config "POSIX fadvise" "$posix_fadvise" ########################################## # POSIX fallocate probe @@ -774,7 +800,7 @@ EOF if compile_prog "" "" "posix_fallocate"; then posix_fallocate="yes" fi -echo "POSIX fallocate $posix_fallocate" +print_config "POSIX fallocate" "$posix_fallocate" ########################################## # sched_set/getaffinity 2 or 3 argument test @@ -807,8 +833,8 @@ EOF linux_2arg_affinity="yes" fi fi -echo "sched_setaffinity(3 arg) $linux_3arg_affinity" -echo "sched_setaffinity(2 arg) $linux_2arg_affinity" +print_config "sched_setaffinity(3 arg)" "$linux_3arg_affinity" +print_config "sched_setaffinity(2 arg)" "$linux_2arg_affinity" ########################################## # clock_gettime probe @@ -829,7 +855,7 @@ elif compile_prog "" "-lrt" "clock_gettime"; then clock_gettime="yes" LIBS="-lrt $LIBS" fi -echo "clock_gettime $clock_gettime" +print_config "clock_gettime" "$clock_gettime" ########################################## # CLOCK_MONOTONIC probe @@ -849,7 +875,7 @@ EOF clock_monotonic="yes" fi fi -echo "CLOCK_MONOTONIC $clock_monotonic" +print_config "CLOCK_MONOTONIC" "$clock_monotonic" ########################################## # CLOCK_MONOTONIC_RAW probe @@ -869,7 +895,7 @@ EOF clock_monotonic_raw="yes" fi fi -echo "CLOCK_MONOTONIC_RAW $clock_monotonic_raw" +print_config "CLOCK_MONOTONIC_RAW" "$clock_monotonic_raw" ########################################## # CLOCK_MONOTONIC_PRECISE probe @@ -889,7 +915,7 @@ EOF clock_monotonic_precise="yes" fi fi -echo "CLOCK_MONOTONIC_PRECISE $clock_monotonic_precise" +print_config "CLOCK_MONOTONIC_PRECISE" "$clock_monotonic_precise" ########################################## # clockid_t probe @@ -898,17 +924,18 @@ if test "$clockid_t" != "yes" ; then fi cat > $TMPC << EOF #include +#include int main(int argc, char **argv) { volatile clockid_t cid; - memset(&cid, 0, sizeof(cid)); + memset((void*)&cid, 0, sizeof(cid)); return 0; } EOF if compile_prog "" "$LIBS" "clockid_t"; then clockid_t="yes" fi -echo "clockid_t $clockid_t" +print_config "clockid_t" "$clockid_t" ########################################## # gettimeofday() probe @@ -927,7 +954,7 @@ EOF if compile_prog "" "" "gettimeofday"; then gettimeofday="yes" fi -echo "gettimeofday $gettimeofday" +print_config "gettimeofday" "$gettimeofday" ########################################## # fdatasync() probe @@ -945,7 +972,7 @@ EOF if compile_prog "" "" "fdatasync"; then fdatasync="yes" fi -echo "fdatasync $fdatasync" +print_config "fdatasync" "$fdatasync" ########################################## # sync_file_range() probe @@ -967,7 +994,7 @@ EOF if compile_prog "" "" "sync_file_range"; then sync_file_range="yes" fi -echo "sync_file_range $sync_file_range" +print_config "sync_file_range" "$sync_file_range" ########################################## # ext4 move extent probe @@ -991,7 +1018,7 @@ elif test $targetos = "Linux" ; then # work. Takes a while to bubble back. ext4_me="yes" fi -echo "EXT4 move extent $ext4_me" +print_config "EXT4 move extent" "$ext4_me" ########################################## # splice probe @@ -1009,7 +1036,7 @@ EOF if compile_prog "" "" "linux splice"; then linux_splice="yes" fi -echo "Linux splice(2) $linux_splice" +print_config "Linux splice(2)" "$linux_splice" ########################################## # GUASI probe @@ -1028,7 +1055,7 @@ EOF if compile_prog "" "" "guasi"; then guasi="yes" fi -echo "GUASI $guasi" +print_config "GUASI" "$guasi" ########################################## # fusion-aw probe @@ -1050,7 +1077,7 @@ if compile_prog "" "-L/usr/lib/fio -L/usr/lib/nvm -lnvm-primitives -ldl -lpthrea LIBS="-L/usr/lib/fio -L/usr/lib/nvm -lnvm-primitives -ldl -lpthread $LIBS" fusion_aw="yes" fi -echo "Fusion-io atomic engine $fusion_aw" +print_config "Fusion-io atomic engine" "$fusion_aw" ########################################## # libnuma probe @@ -1068,7 +1095,7 @@ if test "$disable_numa" != "yes" && compile_prog "" "-lnuma" "libnuma"; then libnuma="yes" LIBS="-lnuma $LIBS" fi -echo "libnuma $libnuma" +print_config "libnuma" "$libnuma" ########################################## # libnuma 2.x version API, initialize with "no" only if $libnuma is set to "yes" @@ -1085,7 +1112,7 @@ EOF if compile_prog "" "" "libnuma api"; then libnuma_v2="yes" fi -echo "libnuma v2 $libnuma_v2" +print_config "libnuma v2" "$libnuma_v2" fi ########################################## @@ -1105,7 +1132,7 @@ EOF if compile_prog "" "" "strsep"; then strsep="yes" fi -echo "strsep $strsep" +print_config "strsep" "$strsep" ########################################## # strcasestr() probe @@ -1122,7 +1149,7 @@ EOF if compile_prog "" "" "strcasestr"; then strcasestr="yes" fi -echo "strcasestr $strcasestr" +print_config "strcasestr" "$strcasestr" ########################################## # strlcat() probe @@ -1143,7 +1170,7 @@ EOF if compile_prog "" "" "strlcat"; then strlcat="yes" fi -echo "strlcat $strlcat" +print_config "strlcat" "$strlcat" ########################################## # getopt_long_only() probe @@ -1163,7 +1190,7 @@ EOF if compile_prog "" "" "getopt_long_only"; then getopt_long_only="yes" fi -echo "getopt_long_only() $getopt_long_only" +print_config "getopt_long_only()" "$getopt_long_only" ########################################## # inet_aton() probe @@ -1183,7 +1210,7 @@ EOF if compile_prog "" "" "inet_aton"; then inet_aton="yes" fi -echo "inet_aton $inet_aton" +print_config "inet_aton" "$inet_aton" ########################################## # socklen_t probe @@ -1201,7 +1228,7 @@ EOF if compile_prog "" "" "socklen_t"; then socklen_t="yes" fi -echo "socklen_t $socklen_t" +print_config "socklen_t" "$socklen_t" ########################################## # Whether or not __thread is supported for TLS @@ -1219,7 +1246,7 @@ EOF if compile_prog "" "" "__thread"; then tls_thread="yes" fi -echo "__thread $tls_thread" +print_config "__thread" "$tls_thread" ########################################## # Check if we have required gtk/glib support for gfio @@ -1236,7 +1263,7 @@ int main(void) gdk_threads_enter(); gdk_threads_leave(); - printf("%d", GTK_CHECK_VERSION(2, 18, 0)); + return GTK_CHECK_VERSION(2, 18, 0) ? 0 : 1; /* 0 on success */ } EOF GTK_CFLAGS=$(pkg-config --cflags gtk+-2.0 gthread-2.0) @@ -1252,8 +1279,8 @@ if test "$?" != "0" ; then exit 1 fi if compile_prog "$GTK_CFLAGS" "$GTK_LIBS" "gfio" ; then - r=$($TMPE) - if test "$r" != "0" ; then + $TMPE + if test "$?" = "0" ; then gfio="yes" GFIO_LIBS="$LIBS $GTK_LIBS" CFLAGS="$CFLAGS $GTK_CFLAGS" @@ -1269,9 +1296,10 @@ LDFLAGS=$ORG_LDFLAGS fi if test "$gfio_check" = "yes" ; then - echo "gtk 2.18 or higher $gfio" + print_config "gtk 2.18 or higher" "$gfio" fi +########################################## # Check whether we have getrusage(RUSAGE_THREAD) if test "$rusage_thread" != "yes" ; then rusage_thread="no" @@ -1289,7 +1317,7 @@ EOF if compile_prog "" "" "RUSAGE_THREAD"; then rusage_thread="yes" fi -echo "RUSAGE_THREAD $rusage_thread" +print_config "RUSAGE_THREAD" "$rusage_thread" ########################################## # Check whether we have SCHED_IDLE @@ -1307,7 +1335,7 @@ EOF if compile_prog "" "" "SCHED_IDLE"; then sched_idle="yes" fi -echo "SCHED_IDLE $sched_idle" +print_config "SCHED_IDLE" "$sched_idle" ########################################## # Check whether we have TCP_NODELAY @@ -1327,7 +1355,7 @@ EOF if compile_prog "" "" "TCP_NODELAY"; then tcp_nodelay="yes" fi -echo "TCP_NODELAY $tcp_nodelay" +print_config "TCP_NODELAY" "$tcp_nodelay" ########################################## # Check whether we have SO_SNDBUF @@ -1348,7 +1376,7 @@ EOF if compile_prog "" "" "SO_SNDBUF"; then window_size="yes" fi -echo "Net engine window_size $window_size" +print_config "Net engine window_size" "$window_size" ########################################## # Check whether we have TCP_MAXSEG @@ -1370,7 +1398,7 @@ EOF if compile_prog "" "" "TCP_MAXSEG"; then mss="yes" fi -echo "TCP_MAXSEG $mss" +print_config "TCP_MAXSEG" "$mss" ########################################## # Check whether we have RLIMIT_MEMLOCK @@ -1389,7 +1417,7 @@ EOF if compile_prog "" "" "RLIMIT_MEMLOCK"; then rlimit_memlock="yes" fi -echo "RLIMIT_MEMLOCK $rlimit_memlock" +print_config "RLIMIT_MEMLOCK" "$rlimit_memlock" ########################################## # Check whether we have pwritev/preadv @@ -1407,7 +1435,7 @@ EOF if compile_prog "" "" "pwritev"; then pwritev="yes" fi -echo "pwritev/preadv $pwritev" +print_config "pwritev/preadv" "$pwritev" ########################################## # Check whether we have pwritev2/preadv2 @@ -1425,7 +1453,7 @@ EOF if compile_prog "" "" "pwritev2"; then pwritev2="yes" fi -echo "pwritev2/preadv2 $pwritev2" +print_config "pwritev2/preadv2" "$pwritev2" ########################################## # Check whether we have the required functions for ipv6 @@ -1454,7 +1482,7 @@ EOF if compile_prog "" "" "ipv6"; then ipv6="yes" fi -echo "IPv6 helpers $ipv6" +print_config "IPv6 helpers" "$ipv6" ########################################## # check for rbd @@ -1466,15 +1494,18 @@ cat > $TMPC << EOF int main(int argc, char **argv) { - rados_t cluster; rados_ioctx_t io_ctx; + const char cluster_name[] = "ceph"; + const char user_name[] = "client.admin"; const char pool[] = "rbd"; - int major, minor, extra; - rbd_version(&major, &minor, &extra); + rbd_version(&major, &minor, &extra); + /* The rados_create2 signature required was only introduced in ceph 0.65 */ + rados_create2(&cluster, cluster_name, user_name, 0); rados_ioctx_create(cluster, pool, &io_ctx); + return 0; } EOF @@ -1482,7 +1513,7 @@ if test "$disable_rbd" != "yes" && compile_prog "" "-lrbd -lrados" "rbd"; then LIBS="-lrbd -lrados $LIBS" rbd="yes" fi -echo "Rados Block Device engine $rbd" +print_config "Rados Block Device engine" "$rbd" ########################################## # check for rbd_poll @@ -1509,7 +1540,7 @@ EOF if compile_prog "" "-lrbd -lrados" "rbd"; then rbd_poll="yes" fi -echo "rbd_poll $rbd_poll" +print_config "rbd_poll" "$rbd_poll" fi ########################################## @@ -1531,7 +1562,7 @@ EOF if compile_prog "" "-lrbd -lrados" "rbd"; then rbd_inval="yes" fi -echo "rbd_invalidate_cache $rbd_inval" +print_config "rbd_invalidate_cache" "$rbd_inval" fi ########################################## @@ -1562,7 +1593,7 @@ if test "$disable_rbd" != "yes" && test "$disable_rbd_blkin" != "yes" \ LIBS="-lblkin $LIBS" rbd_blkin="yes" fi -echo "rbd blkin tracing $rbd_blkin" +print_config "rbd blkin tracing" "$rbd_blkin" ########################################## # Check whether we have setvbuf @@ -1582,8 +1613,9 @@ EOF if compile_prog "" "" "setvbuf"; then setvbuf="yes" fi -echo "setvbuf $setvbuf" +print_config "setvbuf" "$setvbuf" +########################################## # check for gfapi if test "$gfapi" != "yes" ; then gfapi="no" @@ -1593,7 +1625,6 @@ cat > $TMPC << EOF int main(int argc, char **argv) { - glfs_t *g = glfs_new("foo"); return 0; @@ -1603,7 +1634,7 @@ if test "$disable_gfapi" != "yes" && compile_prog "" "-lgfapi -lglusterfs" "gfa LIBS="-lgfapi -lglusterfs $LIBS" gfapi="yes" fi - echo "Gluster API engine $gfapi" +print_config "Gluster API engine" "$gfapi" ########################################## # check for gfapi fadvise support, initialize with "no" only if $gfapi is set to "yes" @@ -1623,7 +1654,7 @@ EOF if compile_prog "" "-lgfapi -lglusterfs" "gfapi"; then gf_fadvise="yes" fi -echo "Gluster API use fadvise $gf_fadvise" +print_config "Gluster API use fadvise" "$gf_fadvise" fi ########################################## @@ -1643,7 +1674,7 @@ EOF if compile_prog "" "-lgfapi -lglusterfs" "gf trim"; then gf_trim="yes" fi -echo "Gluster API trim support $gf_trim" +print_config "Gluster API trim support" "$gf_trim" fi ########################################## @@ -1673,11 +1704,11 @@ int main(int argc, char **argv) EOF if compile_prog "" "" "s390_z196_facilities"; then $TMPE - if [[ $? -eq 0 ]]; then + if [ $? -eq 0 ]; then s390_z196_facilities="yes" fi fi -echo "s390_z196_facilities $s390_z196_facilities" +print_config "s390_z196_facilities" "$s390_z196_facilities" ########################################## # Check if we have required environment variables configured for libhdfs @@ -1703,7 +1734,7 @@ if test "$libhdfs" = "yes" ; then FIO_HDFS_CPU="amd64" fi fi -echo "HDFS engine $libhdfs" +print_config "HDFS engine" "$libhdfs" ########################################## # Check whether we have MTD @@ -1726,7 +1757,7 @@ EOF if compile_prog "" "" "mtd"; then mtd="yes" fi -echo "MTD $mtd" +print_config "MTD" "$mtd" ########################################## # Check whether we have libpmem @@ -1746,7 +1777,7 @@ if compile_prog "" "-lpmem" "libpmem"; then libpmem="yes" LIBS="-lpmem $LIBS" fi -echo "libpmem $libpmem" +print_config "libpmem" "$libpmem" ########################################## # Check whether we have libpmemblk @@ -1769,7 +1800,7 @@ EOF LIBS="-lpmemblk $LIBS" fi fi -echo "libpmemblk $libpmemblk" +print_config "libpmemblk" "$libpmemblk" # Choose the ioengines if test "$libpmem" = "yes" && test "$disable_pmem" = "no"; then @@ -1781,12 +1812,13 @@ fi ########################################## # Report whether pmemblk engine is enabled -echo "NVML pmemblk engine $pmemblk" +print_config "NVML pmemblk engine" "$pmemblk" ########################################## # Report whether dev-dax engine is enabled -echo "NVML dev-dax engine $devdax" +print_config "NVML dev-dax engine" "$devdax" +########################################## # Check if we have lex/yacc available yacc="no" yacc_is_bison="no" @@ -1845,7 +1877,7 @@ fi fi fi -echo "lex/yacc for arithmetic $arith" +print_config "lex/yacc for arithmetic" "$arith" ########################################## # Check whether we have setmntent/getmntent @@ -1866,7 +1898,7 @@ EOF if compile_prog "" "" "getmntent"; then getmntent="yes" fi -echo "getmntent $getmntent" +print_config "getmntent" "$getmntent" ########################################## # Check whether we have getmntinfo @@ -1891,7 +1923,7 @@ EOF if compile_prog "-Werror" "" "getmntinfo"; then getmntinfo="yes" fi -echo "getmntinfo $getmntinfo" +print_config "getmntinfo" "$getmntinfo" # getmntinfo(3) for NetBSD. if test "$getmntinfo_statvfs" != "yes" ; then @@ -1909,7 +1941,7 @@ EOF # Skip the test if the one with statfs arg is detected. if test "$getmntinfo" != "yes" && compile_prog "-Werror" "" "getmntinfo_statvfs"; then getmntinfo_statvfs="yes" - echo "getmntinfo_statvfs $getmntinfo_statvfs" + print_config "getmntinfo_statvfs" "$getmntinfo_statvfs" fi ########################################## @@ -1920,16 +1952,7 @@ fi cat > $TMPC << EOF #include #include -#undef offsetof -#ifdef __compiler_offsetof -#define offsetof(TYPE,MEMBER) __compiler_offsetof(TYPE,MEMBER) -#else -#define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER) -#endif - -#define container_of(ptr, type, member) ({ \ - const typeof( ((type *)0)->member ) *__mptr = (ptr); \ - (type *)( (char *)__mptr - offsetof(type,member) );}) +#include struct foo { int a, b; @@ -1944,7 +1967,7 @@ EOF if compile_prog "" "" "static_assert"; then static_assert="yes" fi -echo "Static Assert $static_assert" +print_config "Static Assert" "$static_assert" ########################################## # Check whether we have bool / stdbool.h @@ -1962,7 +1985,26 @@ EOF if compile_prog "" "" "bool"; then have_bool="yes" fi -echo "bool $have_bool" +print_config "bool" "$have_bool" + +########################################## +# Check whether we have strndup() +strndup="no" +cat > $TMPC << EOF +#include +#include +int main(int argc, char **argv) +{ + char *res = strndup("test string", 8); + + free(res); + return 0; +} +EOF +if compile_prog "" "" "strndup"; then + strndup="yes" +fi +print_config "strndup" "$strndup" ########################################## # check march=armv8-a+crc+crypto @@ -1985,8 +2027,25 @@ EOF CFLAGS="$CFLAGS -march=armv8-a+crc+crypto -DARCH_HAVE_CRC_CRYPTO" fi fi -echo "march_armv8_a_crc_crypto $march_armv8_a_crc_crypto" +print_config "march_armv8_a_crc_crypto" "$march_armv8_a_crc_crypto" +########################################## +# cuda probe +if test "$cuda" != "yes" ; then + cuda="no" +fi +cat > $TMPC << EOF +#include +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" +fi +print_config "cuda" "$cuda" ############################################################################# @@ -2104,7 +2163,7 @@ if test "$rusage_thread" = "yes" ; then output_sym "CONFIG_RUSAGE_THREAD" fi if test "$gfio" = "yes" ; then - echo "CONFIG_GFIO=y" >> $config_host_mak + output_sym "CONFIG_GFIO" fi if test "$esx" = "yes" ; then output_sym "CONFIG_ESX" @@ -2204,13 +2263,18 @@ fi if test "$have_bool" = "yes" ; then output_sym "CONFIG_HAVE_BOOL" fi +if test "$strndup" = "yes" ; then + output_sym "CONFIG_HAVE_STRNDUP" +fi if test "$disable_opt" = "yes" ; then output_sym "CONFIG_DISABLE_OPTIMIZATIONS" fi - if test "$zlib" = "no" ; then echo "Consider installing zlib-dev (zlib-devel), some fio features depend on it." fi +if test "$cuda" = "yes" ; then + output_sym "CONFIG_CUDA" +fi echo "LIBS+=$LIBS" >> $config_host_mak echo "GFIO_LIBS+=$GFIO_LIBS" >> $config_host_mak