X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=configure;h=a24e3eff7fd4985ba66fe4a8a0aedcc6d3f14088;hp=3b871efa302acb522ed25f1f51da11fc838b0cb0;hb=a214d131483c58ab9f1456edaafc1eb8caa8711c;hpb=92330695e64a42fd5dc54a6970a4b8122d3cd80e diff --git a/configure b/configure index 3b871efa..a24e3eff 100755 --- a/configure +++ b/configure @@ -135,6 +135,8 @@ show_help="no" exit_val=0 gfio_check="no" libhdfs="no" +pmemblk="no" +disable_lex="" prefix=/usr/local # parse options @@ -164,11 +166,21 @@ for opt do ;; --disable-rbd) disable_rbd="yes" ;; + --disable-rbd-blkin) disable_rbd_blkin="yes" + ;; --disable-gfapi) disable_gfapi="yes" ;; --enable-libhdfs) libhdfs="yes" ;; - --disable-shm) output_sym "CONFIG_NO_SHM" + --enable-pmemblk) pmemblk="yes" + ;; + --disable-lex) disable_lex="yes" + ;; + --enable-lex) disable_lex="no" + ;; + --disable-shm) no_shm="yes" + ;; + --disable-optimizations) disable_opt="yes" ;; --help) show_help="yes" @@ -190,7 +202,13 @@ 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-gfapi Disable gfapi" echo "--enable-libhdfs Enable hdfs support" + echo "--enable-pmemblk Enable NVML libpmemblk support" + echo "--disable-lex Disable use of lex/yacc for math" + echo "--enable-lex Enable use of lex/yacc for math" + echo "--disable-shm Disable SHM support" + echo "--disable-optimizations Don't enable compiler optimizations" exit $exit_val fi @@ -218,11 +236,27 @@ printf " '%s'" "$0" "$@" >> $config_host_mak echo >> $config_host_mak echo "CONFIG_TARGET_OS=$targetos" >> $config_host_mak +if test "$no_shm" = "yes" ; then + output_sym "CONFIG_NO_SHM" +fi + +if test "$disable_opt" = "yes" ; then + output_sym "CONFIG_FIO_NO_OPT" +fi + # Some host OSes need non-standard checks for which CPU to use. # Note that these checks are broken for cross-compilation: if you're # cross-compiling to one of these OSes then you'll need to specify # the correct CPU with the --cpu option. case $targetos in +AIX) + # Unless explicitly enabled, turn off lex. + if test -z "$disable_lex" ; then + disable_lex="yes" + else + force_no_lex_o="yes" + fi + ;; Darwin) # on Leopard most of the system is 32-bit, so we have to ask the kernel if # we can run 64-bit userspace code. @@ -461,7 +495,8 @@ echo "zlib $zlib" ########################################## # linux-aio probe libaio="no" -cat > $TMPC < $TMPC < #include int main(void) @@ -470,14 +505,15 @@ int main(void) return 0; } EOF -if compile_prog "" "-laio" "libaio" ; then - libaio=yes - LIBS="-laio $LIBS" -else - if test "$libaio" = "yes" ; then - feature_not_found "linux AIO" "libaio-dev or libaio-devel" + if compile_prog "" "-laio" "libaio" ; then + libaio=yes + LIBS="-laio $LIBS" + else + if test "$libaio" = "yes" ; then + feature_not_found "linux AIO" "libaio-dev or libaio-devel" + fi + libaio=no fi - libaio=no fi echo "Linux AIO support $libaio" @@ -545,17 +581,18 @@ fi echo "Solaris AIO support $solaris_aio" ########################################## -# __sync_fetch_and_and test +# __sync_fetch_and_add test sfaa="no" cat > $TMPC << EOF -static int sfaa(int *ptr) +#include +static int sfaa(uint64_t *ptr) { return __sync_fetch_and_add(ptr, 0); } int main(int argc, char **argv) { - int val = 42; + uint64_t val = 42; sfaa(&val); return val; } @@ -756,6 +793,25 @@ EOF fi echo "CLOCK_MONOTONIC_PRECISE $clock_monotonic_precise" +########################################## +# clockid_t probe +clockid_t="no" +cat > $TMPC << EOF +#include +#include +#include +int main(int argc, char **argv) +{ + clockid_t cid; + memset(&cid, 0, sizeof(cid)); + return clock_gettime(cid, NULL); +} +EOF +if compile_prog "" "$LIBS" "clockid_t"; then + clockid_t="yes" +fi +echo "clockid_t $clockid_t" + ########################################## # gettimeofday() probe gettimeofday="no" @@ -925,7 +981,8 @@ cat > $TMPC << EOF #include int main(int argc, char **argv) { - strsep(NULL, NULL); + static char *string = "This is a string"; + strsep(&string, "needle"); return 0; } EOF @@ -949,6 +1006,25 @@ if compile_prog "" "" "strcasestr"; then fi echo "strcasestr $strcasestr" +########################################## +# strlcat() probe +strlcat="no" +cat > $TMPC << EOF +#include +int main(int argc, char **argv) +{ + static char dst[64]; + static char *string = "This is a string"; + memset(dst, 0, sizeof(dst)); + strlcat(dst, string, sizeof(dst)); + return 0; +} +EOF +if compile_prog "" "" "strlcat"; then + strlcat="yes" +fi +echo "strlcat $strlcat" + ########################################## # getopt_long_only() probe getopt_long_only="no" @@ -1189,6 +1265,22 @@ if compile_prog "" "" "pwritev"; then fi echo "pwritev/preadv $pwritev" +########################################## +# Check whether we have pwritev2/preadv2 +pwritev2="no" +cat > $TMPC << EOF +#include +#include +int main(int argc, char **argv) +{ + return pwritev2(0, NULL, 1, 0, 0) + preadv2(0, NULL, 1, 0, 0); +} +EOF +if compile_prog "" "" "pwritev2"; then + pwritev2="yes" +fi +echo "pwritev2/preadv2 $pwritev2" + ########################################## # Check whether we have the required functions for ipv6 ipv6="no" @@ -1262,6 +1354,34 @@ fi echo "rbd_invalidate_cache $rbd_inval" fi +########################################## +# check for blkin +rbd_blkin="no" +cat > $TMPC << EOF +#include +#include + +int main(int argc, char **argv) +{ + int r; + struct blkin_trace_info t_info; + blkin_init_trace_info(&t_info); + rbd_completion_t completion; + rbd_image_t image; + uint64_t off; + size_t len; + const char *buf; + r = rbd_aio_write_traced(image, off, len, buf, completion, &t_info); + return 0; +} +EOF +if test "$disable_rbd" != "yes" && test "$disable_rbd_blkin" != "yes" \ + && compile_prog "" "-lrbd -lrados -lblkin" "rbd_blkin"; then + LIBS="-lblkin $LIBS" + rbd_blkin="yes" +fi +echo "rbd blkin tracing $rbd_blkin" + ########################################## # Check whether we have setvbuf setvbuf="no" @@ -1388,6 +1508,10 @@ if test "$libhdfs" = "yes" ; then if test "$hdfs_conf_error" = "1" ; then exit 1 fi + FIO_HDFS_CPU=$cpu + if test "$FIO_HDFS_CPU" = "x86_64" ; then + FIO_HDFS_CPU="amd64" + fi fi echo "HDFS engine $libhdfs" @@ -1395,11 +1519,14 @@ echo "HDFS engine $libhdfs" # Check whether we have MTD mtd="no" cat > $TMPC << EOF +#include #include #include int main(int argc, char **argv) { + struct mtd_write_req ops; struct mtd_info_user info; + memset(&ops, 0, sizeof(ops)); info.type = MTD_MLCNANDFLASH; return ioctl(0, MEMGETINFO, &info); } @@ -1409,11 +1536,16 @@ if compile_prog "" "" "mtd"; then fi echo "MTD $mtd" +########################################## +# Report whether pmemblk engine is enabled +echo "NVML libpmemblk engine $pmemblk" + # Check if we have lex/yacc available yacc="no" yacc_is_bison="no" lex="no" arith="no" +if test "$disable_lex" = "no" || test -z "$disable_lex" ; then if test "$targetos" != "SunOS" ; then LEX=$(which lex 2> /dev/null) if test -x "$LEX" ; then @@ -1450,9 +1582,109 @@ else fi fi fi +fi + +# Check if lex fails using -o +if test "$arith" = "yes" ; then +if test "$force_no_lex_o" = "yes" ; then + lex_use_o="no" +else +$LEX -o lex.yy.c exp/expression-parser.l 2> /dev/null +if test "$?" = "0" ; then + lex_use_o="yes" +else + lex_use_o="no" +fi +fi +fi echo "lex/yacc for arithmetic $arith" +########################################## +# Check whether we have setmntent/getmntent +getmntent="no" +cat > $TMPC << EOF +#include +#include +int main(int argc, char **argv) +{ + FILE *mtab = setmntent(NULL, "r"); + struct mntent *mnt = getmntent(mtab); + endmntent(mtab); + return 0; +} +EOF +if compile_prog "" "" "getmntent"; then + getmntent="yes" +fi +echo "getmntent $getmntent" + +########################################## +# Check whether we have getmntinfo +getmntinfo="no" +cat > $TMPC << EOF +#include +#include +#include +int main(int argc, char **argv) +{ + struct statfs st; + return getmntinfo(&st, MNT_NOWAIT); +} +EOF +if compile_prog "" "" "getmntinfo"; then + getmntinfo="yes" +fi +echo "getmntinfo $getmntinfo" + +########################################## +# Check whether we have _Static_assert +static_assert="no" +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) );}) + +struct foo { + int a, b; +}; + +int main(int argc, char **argv) +{ + _Static_assert(offsetof(struct foo, a) == 0 , "Check"); + return 0 ; +} +EOF +if compile_prog "" "" "static_assert"; then + static_assert="yes" +fi +echo "Static Assert $static_assert" + +########################################## +# Check whether we have bool / stdbool.h +have_bool="no" +cat > $TMPC << EOF +#include +int main(int argc, char **argv) +{ + bool var = true; + return var != false; +} +EOF +if compile_prog "" "" "bool"; then + have_bool="yes" +fi +echo "bool $have_bool" + ############################################################################# if test "$wordsize" = "64" ; then @@ -1509,6 +1741,9 @@ fi if test "$clock_monotonic_precise" = "yes" ; then output_sym "CONFIG_CLOCK_MONOTONIC_PRECISE" fi +if test "$clockid_t" = "yes"; then + output_sym "CONFIG_CLOCKID_T" +fi if test "$gettimeofday" = "yes" ; then output_sym "CONFIG_GETTIMEOFDAY" fi @@ -1526,6 +1761,9 @@ fi if test "$strcasestr" = "yes" ; then output_sym "CONFIG_STRCASESTR" fi +if test "$strlcat" = "yes" ; then + output_sym "CONFIG_STRLCAT" +fi if test "$getopt_long_only" = "yes" ; then output_sym "CONFIG_GETOPT_LONG_ONLY" fi @@ -1584,6 +1822,9 @@ fi if test "$pwritev" = "yes" ; then output_sym "CONFIG_PWRITEV" fi +if test "$pwritev2" = "yes" ; then + output_sym "CONFIG_PWRITEV2" +fi if test "$ipv6" = "yes" ; then output_sym "CONFIG_IPV6" fi @@ -1593,6 +1834,9 @@ fi if test "$rbd_inval" = "yes" ; then output_sym "CONFIG_RBD_INVAL" fi +if test "$rbd_blkin" = "yes" ; then + output_sym "CONFIG_RBD_BLKIN" +fi if test "$setvbuf" = "yes" ; then output_sym "CONFIG_SETVBUF" fi @@ -1611,6 +1855,7 @@ if test "$gf_trim" = "yes" ; then fi if test "$libhdfs" = "yes" ; then output_sym "CONFIG_LIBHDFS" + echo "FIO_HDFS_CPU=$FIO_HDFS_CPU" >> $config_host_mak echo "JAVA_HOME=$JAVA_HOME" >> $config_host_mak echo "FIO_LIBHDFS_INCLUDE=$FIO_LIBHDFS_INCLUDE" >> $config_host_mak echo "FIO_LIBHDFS_LIB=$FIO_LIBHDFS_LIB" >> $config_host_mak @@ -1618,6 +1863,9 @@ if test "$libhdfs" = "yes" ; then if test "$mtd" = "yes" ; then output_sym "CONFIG_MTD" fi +if test "$pmemblk" = "yes" ; then + output_sym "CONFIG_PMEMBLK" +fi if test "$arith" = "yes" ; then output_sym "CONFIG_ARITHMETIC" if test "$yacc_is_bison" = "yes" ; then @@ -1625,6 +1873,21 @@ if test "$arith" = "yes" ; then else echo "YACC=$YACC" >> $config_host_mak fi + if test "$lex_use_o" = "yes" ; then + echo "CONFIG_LEX_USE_O=y" >> $config_host_mak + fi +fi +if test "$getmntent" = "yes" ; then + output_sym "CONFIG_GETMNTENT" +fi +if test "$getmntinfo" = "yes" ; then + output_sym "CONFIG_GETMNTINFO" +fi +if test "$static_assert" = "yes" ; then + output_sym "CONFIG_STATIC_ASSERT" +fi +if test "$have_bool" = "yes" ; then + output_sym "CONFIG_HAVE_BOOL" fi if test "$zlib" = "no" ; then @@ -1638,3 +1901,10 @@ echo "LDFLAGS+=$LDFLAGS" >> $config_host_mak echo "CC=$cc" >> $config_host_mak echo "BUILD_CFLAGS=$BUILD_CFLAGS $CFLAGS" >> $config_host_mak echo "INSTALL_PREFIX=$prefix" >> $config_host_mak + +if [ `dirname $0` != "." -a ! -e Makefile ]; then + cat > Makefile <