Merge branch 'wip-rbd-engine' of https://github.com/dillaman/fio

* 'wip-rbd-engine' of https://github.com/dillaman/fio:
  rbd: remove support for blkin tracing
  rbd: fixed busy-loop when using eventfd polling

diff --combined configure
index eb673adc22c083fc59ec7184f473d7776fed9684,18f308e2933a9eeb89c46950c8b906a7af7f7461..589ff3feb88b3b750c33ecd227ed86d75448d274
--- 1/configure
--- 2/configure
+++ b/configure
@@@ -145,7 -145,6 +145,7 @@@ devdax="no
  pmem="no"
  disable_lex=""
  disable_pmem="no"
 +disable_native="no"
  prefix=/usr/local
  
  # parse options
@@@ -178,8 -177,6 +178,6 @@@ for opt d
    ;;
    --disable-rbd) disable_rbd="yes"
    ;;
-   --disable-rbd-blkin) disable_rbd_blkin="yes"
-   ;;
    --disable-gfapi) disable_gfapi="yes"
    ;;
    --enable-libhdfs) libhdfs="yes"
@@@ -196,8 -193,6 +194,8 @@@
    ;;
    --enable-cuda) enable_cuda="yes"
    ;;
 +  --disable-native) disable_native="yes"
 +  ;;
    --help)
      show_help="yes"
      ;;
@@@ -227,7 -222,6 +225,7 @@@ if test "$show_help" = "yes" ; the
    echo "--disable-shm           Disable SHM support"
    echo "--disable-optimizations Don't enable compiler optimizations"
    echo "--enable-cuda           Enable GPUDirect RDMA support"
 +  echo "--disable-native        Don't build for native host"
    exit $exit_val
  fi
  
@@@ -1632,36 -1626,6 +1630,6 @@@ f
  print_config "rbd_invalidate_cache" "$rbd_inval"
  fi
  
- ##########################################
- # check for blkin
- if test "$rbd_blkin" != "yes" ; then
-   rbd_blkin="no"
- fi
- cat > $TMPC << EOF
- #include <rbd/librbd.h>
- #include <zipkin_c.h>
- 
- 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
- print_config "rbd blkin tracing" "$rbd_blkin"
- 
  ##########################################
  # Check whether we have setvbuf
  if test "$setvbuf" != "yes" ; then
@@@ -2135,20 -2099,6 +2103,20 @@@ if compile_prog "" "" "mkdir(a, b)"; th
  fi
  print_config "mkdir(a, b)" "$mkdir_two"
  
 +##########################################
 +# check for cc -march=native
 +build_native="no"
 +cat > $TMPC << EOF
 +int main(int argc, char **argv)
 +{
 +  return 0;
 +}
 +EOF
 +if test "$disable_native" = "no" && compile_prog "-march=native" "" "march=native"; then
 +  build_native="yes"
 +fi
 +print_config "Build march=native" "$build_native"
 +
  #############################################################################
  
  if test "$wordsize" = "64" ; then
@@@ -2313,9 -2263,6 +2281,6 @@@ f
  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
@@@ -2395,9 -2342,6 +2360,9 @@@ f
  if test "$mkdir_two" = "yes" ; then
    output_sym "CONFIG_HAVE_MKDIR_TWO"
  fi
 +if test "$build_native" = "yes" ; then
 +  output_sym "CONFIG_BUILD_NATIVE"
 +fi
  
  echo "LIBS+=$LIBS" >> $config_host_mak
  echo "GFIO_LIBS+=$GFIO_LIBS" >> $config_host_mak