From: Jens Axboe <axboe@kernel.dk>
Date: Fri, 31 May 2019 21:37:18 +0000 (-0600)
Subject: Merge branch 'wip-tcmalloc' of https://github.com/dillaman/fio
X-Git-Tag: fio-3.15~7
X-Git-Url: https://git.kernel.dk/?p=fio.git;a=commitdiff_plain;h=971341ad741db8d2ae57d8f9b368d75f6c02c1a9;hp=-c

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

* 'wip-tcmalloc' of https://github.com/dillaman/fio:
  configure: attempt to link against tcmalloc by default if available
---

971341ad741db8d2ae57d8f9b368d75f6c02c1a9
diff --combined configure
index 383175ae,dd1ec6f2..a0692d58
--- a/configure
+++ b/configure
@@@ -207,6 -207,8 +207,8 @@@ for opt d
    ;;
    --enable-libiscsi) libiscsi="yes"
    ;;
+   --disable-tcmalloc) disable_tcmalloc="yes"
+   ;;
    --help)
      show_help="yes"
      ;;
@@@ -243,6 -245,7 +245,7 @@@ if test "$show_help" = "yes" ; the
    echo "--disable-native        Don't build for native host"
    echo "--with-ime=             Install path for DDN's Infinite Memory Engine"
    echo "--enable-libiscsi       Enable iscsi support"
+   echo "--disable-tcmalloc	Disable tcmalloc support"
    exit $exit_val
  fi
  
@@@ -1344,30 -1347,31 +1347,30 @@@ int main(void
    return GTK_CHECK_VERSION(2, 18, 0) ? 0 : 1; /* 0 on success */
  }
  EOF
 -GTK_CFLAGS=$(pkg-config --cflags gtk+-2.0 gthread-2.0)
 +GTK_CFLAGS=$(${cross_prefix}pkg-config --cflags gtk+-2.0 gthread-2.0)
  ORG_LDFLAGS=$LDFLAGS
  LDFLAGS=$(echo $LDFLAGS | sed s/"-static"//g)
  if test "$?" != "0" ; then
    echo "configure: gtk and gthread not found"
    exit 1
  fi
 -GTK_LIBS=$(pkg-config --libs gtk+-2.0 gthread-2.0)
 +GTK_LIBS=$(${cross_prefix}pkg-config --libs gtk+-2.0 gthread-2.0)
  if test "$?" != "0" ; then
    echo "configure: gtk and gthread not found"
    exit 1
  fi
 -if compile_prog "$GTK_CFLAGS" "$GTK_LIBS" "gfio" ; then
 -  $TMPE
 -  if test "$?" = "0" ; then
 +if ! ${cross_prefix}pkg-config --atleast-version 2.18.0 gtk+-2.0; then
 +  echo "GTK found, but need version 2.18 or higher"
 +  gfio="no"
 +else
 +  if compile_prog "$GTK_CFLAGS" "$GTK_LIBS" "gfio" ; then
      gfio="yes"
      GFIO_LIBS="$LIBS $GTK_LIBS"
      CFLAGS="$CFLAGS $GTK_CFLAGS"
    else
 -    echo "GTK found, but need version 2.18 or higher"
 +    echo "Please install gtk and gdk libraries"
      gfio="no"
    fi
 -else
 -  echo "Please install gtk and gdk libraries"
 -  gfio="no"
  fi
  LDFLAGS=$ORG_LDFLAGS
  fi
@@@ -2695,6 -2699,19 +2698,19 @@@ if test "$libiscsi" = "yes" ; the
    echo "LIBISCSI_CFLAGS=$libiscsi_cflags" >> $config_host_mak
    echo "LIBISCSI_LIBS=$libiscsi_libs" >> $config_host_mak
  fi
+ cat > $TMPC << EOF
+ int main(int argc, char **argv)
+ {
+   return 0;
+ }
+ EOF
+ if test "$disable_tcmalloc" != "yes"  && compile_prog "" "-ltcmalloc" "tcmalloc"; then
+   LIBS="-ltcmalloc $LIBS"
+   tcmalloc="yes"
+ else
+   tcmalloc="no"
+ fi
+ print_config "TCMalloc support" "$tcmalloc"
  
  echo "LIBS+=$LIBS" >> $config_host_mak
  echo "GFIO_LIBS+=$GFIO_LIBS" >> $config_host_mak