core: Changed internal API to allow for per-plugin intervals.

[collectd.git] / src / pinba.c

diff --git a/src/pinba.c b/src/pinba.c
index a6fd06fe2d56352a0a7e29cba18b394dd32559d2..8c4da1a8ebea585c14cfa91f71dabed0a8e791bd 100644 (file)
--- a/src/pinba.c
+++ b/src/pinba.c
@@ -602,7 +602,7 @@ static int pinba_config_view (const oconfig_item_t *ci) /* {{{ */
   return (status);
 } /* }}} int pinba_config_view */
 
-static int plugin_config (oconfig_item_t *ci) /* {{{ */
+static int cpinba_config (oconfig_item_t *ci) /* {{{ */
 {
   int i;
   
@@ -629,7 +629,7 @@ static int plugin_config (oconfig_item_t *ci) /* {{{ */
   return (0);
 } /* }}} int pinba_config */
 
-static int plugin_init (void) /* {{{ */
+static int cpinba_init (void) /* {{{ */
 {
   int status;
 
@@ -661,7 +661,7 @@ static int plugin_init (void) /* {{{ */
   return (0);
 } /* }}} */
 
-static int plugin_shutdown (void) /* {{{ */
+static int cpinba_shutdown (void) /* {{{ */
 {
   if (collector_thread_running)
   {
@@ -683,12 +683,12 @@ static int plugin_shutdown (void) /* {{{ */
   } /* if (collector_thread_running) */
 
   return (0);
-} /* }}} int plugin_shutdown */
+} /* }}} int cpinba_shutdown */
 
-static int plugin_submit (const pinba_statnode_t *res) /* {{{ */
+static int cpinba_submit (const pinba_statnode_t *res) /* {{{ */
 {
   value_t value;
-  value_list_t vl = VALUE_LIST_INIT;
+  value_list_t vl = VALUE_LIST_INIT (plugin_interval);
   
   vl.values = &value;
   vl.values_len = 1;
@@ -724,27 +724,29 @@ static int plugin_submit (const pinba_statnode_t *res) /* {{{ */
   plugin_dispatch_values (&vl);
 
   return (0);
-} /* }}} int plugin_submit */
+} /* }}} int cpinba_submit */
 
-static int plugin_read (void) /* {{{ */
+static int cpinba_read (void) /* {{{ */
 {
   unsigned int i=0;
   pinba_statnode_t data;
   
   while ((i = service_statnode_collect (&data, i)) != 0)
   {
-    plugin_submit (&data);
+    cpinba_submit (&data);
   }
   
   return 0;
-} /* }}} int plugin_read */
+} /* }}} int cpinba_read */
 
-void module_register (void) /* {{{ */
+void module_register (plugin_loaddata_t *data) /* {{{ */
 {
-  plugin_register_complex_config ("pinba", plugin_config);
-  plugin_register_init ("pinba", plugin_init);
-  plugin_register_read ("pinba", plugin_read);
-  plugin_register_shutdown ("pinba", plugin_shutdown);
+  PLUGIN_INIT_INTERVAL (data);
+
+  plugin_register_complex_config ("pinba", cpinba_config);
+  plugin_register_init ("pinba", cpinba_init);
+  plugin_register_read ("pinba", cpinba_read, plugin_interval);
+  plugin_register_shutdown ("pinba", cpinba_shutdown);
 } /* }}} void module_register */
 
 /* vim: set sw=2 sts=2 et fdm=marker : */