projects
/
collectd.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
2394ebb
)
memcached: Renamed calculate_rate to calculate_ratio_percent
author
Pavel Rochnyack
<pavel2000@ngs.ru>
Wed, 27 Sep 2017 12:07:37 +0000
(19:07 +0700)
committer
Pavel Rochnyack
<pavel2000@ngs.ru>
Mon, 9 Oct 2017 12:33:57 +0000
(19:33 +0700)
src/memcached.c
patch
|
blob
|
history
diff --git
a/src/memcached.c
b/src/memcached.c
index
7661978
..
4291798
100644
(file)
--- a/
src/memcached.c
+++ b/
src/memcached.c
@@
-392,8
+392,9
@@
static void submit_gauge2(const char *type, const char *type_inst,
plugin_dispatch_values(&vl);
}
plugin_dispatch_values(&vl);
}
-static gauge_t calculate_rate(gauge_t part, gauge_t total, gauge_t *prev_part,
- gauge_t *prev_total) {
+static gauge_t calculate_ratio_percent(gauge_t part, gauge_t total,
+ gauge_t *prev_part,
+ gauge_t *prev_total) {
if (isnan(*prev_part) || isnan(*prev_total) || (part < *prev_part) ||
(total < *prev_total)) {
*prev_part = part;
if (isnan(*prev_part) || isnan(*prev_total) || (part < *prev_part) ||
(total < *prev_total)) {
*prev_part = part;
@@
-413,8
+414,8
@@
static gauge_t calculate_rate(gauge_t part, gauge_t total, gauge_t *prev_part,
return 100.0 * num / denom;
}
return 100.0 * num / denom;
}
-static gauge_t calculate_rat
e2(gauge_t part1, gauge_t part2, gauge_t *prev1
,
- gauge_t *prev2) {
+static gauge_t calculate_rat
io_percent2(gauge_t part1, gauge_t part2
,
+
gauge_t *prev1,
gauge_t *prev2) {
if (isnan(*prev1) || isnan(*prev2) || (part1 < *prev1) || (part2 < *prev2)) {
*prev1 = part1;
*prev2 = part2;
if (isnan(*prev1) || isnan(*prev2) || (part1 < *prev1) || (part2 < *prev2)) {
*prev1 = part1;
*prev2 = part2;
@@
-605,23
+606,24
@@
static int memcached_read(user_data_t *user_data) {
submit_derive2("memcached_octets", NULL, octets_rx, octets_tx, st);
if (!isnan(gets) && !isnan(hits)) {
submit_derive2("memcached_octets", NULL, octets_rx, octets_tx, st);
if (!isnan(gets) && !isnan(hits)) {
- gauge_t rate = calculate_rate(hits, gets, &prev->hits, &prev->gets);
- submit_gauge("percent", "hitratio", rate, st);
+ gauge_t ratio =
+ calculate_ratio_percent(hits, gets, &prev->hits, &prev->gets);
+ submit_gauge("percent", "hitratio", ratio, st);
}
if (!isnan(incr_hits) && !isnan(incr_misses) &&
(incr_hits + incr_misses > 0)) {
}
if (!isnan(incr_hits) && !isnan(incr_misses) &&
(incr_hits + incr_misses > 0)) {
- gauge_t rat
e = calculate_rate2(incr_hits, incr_misses, &prev->incr_hits,
-
&prev->incr_misses);
- submit_gauge("percent", "incr_hitratio", rat
e
, st);
+ gauge_t rat
io = calculate_ratio_percent2(
+
incr_hits, incr_misses, &prev->incr_hits,
&prev->incr_misses);
+ submit_gauge("percent", "incr_hitratio", rat
io
, st);
submit_derive("memcached_ops", "incr", incr_hits + incr_misses, st);
}
if (!isnan(decr_hits) && !isnan(decr_misses) &&
(decr_hits + decr_misses > 0)) {
submit_derive("memcached_ops", "incr", incr_hits + incr_misses, st);
}
if (!isnan(decr_hits) && !isnan(decr_misses) &&
(decr_hits + decr_misses > 0)) {
- gauge_t rat
e = calculate_rate2(decr_hits, decr_misses, &prev->decr_hits,
-
&prev->decr_misses);
- submit_gauge("percent", "decr_hitratio", rat
e
, st);
+ gauge_t rat
io = calculate_ratio_percent2(
+
decr_hits, decr_misses, &prev->decr_hits,
&prev->decr_misses);
+ submit_gauge("percent", "decr_hitratio", rat
io
, st);
submit_derive("memcached_ops", "decr", decr_hits + decr_misses, st);
}
submit_derive("memcached_ops", "decr", decr_hits + decr_misses, st);
}
@@
-664,7
+666,7
@@
static int memcached_set_defaults(memcached_t *st) {
assert(st->connhost != NULL);
assert(st->connport != NULL);
assert(st->connhost != NULL);
assert(st->connport != NULL);
-
+
st->prev.hits = NAN;
st->prev.gets = NAN;
st->prev.incr_hits = NAN;
st->prev.hits = NAN;
st->prev.gets = NAN;
st->prev.incr_hits = NAN;