Merge branch 'master' of git://github.com/rootfs/fio

Signed-off-by: Jens Axboe <axboe@fb.com>
Conflicts:
	configure

diff --cc Makefile
Simple merge

diff --cc configure
index 2ba1dafea0f8a4e52181e34cba3a0e014d26afcd,063ccab429b4002b308227415d7663455666734c..d37e8b4bd505de82835702a21c39d0b0ea75349b
--- 1/configure
--- 2/configure
+++ b/configure
@@@ -1148,53 -1164,45 +1148,92 @@@ f
  echo "Rados Block Device engine     $rbd"
  
  ##########################################
 +# Check whether we have setvbuf
 +setvbuf="no"
 +cat > $TMPC << EOF
 +#include <stdio.h>
 +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 <glusterfs/api/glfs.h>
+ 
+ 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 <glusterfs/api/glfs.h>
+ 
+ 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
@@@ -1319,13 -1327,15 +1358,19 @@@ f
  if test "$rbd" = "yes" ; then
    output_sym "CONFIG_RBD"
  fi
 -if test "$cpu_count" = "yes" ; then
 -  output_sym "CONFIG_CPU_COUNT"
 +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

diff --cc fio.1
Simple merge

diff --cc options.c
Simple merge