Merge pull request #1163 from rubenk/fix-data-race-in-df-and-cgroup-plugins

utils_mount: use reentrant getmntent_r when we can

diff --combined configure.ac
index 3f5f2d8,6a664e6..606c4ef
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -4,11 -4,6 +4,11 @@@ AC_CONFIG_SRCDIR(src/
  AC_CONFIG_HEADERS(src/config.h)
  AC_CONFIG_AUX_DIR([libltdl/config])
  
 +dnl older automake's default of ARFLAGS=cru is noisy on newer binutils;
 +dnl we don't really need the 'u' even in older toolchains.  Then there is
 +dnl older libtool, which spelled it AR_FLAGS
 +m4_divert_text([DEFAULTS], [: "${ARFLAGS=cr} ${AR_FLAGS=cr}"])
 +
  m4_ifdef([LT_PACKAGE_VERSION],
        # libtool >= 2.2
        [
@@@ -29,8 -24,6 +29,8 @@@
        ]
  )
  
 +AM_CONDITIONAL([BUILD_INCLUDED_LTDL], [test "x$LTDLDEPS" != "x"])
 +
  AM_INIT_AUTOMAKE([tar-pax dist-bzip2 foreign])
  m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
  AC_LANG(C)
@@@ -97,12 -90,12 +97,12 @@@ case $host_os i
  esac
  AC_MSG_RESULT([$ac_system])
  
 -AM_CONDITIONAL([BUILD_LINUX],[test "x$x$ac_system" = "xLinux"])
 -AM_CONDITIONAL([BUILD_SOLARIS],[test "x$x$ac_system" = "xSolaris"])
 -AM_CONDITIONAL([BUILD_DARWIN],[test "x$x$ac_system" = "xDarwin"])
 -AM_CONDITIONAL([BUILD_OPENBSD],[test "x$x$ac_system" = "xOpenBSD"])
 -AM_CONDITIONAL([BUILD_AIX],[test "x$x$ac_system" = "xAIX"])
 -AM_CONDITIONAL([BUILD_FREEBSD],[test "x$x$ac_system" = "xFreeBSD"])
 +AM_CONDITIONAL([BUILD_LINUX],[test "x$ac_system" = "xLinux"])
 +AM_CONDITIONAL([BUILD_SOLARIS],[test "x$ac_system" = "xSolaris"])
 +AM_CONDITIONAL([BUILD_DARWIN],[test "x$ac_system" = "xDarwin"])
 +AM_CONDITIONAL([BUILD_OPENBSD],[test "x$ac_system" = "xOpenBSD"])
 +AM_CONDITIONAL([BUILD_AIX],[test "x$ac_system" = "xAIX"])
 +AM_CONDITIONAL([BUILD_FREEBSD],[test "x$ac_system" = "xFreeBSD"])
  
  if test "x$ac_system" = "xLinux"
  then
@@@ -639,9 -632,6 +639,9 @@@ AC_CHECK_HEADERS(net/pfvar.h
  #if HAVE_NET_IF_H
  # include <net/if.h>
  #endif
 +#if HAVE_NETINET_IN_H
 +# include <netinet/in.h>
 +#endif
  ])
  
  # For the multimeter plugin
@@@ -1254,6 -1244,8 +1254,8 @@@ have_getvfsstat="no
  AC_CHECK_FUNCS(getvfsstat, [have_getvfsstat="yes"])
  have_listmntent="no"
  AC_CHECK_FUNCS(listmntent, [have_listmntent="yes"])
+ have_getmntent_r="no"
+ AC_CHECK_FUNCS(getmntent_r, [have_getmntent_r="yes"])
  
  have_getmntent="no"
  AC_CHECK_FUNCS(getmntent, [have_getmntent="c"])
