From: Vincent Bernat <vincent@bernat.im>
Date: Mon, 17 Nov 2014 09:35:16 +0000 (+0100)
Subject: libstatgrab: only use one configure test for 0.90 API change
X-Git-Tag: collectd-5.5.0~146^2
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=36841c62f07f1694a451fa7b54497de663331914;p=collectd.git

libstatgrab: only use one configure test for 0.90 API change

Previously, each API change was tested in configure.ac. Some of the
tests are relying on signature checks and would need to have -Werror
flag enabled to make them work. This is quite fragile.

Instead, we assume that if `sg_init()` requires an argument, we must use
the 0.90 API.

Fixes: #795
---

diff --git a/configure.ac b/configure.ac
index 6ac2554c..d9a6b67e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4143,8 +4143,8 @@ then
   CFLAGS="$CFLAGS $with_libstatgrab_cflags"
   LDFLAGS="$LDFLAGS $with_libstatgrab_ldflags"
 
-  AC_CACHE_CHECK([if sg_init() requires an argument],
-          [c_cv_have_libstatgrab_init_arg],
+  AC_CACHE_CHECK([if libstatgrab >= 0.90],
+          [c_cv_have_libstatgrab_0_90],
           AC_LINK_IFELSE([AC_LANG_PROGRAM(
 [[[
 #include <stdio.h>
@@ -4154,42 +4154,8 @@ then
       if (sg_init()) return 0;
 ]]]
     )],
-    [c_cv_have_libstatgrab_init_arg="no"],
-    [c_cv_have_libstatgrab_init_arg="yes"]
-          )
-  )
-
-  AC_CACHE_CHECK([if sg_get_user_stats() requires an argument],
-          [c_cv_have_libstatgrab_get_user_stats_arg],
-          AC_LINK_IFELSE([AC_LANG_PROGRAM(
-[[[
-#include <stdio.h>
-#include <statgrab.h>
-]]],
-[[[
-      if (sg_get_user_stats()) return 0;
-]]]
-    )],
-    [c_cv_have_libstatgrab_get_user_stats_arg="no"],
-    [c_cv_have_libstatgrab_get_user_stats_arg="yes"]
-          )
-  )
-
-  AC_CACHE_CHECK([if sg_disk_io_stats() uses size_t],
-          [c_cv_have_libstatgrab_get_disk_io_stats_sizet],
-          AC_LINK_IFELSE([AC_LANG_PROGRAM(
-[[[
-#include <stdio.h>
-#include <statgrab.h>
-]]],
-[[[
-      sg_disk_io_stats *(*ptr) (size_t *);
-      ptr = sg_get_disk_io_stats;
-      if (ptr != NULL) return 0;
-]]]
-    )],
-    [c_cv_have_libstatgrab_get_disk_io_stats_sizet="yes"],
-    [c_cv_have_libstatgrab_get_disk_io_stats_sizet="no"]
+    [c_cv_have_libstatgrab_0_90="no"],
+    [c_cv_have_libstatgrab_0_90="yes"]
           )
   )
 
@@ -4205,17 +4171,9 @@ then
   BUILD_WITH_LIBSTATGRAB_LDFLAGS="$with_libstatgrab_ldflags"
   AC_SUBST(BUILD_WITH_LIBSTATGRAB_CFLAGS)
   AC_SUBST(BUILD_WITH_LIBSTATGRAB_LDFLAGS)
-  if test "x$c_cv_have_libstatgrab_init_arg" = "xyes"
-  then
-        AC_DEFINE(HAVE_LIBSTATGRAB_INIT_ARG, 1, [Define to 1 if sg_init does require an argument])
-  fi
-  if test "x$c_cv_have_libstatgrab_get_user_stats_arg" = "xyes"
-  then
-        AC_DEFINE(HAVE_LIBSTATGRAB_GET_USER_STATS_ARG, 1, [Define to 1 if sg_get_user_stats does require an argument])
-  fi
-  if test "x$c_cv_have_libstatgrab_get_disk_io_stats_sizet" = "xyes"
+  if test "x$c_cv_have_libstatgrab_0_90" = "xyes"
   then
-        AC_DEFINE(HAVE_LIBSTATGRAB_GET_DISK_IO_STATS_SIZET, 1, [Define to 1 if sg_get_disk_io_stats does require pointer to size_t as an argument])
+        AC_DEFINE(HAVE_LIBSTATGRAB_0_90, 1, [Define to 1 if libstatgrab version >= 0.90])
   fi
 fi
 # }}}
diff --git a/src/daemon/collectd.c b/src/daemon/collectd.c
index 9cba9132..309af1ba 100644
--- a/src/daemon/collectd.c
+++ b/src/daemon/collectd.c
@@ -309,7 +309,7 @@ static int do_init (void)
 
 #if HAVE_LIBSTATGRAB
 	if (sg_init (
-# if HAVE_LIBSTATGRAB_INIT_ARG
+# if HAVE_LIBSTATGRAB_0_90
 		    0
 # endif
 		    ))
diff --git a/src/disk.c b/src/disk.c
index 51fbc025..0d4c2bf0 100644
--- a/src/disk.c
+++ b/src/disk.c
@@ -831,7 +831,7 @@ static int disk_read (void)
 
 #elif defined(HAVE_LIBSTATGRAB)
 	sg_disk_io_stats *ds;
-# if HAVE_LIBSTATGRAB_GET_DISK_IO_STATS_SIZET
+# if HAVE_LIBSTATGRAB_0_90
 	size_t disks;
 # else
 	int disks;
diff --git a/src/users.c b/src/users.c
index 40ffece1..10f34ee9 100644
--- a/src/users.c
+++ b/src/users.c
@@ -102,7 +102,7 @@ static int users_read (void)
 #elif HAVE_LIBSTATGRAB
 	sg_user_stats *us;
 
-# if HAVE_LIBSTATGRAB_GET_USER_STATS_ARG
+# if HAVE_LIBSTATGRAB_0_90
 	size_t num_entries;
 	us = sg_get_user_stats (&num_entries);
 # else
@@ -112,7 +112,7 @@ static int users_read (void)
 		return (-1);   
 
 	users_submit ((gauge_t)
-# if HAVE_LIBSTATGRAB_GET_USER_STATS_ARG
+# if HAVE_LIBSTATGRAB_0_90
 		      num_entries);
 # else
 		      us->num_entries);