diff --git a/src/pinba.c b/src/pinba.c
index 94e1092a45c11c12fe7f4bad30f474f06dc5313e..6879733501cbedaa32cbfaa4afde3ca527771894 100644 (file)
--- a/src/pinba.c
+++ b/src/pinba.c
#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
/*
* Private data structures
*/
-typedef struct _pinba_statres_ pinba_statres_t;
-struct _pinba_statres_ {
- const char *name;
- double req_per_sec;
- double req_time;
- double ru_utime;
- double ru_stime;
- double doc_size;
- double mem_peak;
-};
-
-struct pinba_socket_s {
+/* {{{ */
+struct pinba_socket_s
+{
struct pollfd fd[PINBA_MAX_SOCKETS];
nfds_t fd_num;
};
typedef struct pinba_socket_s pinba_socket_t;
-typedef double pinba_time_t;
-typedef uint32_t pinba_size_t;
-
/* Fixed point counter value. n is the decimal part multiplied by 10^9. */
struct float_counter_s
{
struct pinba_statnode_s
{
- /* collector name */
+ /* collector name, used as plugin instance */
char *name;
/* query data */
gauge_t mem_peak;
};
typedef struct pinba_statnode_s pinba_statnode_t;
+/* }}} */
/*
* Module global variables
*/
+/* {{{ */
static pinba_statnode_t *stat_nodes = NULL;
static unsigned int stat_nodes_num = 0;
static pthread_mutex_t stat_nodes_lock;
static _Bool collector_thread_running = 0;
static _Bool collector_thread_do_shutdown = 0;
static pthread_t collector_thread_id;
+/* }}} */
/*
* Functions
}
} /* }}} 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) /* {{{ */
node->mem_peak = NAN;
/* fill query data */
- strset(&node->name, name);
- strset(&node->host, host);
- strset(&node->server, server);
- strset(&node->script, script);
+ strset (&node->name, name);
+ strset (&node->host, host);
+ strset (&node->server, server);
+ strset (&node->script, script);
/* increment counter */
stat_nodes_num++;
for (i = 0; i < stat_nodes_num; i++)
{
- if(stat_nodes[i].host && strcmp(request->hostname, stat_nodes[i].host))
+ if ((stat_nodes[i].host != NULL)
+ && (strcmp (request->hostname, stat_nodes[i].host) != 0))
continue;
- if(stat_nodes[i].server && strcmp(request->server_name, stat_nodes[i].server))
+
+ if ((stat_nodes[i].server != NULL)
+ && (strcmp (request->server_name, stat_nodes[i].server) != 0))
continue;
- if(stat_nodes[i].script && strcmp(request->script_name, stat_nodes[i].script))
+
+ if ((stat_nodes[i].script != NULL)
+ && (strcmp (request->script_name, stat_nodes[i].script) != 0))
continue;
service_statnode_process(&stat_nodes[i], request);
assert (ai_list != NULL);
s = malloc (sizeof (*s));
- if (s != NULL)
+ if (s == NULL)
{
freeaddrinfo (ai_list);
ERROR ("pinba plugin: malloc failed.");
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
pthread_mutex_unlock(&stat_nodes_lock);
return (0);
-} /* int pinba_config */
+} /* }}} int pinba_config */
static int plugin_init (void) /* {{{ */
{
if (collector_thread_running)
return (0);
- status = pthread_create (&collector_thread_id,
+ status = plugin_thread_create (&collector_thread_id,
/* attrs = */ NULL,
collector_thread,
/* args = */ NULL);
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);