@@@ -1925,33 -1917,30 +1927,33 @@@ AC_ARG_WITH(libganglia, [AS_HELP_STRING
         GANGLIA_LDFLAGS="-L$withval/lib"
         with_libganglia="yes"
   else
 -       with_libganglia_config="ganglia-config"
         with_libganglia="$withval"
   fi; fi; fi
  ],
  [
 - with_libganglia_config="ganglia-config"
   with_libganglia="yes"
  ])
  
 -if test "x$with_libganglia" = "xyes" && test "x$with_libganglia_config" != "x"
 +if test "x$with_libganglia" = "xyes"
  then
 -      if test "x$GANGLIA_CPPFLAGS" = "x"
 +      if test "x$with_libganglia_config" != "x"
        then
 -              GANGLIA_CPPFLAGS=`"$with_libganglia_config" --cflags 2>/dev/null`
 -      fi
 +              if test "x$GANGLIA_CPPFLAGS" = "x"
 +              then
 +                      GANGLIA_CPPFLAGS=`"$with_libganglia_config" --cflags 2>/dev/null`
 +              fi
  
 -      if test "x$GANGLIA_LDFLAGS" = "x"
 -      then
 -              GANGLIA_LDFLAGS=`"$with_libganglia_config" --ldflags 2>/dev/null`
 -      fi
 +              if test "x$GANGLIA_LDFLAGS" = "x"
 +              then
 +                      GANGLIA_LDFLAGS=`"$with_libganglia_config" --ldflags 2>/dev/null`
 +              fi
  
 -      if test "x$GANGLIA_LIBS" = "x"
 -      then
 -              GANGLIA_LIBS=`"$with_libganglia_config" --libs 2>/dev/null`
 +              if test "x$GANGLIA_LIBS" = "x"
 +              then
 +                      GANGLIA_LIBS=`"$with_libganglia_config" --libs 2>/dev/null`
 +              fi
 +      else
 +              GANGLIA_LIBS="-lganglia"
        fi
  fi
  
@@@ -2575,7 -2564,7 +2577,7 @@@ the
        SAVE_CPPFLAGS="$CPPFLAGS"
        CPPFLAGS="$CPPFLAGS $with_libmodbus_cflags"
  
 -      AC_CHECK_HEADERS(modbus/modbus.h, [], [with_libmodbus="no (modbus/modbus.h not found)"])
 +      AC_CHECK_HEADERS(modbus.h, [], [with_libmodbus="no (modbus.h not found)"])
  
        CPPFLAGS="$SAVE_CPPFLAGS"
  fi
