X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fvserver.c;h=7b83c6174a830a0da933f4bd0c90f1c1180b67a3;hb=939a113b288dfdee7df2263c682d27d7146c6013;hp=2e3906097a1882bf1d0d1bc2acf910aed9534965;hpb=dc80c73c20ef0e69c3850fd9679a827ad79e61a1;p=collectd.git

diff --git a/src/vserver.c b/src/vserver.c
index 2e390609..7b83c617 100644
--- a/src/vserver.c
+++ b/src/vserver.c
@@ -4,8 +4,7 @@
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2 of the License, or (at your
- * option) any later version.
+ * Free Software Foundation; only version 2 of the license is applicable.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -29,69 +28,12 @@
 
 #define BUFSIZE 512
 
-#define MODULE_NAME "vserver"
 #define PROCDIR "/proc/virtual"
 
-#if defined(KERNEL_LINUX)
-# define VSERVER_HAVE_READ 1
-#else
-# define VSERVER_HAVE_READ 0
-#endif /* defined(KERNEL_LINUX) */
+#if !KERNEL_LINUX
+# error "No applicable input method."
+#endif
 
-static data_source_t octets_dsrc[2] =
-{
-	{"rx", DS_TYPE_COUNTER, 0, 4294967295.0},
-	{"tx", DS_TYPE_COUNTER, 0, 4294967295.0}
-};
-
-static data_set_t octets_ds =
-{
-	"if_octets", 2, octets_dsrc
-};
-
-static data_source_t load_dsrc[3] =
-{
-	{"shortterm", DS_TYPE_GAUGE, 0.0, 100.0},
-	{"midterm",   DS_TYPE_GAUGE, 0.0, 100.0},
-	{"longterm",  DS_TYPE_GAUGE, 0.0, 100.0}
-};
-
-static data_set_t load_ds =
-{
-	"load", 3, load_dsrc
-};
-
-static data_source_t threads_dsrc[1] =
-{
-	{"value", DS_TYPE_GAUGE, 0.0, 65535.0}
-};
-
-static data_set_t threads_ds =
-{
-	"vs_threads", 1, threads_dsrc
-};
-
-static data_source_t processes_dsrc[1] =
-{
-	{"value", DS_TYPE_GAUGE, 0.0, 65535.0}
-};
-
-static data_set_t processes_ds =
-{
-	"vs_processes", 1, processes_dsrc
-};
-
-static data_source_t memory_dsrc[1] =
-{
-	{"value", DS_TYPE_GAUGE, 0.0, 9223372036854775807.0}
-};
-
-static data_set_t memory_ds =
-{
-	"vs_memory", 1, memory_dsrc
-};
-
-#if VSERVER_HAVE_READ
 static int pagesize = 0;
 
 static int vserver_init (void)
@@ -360,26 +302,11 @@ static int vserver_read (void)
 
 	return (0);
 } /* int vserver_read */
-#endif /* VSERVER_HAVE_READ */
 
-void module_register (modreg_e load)
+void module_register (void)
 {
-	if (load & MR_DATASETS)
-	{
-		plugin_register_data_set (&octets_ds);
-		plugin_register_data_set (&load_ds);
-		plugin_register_data_set (&threads_ds);
-		plugin_register_data_set (&processes_ds);
-		plugin_register_data_set (&memory_ds);
-	}
-
-#if VSERVER_HAVE_READ
-	if (load & MR_READ)
-	{
-		plugin_register_init ("vserver", vserver_init);
-		plugin_register_read ("vserver", vserver_read);
-	}
-#endif /* VSERVER_HAVE_READ */
+	plugin_register_init ("vserver", vserver_init);
+	plugin_register_read ("vserver", vserver_read);
 } /* void module_register(void) */
 
 /* vim: set ts=4 sw=4 noexpandtab : */