aboutsummaryrefslogtreecommitdiffstats
path: root/package/wprobe/src
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2009-12-19 22:19:09 +0000
committerFelix Fietkau <nbd@openwrt.org>2009-12-19 22:19:09 +0000
commit6a2c27b4e81f8dca7cc1d8cb6990dd8f815aefad (patch)
tree1db7acc83960ca44743a956fe9443d61c2a98c01 /package/wprobe/src
parent0a46ab2f9721a2473ee8782d074fb28d3c6e3ea3 (diff)
downloadupstream-6a2c27b4e81f8dca7cc1d8cb6990dd8f815aefad.tar.gz
upstream-6a2c27b4e81f8dca7cc1d8cb6990dd8f815aefad.tar.bz2
upstream-6a2c27b4e81f8dca7cc1d8cb6990dd8f815aefad.zip
wprobe: export raw values (n, s, ss) to ipfix collectors for improved measurement accuracy
SVN-Revision: 18852
Diffstat (limited to 'package/wprobe/src')
-rw-r--r--package/wprobe/src/exporter/wprobe-export.c15
1 files changed, 6 insertions, 9 deletions
diff --git a/package/wprobe/src/exporter/wprobe-export.c b/package/wprobe/src/exporter/wprobe-export.c
index 48be5f36bc..9255d76c45 100644
--- a/package/wprobe/src/exporter/wprobe-export.c
+++ b/package/wprobe/src/exporter/wprobe-export.c
@@ -25,7 +25,6 @@ static int do_close = 0;
struct wprobe_mapping {
int id;
bool counter;
- float scale;
const char *wprobe_id;
struct wprobe_value *val;
};
@@ -36,16 +35,14 @@ struct wprobe_mapping {
#define WMAP(_id, _name, ...) \
{ \
- .scale = 1.0f, \
.counter = false, \
- .id = IPFIX_FT_WPROBE_##_id##_AVG, \
+ .id = IPFIX_FT_WPROBE_##_id##_N, \
.wprobe_id = _name \
, ## __VA_ARGS__ \
}
#define WMAP_COUNTER(_id, _name, ...) \
{ \
- .scale = 1.0f, \
.counter = true, \
.id = IPFIX_FT_WPROBE_##_id, \
.wprobe_id = _name \
@@ -144,7 +141,7 @@ add_template_fields(ipfix_t *handle, ipfix_template_t *t, struct wprobe_mapping
if (map[i].counter)
g_data.addrs[f++] = &map[i].val->U32;
else
- g_data.addrs[f++] = &map[i].val->avg;
+ g_data.addrs[f++] = &map[i].val->n;
if (ipfix_add_field( handle, t, FOKUS_USERID, map[i].id + 0, 4) < 0)
exit(1);
@@ -152,11 +149,11 @@ add_template_fields(ipfix_t *handle, ipfix_template_t *t, struct wprobe_mapping
if (map[i].counter)
continue;
- g_data.addrs[f++] = &map[i].val->stdev;
- g_data.addrs[f++] = &map[i].val->n;
- if (ipfix_add_field( handle, t, FOKUS_USERID, map[i].id + 1, 4) < 0)
+ g_data.addrs[f++] = &map[i].val->s;
+ g_data.addrs[f++] = &map[i].val->ss;
+ if (ipfix_add_field( handle, t, FOKUS_USERID, map[i].id + 1, 8) < 0)
exit(1);
- if (ipfix_add_field( handle, t, FOKUS_USERID, map[i].id + 2, 4) < 0)
+ if (ipfix_add_field( handle, t, FOKUS_USERID, map[i].id + 2, 8) < 0)
exit(1);
}
g_data.maxfields = f;