projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Various plugins: Convert more plugins to use "derive" instead of "counter".
[collectd.git]
/
src
/
memcached.c
diff --git
a/src/memcached.c
b/src/memcached.c
index
8b4a8fc
..
ee3dbe1
100644
(file)
--- a/
src/memcached.c
+++ b/
src/memcached.c
@@
-1,7
+1,7
@@
/**
* collectd - src/memcached.c, based on src/hddtemp.c
* Copyright (C) 2007 Antony Dovgal
/**
* collectd - src/memcached.c, based on src/hddtemp.c
* Copyright (C) 2007 Antony Dovgal
- * Copyright (C) 2007-20
09
Florian Forster
+ * Copyright (C) 2007-20
10
Florian Forster
* Copyright (C) 2009 Doug MacEachern
* Copyright (C) 2009 Franck Lombardi
*
* Copyright (C) 2009 Doug MacEachern
* Copyright (C) 2009 Franck Lombardi
*
@@
-21,7
+21,7
@@
*
* Authors:
* Antony Dovgal <tony at daylessday dot org>
*
* Authors:
* Antony Dovgal <tony at daylessday dot org>
- * Florian octo Forster <octo at
verplant
.org>
+ * Florian octo Forster <octo at
collectd
.org>
* Doug MacEachern <dougm at hyperic.com>
* Franck Lombardi
**/
* Doug MacEachern <dougm at hyperic.com>
* Franck Lombardi
**/
@@
-273,13
+273,13
@@
static int memcached_config (const char *key, const char *value) /* {{{ */
}
/* }}} */
}
/* }}} */
-static void submit_
counter
(const char *type, const char *type_inst,
-
counter
_t value) /* {{{ */
+static void submit_
derive
(const char *type, const char *type_inst,
+
derive
_t value) /* {{{ */
{
value_t values[1];
value_list_t vl = VALUE_LIST_INIT;
{
value_t values[1];
value_list_t vl = VALUE_LIST_INIT;
- values[0].
counter
= value;
+ values[0].
derive
= value;
vl.values = values;
vl.values_len = 1;
vl.values = values;
vl.values_len = 1;
@@
-293,14
+293,14
@@
static void submit_counter (const char *type, const char *type_inst,
} /* void memcached_submit_cmd */
/* }}} */
} /* void memcached_submit_cmd */
/* }}} */
-static void submit_
counter
2 (const char *type, const char *type_inst,
-
counter_t value0, counter
_t value1) /* {{{ */
+static void submit_
derive
2 (const char *type, const char *type_inst,
+
derive_t value0, derive
_t value1) /* {{{ */
{
value_t values[2];
value_list_t vl = VALUE_LIST_INIT;
{
value_t values[2];
value_list_t vl = VALUE_LIST_INIT;
- values[0].
counter
= value0;
- values[1].
counter
= value1;
+ values[0].
derive
= value0;
+ values[1].
derive
= value1;
vl.values = values;
vl.values_len = 2;
vl.values = values;
vl.values_len = 2;
@@
-368,10
+368,10
@@
static int memcached_read (void) /* {{{ */
gauge_t bytes_total = NAN;
gauge_t hits = NAN;
gauge_t gets = NAN;
gauge_t bytes_total = NAN;
gauge_t hits = NAN;
gauge_t gets = NAN;
-
counter
_t rusage_user = 0;
-
counter
_t rusage_syst = 0;
-
counter
_t octets_rx = 0;
-
counter
_t octets_tx = 0;
+
derive
_t rusage_user = 0;
+
derive
_t rusage_syst = 0;
+
derive
_t octets_rx = 0;
+
derive
_t octets_tx = 0;
/* get data from daemon */
if (memcached_query_daemon (buf, sizeof (buf)) < 0) {
/* get data from daemon */
if (memcached_query_daemon (buf, sizeof (buf)) < 0) {
@@
-456,7
+456,7
@@
static int memcached_read (void) /* {{{ */
else if ((name_len > 4) && (strncmp (fields[1], "cmd_", 4) == 0))
{
const char *name = fields[1] + 4;
else if ((name_len > 4) && (strncmp (fields[1], "cmd_", 4) == 0))
{
const char *name = fields[1] + 4;
- submit_
counter
("memcached_command", name, atoll (fields[2]));
+ submit_
derive
("memcached_command", name, atoll (fields[2]));
if (strcmp (name, "get") == 0)
gets = atof (fields[2]);
}
if (strcmp (name, "get") == 0)
gets = atof (fields[2]);
}
@@
-466,16
+466,16
@@
static int memcached_read (void) /* {{{ */
*/
else if (FIELD_IS ("get_hits"))
{
*/
else if (FIELD_IS ("get_hits"))
{
- submit_
counter
("memcached_ops", "hits", atoll (fields[2]));
+ submit_
derive
("memcached_ops", "hits", atoll (fields[2]));
hits = atof (fields[2]);
}
else if (FIELD_IS ("get_misses"))
{
hits = atof (fields[2]);
}
else if (FIELD_IS ("get_misses"))
{
- submit_
counter
("memcached_ops", "misses", atoll (fields[2]));
+ submit_
derive
("memcached_ops", "misses", atoll (fields[2]));
}
else if (FIELD_IS ("evictions"))
{
}
else if (FIELD_IS ("evictions"))
{
- submit_
counter
("memcached_ops", "evictions", atoll (fields[2]));
+ submit_
derive
("memcached_ops", "evictions", atoll (fields[2]));
}
/*
}
/*
@@
-495,10
+495,10
@@
static int memcached_read (void) /* {{{ */
submit_gauge2 ("df", "cache", bytes_used, bytes_total - bytes_used);
if ((rusage_user != 0) || (rusage_syst != 0))
submit_gauge2 ("df", "cache", bytes_used, bytes_total - bytes_used);
if ((rusage_user != 0) || (rusage_syst != 0))
- submit_
counter
2 ("ps_cputime", NULL, rusage_user, rusage_syst);
+ submit_
derive
2 ("ps_cputime", NULL, rusage_user, rusage_syst);
if ((octets_rx != 0) || (octets_tx != 0))
if ((octets_rx != 0) || (octets_tx != 0))
- submit_
counter
2 ("memcached_octets", NULL, octets_rx, octets_tx);
+ submit_
derive
2 ("memcached_octets", NULL, octets_rx, octets_tx);
if (!isnan (gets) && !isnan (hits))
{
if (!isnan (gets) && !isnan (hits))
{