diff options
| author | Matthias Schiffer <mschiffer@universe-factory.net> | 2014-09-12 16:31:18 +0200 |
|---|---|---|
| committer | Matthias Schiffer <mschiffer@universe-factory.net> | 2014-09-12 16:35:15 +0200 |
| commit | d116950984d78392e1daf0adfd89f6cdb4fe8076 (patch) | |
| tree | f5d12b55c556c511773704e6d2a879fcef85ffbb /src/status.c | |
| parent | 3b18fc42b9fa23ed7db8d4e382dfc5f442eba05d (diff) | |
| download | fastd-d116950984d78392e1daf0adfd89f6cdb4fe8076.tar fastd-d116950984d78392e1daf0adfd89f6cdb4fe8076.zip | |
Restructure traffics stats to keep all stats in a single structure
Diffstat (limited to 'src/status.c')
| -rw-r--r-- | src/status.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/status.c b/src/status.c index 8049f59..e36c2af 100644 --- a/src/status.c +++ b/src/status.c @@ -76,11 +76,11 @@ static void * dump_thread(void *p) { /** Dumps a fastd_stats_t as a JSON object */ -static json_object * dump_stats(const fastd_stats_t *stats) { +static json_object * dump_stats(const fastd_stats_t *stats, fastd_stat_type_t type) { struct json_object *ret = json_object_new_object(); - json_object_object_add(ret, "packets", json_object_new_int64(stats->packets)); - json_object_object_add(ret, "bytes", json_object_new_int64(stats->bytes)); + json_object_object_add(ret, "packets", json_object_new_int64(stats->packets[type])); + json_object_object_add(ret, "bytes", json_object_new_int64(stats->bytes[type])); return ret; } @@ -144,12 +144,12 @@ static void dump_status(int fd) { struct json_object *statistics = json_object_new_object(); json_object_object_add(json, "statistics", statistics); - json_object_object_add(statistics, "rx", dump_stats(&ctx.rx)); - json_object_object_add(statistics, "rx_reordered", dump_stats(&ctx.rx_reordered)); + json_object_object_add(statistics, "rx", dump_stats(&ctx.stats, STAT_RX)); + json_object_object_add(statistics, "rx_reordered", dump_stats(&ctx.stats, STAT_RX_REORDERED)); - json_object_object_add(statistics, "tx", dump_stats(&ctx.tx)); - json_object_object_add(statistics, "tx_dropped", dump_stats(&ctx.tx_dropped)); - json_object_object_add(statistics, "tx_error", dump_stats(&ctx.tx_error)); + json_object_object_add(statistics, "tx", dump_stats(&ctx.stats, STAT_TX)); + json_object_object_add(statistics, "tx_dropped", dump_stats(&ctx.stats, STAT_TX_DROPPED)); + json_object_object_add(statistics, "tx_error", dump_stats(&ctx.stats, STAT_TX_ERROR)); struct json_object *peers = json_object_new_object(); json_object_object_add(json, "peers", peers); |