X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fpinba.c;h=26aa539b413a2fefcddeec0734e18c5f65dc0f68;hb=3b473acc5d4d27e5cf5101a4b8cc8a21c2bb7262;hp=a00720f160d663ea178aa961e0f9837d25775b9f;hpb=5ad4472bd53ab4c07f8e12719fc242468aac9896;p=collectd.git

diff --git a/src/pinba.c b/src/pinba.c
index a00720f1..26aa539b 100644
--- a/src/pinba.c
+++ b/src/pinba.c
@@ -43,11 +43,11 @@
 #endif
 
 #ifndef PINBA_DEFAULT_NODE
-# define PINBA_DEFAULT_NODE "127.0.0.1" /* FIXME */
+# define PINBA_DEFAULT_NODE "::0"
 #endif
 
 #ifndef PINBA_DEFAULT_SERVICE
-# define PINBA_DEFAULT_SERVICE "12345" /* FIXME */
+# define PINBA_DEFAULT_SERVICE "30002"
 #endif
 
 #ifndef PINBA_MAX_SOCKETS
@@ -135,12 +135,15 @@ static void float_counter_add (float_counter_t *fc, float val) /* {{{ */
   }
 } /* }}} void float_counter_add */
 
-static derive_t float_counter_get (const float_counter_t *fc) /* {{{ */
+static derive_t float_counter_get (const float_counter_t *fc, /* {{{ */
+    uint64_t factor)
 {
-  if (fc->n >= 500000000)
-    return ((derive_t) (fc->i + 1));
-  else
-    return ((derive_t) fc->i);
+  derive_t ret;
+
+  ret = (derive_t) (fc->i * factor);
+  ret += (derive_t) (fc->n / (1000000000 / factor));
+
+  return (ret);
 } /* }}} derive_t float_counter_get */
 
 static void strset (char **str, const char *new) /* {{{ */
@@ -374,7 +377,7 @@ static pinba_socket_t *pinba_socket_open (const char *node, /* {{{ */
   assert (ai_list != NULL);
 
   s = malloc (sizeof (*s));
-  if (s != NULL)
+  if (s == NULL)
   {
     freeaddrinfo (ai_list);
     ERROR ("pinba plugin: malloc failed.");
@@ -614,7 +617,7 @@ static int plugin_config (oconfig_item_t *ci) /* {{{ */
     if (strcasecmp ("Address", child->key) == 0)
       cf_util_get_string (child, &conf_node);
     else if (strcasecmp ("Port", child->key) == 0)
-      cf_util_get_string (child, &conf_service);
+      cf_util_get_service (child, &conf_service);
     else if (strcasecmp ("View", child->key) == 0)
       pinba_config_view (child);
     else
@@ -694,19 +697,23 @@ static int plugin_submit (const pinba_statnode_t *res) /* {{{ */
   sstrncpy (vl.plugin_instance, res->name, sizeof (vl.plugin_instance));
 
   value.derive = res->req_count;
-  sstrncpy (vl.type, "requests", sizeof (vl.type)); 
+  sstrncpy (vl.type, "total_requests", sizeof (vl.type)); 
+  plugin_dispatch_values (&vl);
+
+  value.derive = float_counter_get (&res->req_time, /* factor = */ 1000);
+  sstrncpy (vl.type, "total_time_in_ms", sizeof (vl.type)); 
   plugin_dispatch_values (&vl);
 
-  value.derive = float_counter_get (&res->req_time);
-  sstrncpy (vl.type, "total_time", sizeof (vl.type)); 
+  value.derive = res->doc_size;
+  sstrncpy (vl.type, "total_bytes", sizeof (vl.type)); 
   plugin_dispatch_values (&vl);
 
-  value.derive = float_counter_get (&res->ru_utime);
+  value.derive = float_counter_get (&res->ru_utime, /* factor = */ 100);
   sstrncpy (vl.type, "cpu", sizeof (vl.type));
   sstrncpy (vl.type_instance, "user", sizeof (vl.type_instance));
   plugin_dispatch_values (&vl);
 
-  value.derive = float_counter_get (&res->ru_stime);
+  value.derive = float_counter_get (&res->ru_stime, /* factor = */ 100);
   sstrncpy (vl.type, "cpu", sizeof (vl.type));
   sstrncpy (vl.type_instance, "system", sizeof (vl.type_instance));
   plugin_dispatch_values (&vl);