From: Vincent Brillault <git@lerya.net>
Date: Thu, 19 Jun 2014 22:06:42 +0000 (+0200)
Subject: Include turbostat plugin during compilation
X-Git-Tag: collectd-5.5.0~24^2~85
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=4f79fc14cfa00e5b96447802c1926ed4ec942271;p=collectd.git

Include turbostat plugin during compilation
---

diff --git a/AUTHORS b/AUTHORS
index b35f35f2..00812226 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -274,6 +274,9 @@ Tommie Gannert <d00-tga at d.kth.se>
 Vincent Bernat <vincent at bernat.im>
  - smart plugin.
 
+Vincent Brillault <git at lerya.net>
+ - turbostat plugin, based on Len Brown <len.brown at intel.com> kernel tool
+
 Vincent Stehlé <vincent.stehle at free.fr>
  - hddtemp plugin.
 
diff --git a/README b/README
index c2c08733..133c034c 100644
--- a/README
+++ b/README
@@ -342,6 +342,10 @@ Features
       Reads the number of records and file size from a running Tokyo Tyrant
       server.
 
+    - turbostat
+      Reads CPU frequency and C-state residency on modern Intel
+      turbo-capable processors.
+
     - uptime
       System uptime statistics.
 
diff --git a/configure.ac b/configure.ac
index f2d7ebdb..0f9f33be 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5135,6 +5135,7 @@ plugin_tape="no"
 plugin_tcpconns="no"
 plugin_ted="no"
 plugin_thermal="no"
+plugin_turbostat="no"
 plugin_uptime="no"
 plugin_users="no"
 plugin_virt="no"
@@ -5170,6 +5171,7 @@ then
 	plugin_swap="yes"
 	plugin_tcpconns="yes"
 	plugin_thermal="yes"
+	plugin_turbostat="yes"
 	plugin_uptime="yes"
 	plugin_vmem="yes"
 	plugin_vserver="yes"
@@ -5568,6 +5570,7 @@ AC_PLUGIN([ted],         [$plugin_ted],        [Read The Energy Detective values
 AC_PLUGIN([thermal],     [$plugin_thermal],    [Linux ACPI thermal zone statistics])
 AC_PLUGIN([threshold],   [yes],                [Threshold checking plugin])
 AC_PLUGIN([tokyotyrant], [$with_libtokyotyrant],  [TokyoTyrant database statistics])
+AC_PLUGIN([turbostat],   [$plugin_turbostat],  [Advanced statistic on Intel cpu states])
 AC_PLUGIN([unixsock],    [yes],                [Unixsock communication plugin])
 AC_PLUGIN([uptime],      [$plugin_uptime],     [Uptime statistics])
 AC_PLUGIN([users],       [$plugin_users],      [User statistics])
@@ -5938,6 +5941,7 @@ Configuration:
     thermal . . . . . . . $enable_thermal
     threshold . . . . . . $enable_threshold
     tokyotyrant . . . . . $enable_tokyotyrant
+    turbostat . . . . . . $enable_turbostat
     unixsock  . . . . . . $enable_unixsock
     uptime  . . . . . . . $enable_uptime
     users . . . . . . . . $enable_users
diff --git a/src/Makefile.am b/src/Makefile.am
index 004fc94b..6a5c53ab 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1060,6 +1060,14 @@ tokyotyrant_la_LIBADD += -lsocket
 endif
 endif
 
+if BUILD_PLUGIN_TURBOSTAT
+pkglib_LTLIBRARIES += turbostat.la
+turbostat_la_SOURCES = turbostat.c
+turbostat_la_LDFLAGS = -module -avoid-version
+collectd_LDADD += "-dlopen" turbostat.la
+collectd_DEPENDENCIES += turbostat.la
+endif
+
 if BUILD_PLUGIN_UNIXSOCK
 pkglib_LTLIBRARIES += unixsock.la
 unixsock_la_SOURCES = unixsock.c \
diff --git a/src/collectd.conf.in b/src/collectd.conf.in
index 34cd24f8..ec17e45d 100644
--- a/src/collectd.conf.in
+++ b/src/collectd.conf.in
@@ -185,6 +185,7 @@
 #@BUILD_PLUGIN_TED_TRUE@LoadPlugin ted
 #@BUILD_PLUGIN_THERMAL_TRUE@LoadPlugin thermal
 #@BUILD_PLUGIN_TOKYOTYRANT_TRUE@LoadPlugin tokyotyrant
+#@BUILD_PLUGIN_TURBOSTAT_TRUE@LoadPlugin turbostat
 #@BUILD_PLUGIN_UNIXSOCK_TRUE@LoadPlugin unixsock
 #@BUILD_PLUGIN_UPTIME_TRUE@LoadPlugin uptime
 #@BUILD_PLUGIN_USERS_TRUE@LoadPlugin users