@@@ -2741,7 -2730,7 +2743,7 @@@ AC_ARG_WITH(libmysql, [AS_HELP_STRING([
  ])
  if test "x$with_libmysql" = "xyes"
  then
 -      with_mysql_cflags=`$with_mysql_config --cflags 2>/dev/null`
 +      with_mysql_cflags=`$with_mysql_config --include 2>/dev/null`
        mysql_config_status=$?
  
        if test $mysql_config_status -ne 0
@@@ -2777,17 -2766,15 +2779,17 @@@ the
        then
                with_libmysql="no ($with_mysql_config failed)"
        else
 -              AC_CHECK_LIB(mysqlclient, mysql_init,
 -               [with_libmysql="yes"],
 -               [with_libmysql="no (symbol 'mysql_init' not found)"],
 -               [$with_mysql_libs])
 -
 -              AC_CHECK_LIB(mysqlclient, mysql_get_server_version,
 +              SAVE_CPPFLAGS="$CPPFLAGS"
 +              CPPFLAGS="$CPPFLAGS $with_mysql_cflags"
 +              SAVE_LIBS="$LIBS"
 +              LIBS="$with_mysql_libs"
 +              AC_SEARCH_LIBS([mysql_get_server_version],
 +               [],
                 [with_libmysql="yes"],
                 [with_libmysql="no (symbol 'mysql_get_server_version' not found)"],
 -               [$with_mysql_libs])
 +               [])
 +              CPPFLAGS="$SAVE_CPPFLAGS"
 +              LIBS="$SAVE_LIBS"
        fi
  fi
  if test "x$with_libmysql" = "xyes"
@@@ -3307,6 -3294,11 +3309,6 @@@ the
  fi
  if test "x$with_libpcap" = "xyes"
  then
 -      AC_CHECK_HEADERS(pcap-bpf.h,,
 -                       [with_libpcap="no (pcap-bpf.h not found)"])
 -fi
 -if test "x$with_libpcap" = "xyes"
 -then
        AC_CACHE_CHECK([whether libpcap has PCAP_ERROR_IFACE_NOT_UP],
                       [c_cv_libpcap_have_pcap_error_iface_not_up],
                       AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
@@@ -4848,11 -4840,11 +4850,11 @@@ the
  
        CPPFLAGS="$CPPFLAGS $with_libvarnish_cflags"
  
 -      AC_CHECK_HEADERS(varnish/vapi/vsc.h,
 +      AC_CHECK_HEADERS(vapi/vsc.h,
                [AC_DEFINE([HAVE_VARNISH_V4], [1], [Varnish 4 API support])],
 -              [AC_CHECK_HEADERS(varnish/vsc.h,
 +              [AC_CHECK_HEADERS(vsc.h,
                        [AC_DEFINE([HAVE_VARNISH_V3], [1], [Varnish 3 API support])],
 -                      [AC_CHECK_HEADERS(varnish/varnishapi.h,
 +                      [AC_CHECK_HEADERS(varnishapi.h,
                                [AC_DEFINE([HAVE_VARNISH_V2], [1], [Varnish 2 API support])],
                                [with_libvarnish="no (found none of the varnish header files)"])])])
  
@@@ -5251,7 -5243,6 +5253,7 @@@ collectd features:]
  AC_COLLECTD([debug],     [enable],  [feature], [debugging])
  AC_COLLECTD([daemon],    [disable], [feature], [daemon mode])
  AC_COLLECTD([getifaddrs],[enable],  [feature], [getifaddrs under Linux])
 +AC_COLLECTD([werror],    [disable], [feature], [building with -Werror])
  
  dependency_warning="no"
  dependency_error="no"
@@@ -5273,7 -5264,6 +5275,7 @@@ plugin_disk="no
  plugin_drbd="no"
  plugin_entropy="no"
  plugin_ethstat="no"
 +plugin_fhcount="no"
  plugin_fscache="no"
  plugin_interface="no"
  plugin_ipmi="no"
@@@ -5317,7 -5307,6 +5319,7 @@@ the
        plugin_disk="yes"
        plugin_drbd="yes"
        plugin_entropy="yes"
 +      plugin_fhcount="yes"
        plugin_fscache="yes"
        plugin_interface="yes"
        plugin_ipc="yes"
@@@ -5365,16 -5354,15 +5367,16 @@@ f
  
  if test "x$ac_system" = "xAIX"
  then
 -        plugin_tcpconns="yes"
 -        plugin_ipc="yes"
 +      plugin_tcpconns="yes"
 +      plugin_ipc="yes"
  fi
  
  # FreeBSD
  
  if test "x$ac_system" = "xFreeBSD"
  then
 -        plugin_zfs_arc="yes"
 +      plugin_disk="yes"
 +      plugin_zfs_arc="yes"
  fi
  
  
@@@ -5515,6 -5503,11 +5517,11 @@@ the
        plugin_df="yes"
  fi
  
+ if test "x$c_cv_have_getmntent_r" = "xyes"
+ then
+       plugin_df="yes"
+ fi
+ 
  # Df plugin: Check if we have either `statfs' or `statvfs' second.
  if test "x$plugin_df" = "xyes"
  then
@@@ -5663,7 -5656,7 +5670,7 @@@ AC_PLUGIN([email],       [yes]
  AC_PLUGIN([entropy],     [$plugin_entropy],    [Entropy statistics])
  AC_PLUGIN([ethstat],     [$plugin_ethstat],    [Stats from NIC driver])
  AC_PLUGIN([exec],        [yes],                [Execution of external programs])
 -AC_PLUGIN([fhcount],     [yes],                [File handles statistics])
 +AC_PLUGIN([fhcount],     [$plugin_fhcount],    [File handles statistics])
  AC_PLUGIN([filecount],   [yes],                [Count files in directories])
  AC_PLUGIN([fscache],     [$plugin_fscache],    [fscache statistics])
  AC_PLUGIN([gmond],       [$with_libganglia],   [Ganglia plugin])
@@@ -5921,13 -5914,6 +5928,13 @@@ AC_SUBST(LCC_VERSION_STRING
  
  AC_CONFIG_FILES(src/libcollectdclient/collectd/lcc_features.h)
  
 +AM_CFLAGS="-Wall"
 +if test "x$enable_werror" != "xno"
 +then
 +        AM_CFLAGS="$AM_CFLAGS -Werror"
 +fi
 +AC_SUBST([AM_CFLAGS])
 +
  AC_CONFIG_FILES([Makefile src/Makefile src/daemon/Makefile src/collectd.conf src/libcollectdclient/Makefile src/libcollectdclient/libcollectdclient.pc src/liboconfig/Makefile bindings/Makefile bindings/java/Makefile])
  AC_OUTPUT
  
@@@ -5958,17 -5944,6 +5965,17 @@@ f
  cat <<EOF;
  
  Configuration:
 +  Build:
 +    Platform  . . . . . . $ac_system
 +    CC  . . . . . . . . . $CC
 +    CFLAGS  . . . . . . . $AM_CFLAGS $CFLAGS
 +    CPP . . . . . . . . . $CPP
 +    CPPFLAGS  . . . . . . $CPPFLAGS
 +    LD  . . . . . . . . . $LD
 +    LDFLAGS . . . . . . . $LDFLAGS
 +    YACC  . . . . . . . . $YACC
 +    YFLAGS  . . . . . . . $YFLAGS
 +
    Libraries:
      intel mic . . . . . . $with_mic
      libaquaero5 . . . . . $with_libaquaero5