X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=configure;h=d37e8b4bd505de82835702a21c39d0b0ea75349b;hp=1ca461dd739d3cd27b142b214dbdca34f0ce2d7d;hb=66ee4002731302216f47f9088d639bcba1c78200;hpb=ba9c7219eefcc04e84a4fb4970f4b5caeaf48aa6 diff --git a/configure b/configure index 1ca461dd..d37e8b4b 100755 --- a/configure +++ b/configure @@ -94,9 +94,13 @@ compile_prog() { feature_not_found() { feature=$1 + packages=$2 echo "ERROR" echo "ERROR: User requested feature $feature" + if test ! -z "$packages" ; then + echo "ERROR: That feature needs $packages installed" + fi echo "ERROR: configure was not able to find it" fatal "ERROR" } @@ -126,9 +130,6 @@ output_sym() { targetos="" cpu="" -cross_prefix=${cross_prefix-${CROSS_COMPILE}} -cc="${CC-${cross_prefix}gcc}" - # default options show_help="no" exit_val=0 @@ -144,11 +145,13 @@ for opt do ;; --extra-cflags=*) CFLAGS="$CFLAGS $optarg" ;; - --build-32bit-win=*) build_32bit_win="$optarg" + --build-32bit-win) build_32bit_win="yes" ;; --enable-gfio) gfio="yes" ;; + --disable-numa) disable_numa="yes" + ;; --help) show_help="yes" ;; @@ -163,11 +166,15 @@ if test "$show_help" = "yes" ; then echo "--cpu= Specify target CPU if auto-detect fails" echo "--cc= Specify compiler to use" echo "--extra-cflags= Specify extra CFLAGS to pass to compiler" - echo "--build-32bit-win= Specify yes for a 32-bit build on Windows" + echo "--build-32bit-win Enable 32-bit build on Windows" echo "--enable-gfio Enable building of gtk gfio" + echo "--disable-numa Disable libnuma even if found" exit $exit_val fi +cross_prefix=${cross_prefix-${CROSS_COMPILE}} +cc="${CC-${cross_prefix}gcc}" + if check_define __ANDROID__ ; then targetos="Android" elif check_define __linux__ ; then @@ -176,6 +183,9 @@ elif check_define __OpenBSD__ ; then targetos='OpenBSD' elif check_define __sun__ ; then targetos='SunOS' + CFLAGS="$CFLAGS -D_REENTRANT" +elif check_define _WIN32 ; then + targetos='CYGWIN' else targetos=`uname -s` fi @@ -235,6 +245,8 @@ CYGWIN*) output_sym "CONFIG_CLOCK_GETTIME" output_sym "CONFIG_SCHED_IDLE" output_sym "CONFIG_TCP_NODELAY" + output_sym "CONFIG_TLS_THREAD" + output_sym "CONFIG_IPV6" echo "CC=$CC" >> $config_host_mak echo "BUILD_CFLAGS=$CFLAGS -include config-host.h -D_GNU_SOURCE" >> $config_host_mak exit 0 @@ -411,9 +423,6 @@ EOF if compile_prog "" "-lz" "zlib" ; then zlib=yes LIBS="-lz $LIBS" -else - feature_not_found "zlib" - zlib=no fi echo "zlib $zlib" @@ -434,7 +443,7 @@ if compile_prog "" "-laio" "libaio" ; then LIBS="-laio $LIBS" else if test "$libaio" = "yes" ; then - feature_not_found "linux AIO" + feature_not_found "linux AIO" "libaio-dev or libaio-devel" fi libaio=no fi @@ -565,6 +574,7 @@ echo "rdmacm $rdmacm" linux_fallocate="no" cat > $TMPC << EOF #include +#include #include int main(int argc, char **argv) { @@ -808,15 +818,18 @@ echo "GUASI $guasi" # fusion-aw probe fusion_aw="no" cat > $TMPC << EOF -#include +#include int main(int argc, char **argv) { - struct vsl_iovec iov; - return vsl_vectored_write(0, &iov, 0, O_ATOMIC); + nvm_version_t ver_info; + nvm_handle_t handle; + + handle = nvm_get_handle(0, &ver_info); + return nvm_atomic_write(handle, 0, 0, 0); } EOF -if compile_prog "" "-L/usr/lib/fio -lnvm-primitives" "fusion-aw"; then - LIBS="-L/usr/lib/fio -lnvm-primitives $LIBS" +if compile_prog "" "-L/usr/lib/fio -L/usr/lib/nvm -lnvm-primitives -lvsl -ldl" "fusion-aw"; then + LIBS="-L/usr/lib/fio -L/usr/lib/nvm -lnvm-primitives -lvsl -ldl $LIBS" fusion_aw="yes" fi echo "Fusion-io atomic engine $fusion_aw" @@ -831,7 +844,7 @@ int main(int argc, char **argv) return numa_available(); } EOF -if compile_prog "" "-lnuma" "libnuma"; then +if test "$disable_numa" != "yes" && compile_prog "" "-lnuma" "libnuma"; then libnuma="yes" LIBS="-lnuma $LIBS" fi @@ -878,8 +891,7 @@ cat > $TMPC << EOF #include int main(int argc, char **argv) { - strcasestr(NULL, NULL); - return 0; + return strcasestr(argv[0], argv[1]) != NULL; } EOF if compile_prog "" "" "strcasestr"; then @@ -893,6 +905,7 @@ getopt_long_only="no" cat > $TMPC << EOF #include #include +#include int main(int argc, char **argv) { int c = getopt_long_only(argc, argv, NULL, NULL, NULL); @@ -943,7 +956,7 @@ echo "socklen_t $socklen_t" tls_thread="no" cat > $TMPC << EOF #include -static int __thread ret; +static __thread int ret; int main(int argc, char **argv) { return ret; @@ -955,7 +968,7 @@ fi echo "__thread $tls_thread" ########################################## -# Whether or not __thread is supported for TLS +# Check if we have required gtk/glib support for gfio if test "$gfio" = "yes" ; then cat > $TMPC << EOF #include @@ -995,7 +1008,7 @@ else fi fi -echo "gfio $gfio" +echo "gtk 2.18 or higher $gfio" # Check whether we have getrusage(RUSAGE_THREAD) rusage_thread="no" @@ -1065,6 +1078,162 @@ if compile_prog "" "" "RLIMIT_MEMLOCK"; then fi echo "RLIMIT_MEMLOCK $rlimit_memlock" +########################################## +# Check whether we have pwritev/preadv +pwritev="no" +cat > $TMPC << EOF +#include +#include +int main(int argc, char **argv) +{ + return pwritev(0, NULL, 1, 0) + preadv(0, NULL, 1, 0); +} +EOF +if compile_prog "" "" "pwritev"; then + pwritev="yes" +fi +echo "pwritev/preadv $pwritev" + +########################################## +# Check whether we have the required functions for ipv6 +ipv6="no" +cat > $TMPC << EOF +#include +#include +#include +#include +#include +int main(int argc, char **argv) +{ + struct addrinfo hints; + struct in6_addr addr; + int ret; + + ret = getaddrinfo(NULL, NULL, &hints, NULL); + freeaddrinfo(NULL); + printf("%s\n", gai_strerror(ret)); + addr = in6addr_any; + return 0; +} +EOF +if compile_prog "" "" "ipv6"; then + ipv6="yes" +fi +echo "IPv6 helpers $ipv6" + +########################################## +# check for rbd +rbd="no" +cat > $TMPC << EOF +#include + +int main(int argc, char **argv) +{ + + rados_t cluster; + rados_ioctx_t io_ctx; + const char pool[] = "rbd"; + + int major, minor, extra; + rbd_version(&major, &minor, &extra); + + rados_ioctx_create(cluster, pool, &io_ctx); + return 0; +} +EOF +if compile_prog "" "-lrbd -lrados" "rbd"; then + LIBS="-lrbd -lrados $LIBS" + rbd="yes" +fi +echo "Rados Block Device engine $rbd" + +########################################## +# Check whether we have setvbuf +setvbuf="no" +cat > $TMPC << EOF +#include +int main(int argc, char **argv) +{ + FILE *f = NULL; + char buf[80]; + setvbuf(f, buf, _IOFBF, sizeof(buf)); + return 0; +} +EOF +if compile_prog "" "" "setvbuf"; then + setvbuf="yes" +fi +echo "setvbuf $setvbuf" + +# check for gfapi +gfapi="no" +cat > $TMPC << EOF +#include + +int main(int argc, char **argv) +{ + + glfs_t *g = glfs_new("foo"); + + return 0; +} +EOF +if compile_prog "" "-lgfapi -lglusterfs" "gfapi"; then + LIBS="-lgfapi -lglusterfs $LIBS" + gfapi="yes" +fi + echo "Gluster API engine $gfapi" + +########################################## +# check for gfapi fadvise support +gf_fadvise="no" +cat > $TMPC << EOF +#include + +int main(int argc, char **argv) +{ + struct glfs_fd *fd; + int ret = glfs_fadvise(fd, 0, 0, 1); + + return 0; +} +EOF + +if compile_prog "" "-lgfapi -lglusterfs" "gfapi"; then + gf_fadvise="yes" +fi +echo "Gluster API use fadvise $gf_fadvise" + +########################################## +# Check if we support stckf on s390 +s390_z196_facilities="no" +cat > $TMPC << EOF +#define STFLE_BITS_Z196 45 /* various z196 facilities ... */ +int main(int argc, char **argv) +{ + /* We want just 1 double word to be returned. */ + register unsigned long reg0 asm("0") = 0; + unsigned long stfle_bits; + asm volatile(".machine push" "\n\t" + ".machine \"z9-109\"" "\n\t" + "stfle %0" "\n\t" + ".machine pop" "\n" + : "=QS" (stfle_bits), "+d" (reg0) + : : "cc"); + + if ((stfle_bits & (1UL << (63 - STFLE_BITS_Z196))) != 0) + return 0; + else + return -1; +} +EOF +if compile_prog "" "" "s390_z196_facilities"; then + $TMPE + if [[ $? -eq 0 ]]; then + s390_z196_facilities="yes" + fi +fi +echo "s390_z196_facilities $s390_z196_facilities" ############################################################################# if test "$wordsize" = "64" ; then @@ -1079,6 +1248,9 @@ if test "$bigendian" = "yes" ; then else output_sym "CONFIG_LITTLE_ENDIAN" fi +if test "$zlib" = "yes" ; then + output_sym "CONFIG_ZLIB" +fi if test "$libaio" = "yes" ; then output_sym "CONFIG_LIBAIO" fi @@ -1103,7 +1275,7 @@ fi if test "$sfaa" = "yes" ; then output_sym "CONFIG_SFAA" fi -if test "$libverbs" = "yes" -a "rdmacm" = "yes" ; then +if test "$libverbs" = "yes" -a "$rdmacm" = "yes" ; then output_sym "CONFIG_RDMA" fi if test "$clock_gettime" = "yes" ; then @@ -1177,6 +1349,28 @@ fi if test "$rlimit_memlock" = "yes" ; then output_sym "CONFIG_RLIMIT_MEMLOCK" fi +if test "$pwritev" = "yes" ; then + output_sym "CONFIG_PWRITEV" +fi +if test "$ipv6" = "yes" ; then + output_sym "CONFIG_IPV6" +fi +if test "$rbd" = "yes" ; then + output_sym "CONFIG_RBD" +fi +if test "$setvbuf" = "yes" ; then + output_sym "CONFIG_SETVBUF" +fi +if test "$s390_z196_facilities" = "yes" ; then + output_sym "CONFIG_S390_Z196_FACILITIES" + CFLAGS="$CFLAGS -march=z9-109" +fi +if test "$gfapi" = "yes" ; then + output_sym "CONFIG_GFAPI" +fi +if test "$gf_fadvise" = "yes" ; then + output_sym "CONFIG_GF_FADVISE" +fi echo "LIBS+=$LIBS" >> $config_host_mak echo "CFLAGS+=$CFLAGS" >> $config_host_mak