summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 79963d1)
raw | patch | inline | side by side (parent: 79963d1)
author | Florian Forster <octo@collectd.org> | |
Mon, 28 Nov 2016 21:22:01 +0000 (22:22 +0100) | ||
committer | Florian Forster <octo@collectd.org> | |
Mon, 28 Nov 2016 21:22:01 +0000 (22:22 +0100) |
No idea why the previous round missed these files.
proto/collectd.proto | patch | blob | history | |
src/chrony.c | patch | blob | history | |
src/daemon/common.c | patch | blob | history | |
src/utils_lua.c | patch | blob | history |
diff --git a/proto/collectd.proto b/proto/collectd.proto
index 917c5deb679985dd90388176f7e9449569e3ef37..c706ea11305875022a98e82cd1ba0b231c2ccfcd 100644 (file)
--- a/proto/collectd.proto
+++ b/proto/collectd.proto
// The gRPC server embedded into collectd will inject them into the system
// just like the network plugin.
rpc DispatchValues(stream DispatchValuesRequest)
- returns (DispatchValuesResponse);
+ returns(DispatchValuesResponse);
// QueryValues returns a stream of matching value lists from collectd's
// internal cache.
- rpc QueryValues(QueryValuesRequest) returns (stream QueryValuesResponse);
+ rpc QueryValues(QueryValuesRequest) returns(stream QueryValuesResponse);
}
// The arguments to DispatchValues.
diff --git a/src/chrony.c b/src/chrony.c
index bf4da4a5de64206ce1516dcb6868015c5211bb1b..a10e5f68339c229b01d97165db9dd67798384c52 100644 (file)
--- a/src/chrony.c
+++ b/src/chrony.c
chrony_push_data("time_ref", DAEMON_NAME, time_ref); /* unit: s */
chrony_push_data(
"time_offset_ntp", DAEMON_NAME,
- ntohf(
- chrony_resp.body.tracking.f_current_correction)); /* Offset between
- system time and
- NTP, unit: s */
+ ntohf(chrony_resp.body.tracking.f_current_correction)); /* Offset between
+ system time and
+ NTP, unit: s */
chrony_push_data(
"time_offset", DAEMON_NAME,
ntohf(
ntohf(chrony_resp.body.tracking.f_skew_ppm));
chrony_push_data(
"root_delay", DAEMON_NAME,
- ntohf(
- chrony_resp.body.tracking.f_root_delay)); /* Network latency between
- local daemon and the
- current source */
+ ntohf(chrony_resp.body.tracking.f_root_delay)); /* Network latency between
+ local daemon and the
+ current source */
chrony_push_data("root_dispersion", DAEMON_NAME,
ntohf(chrony_resp.body.tracking.f_root_dispersion));
chrony_push_data("clock_last_update", DAEMON_NAME,
diff --git a/src/daemon/common.c b/src/daemon/common.c
index fce6a5631d545c746432f6845f0391cd4759c3a1..7ead55d12a411b62ad1831c9618a1f87ecaa3d6e 100644 (file)
--- a/src/daemon/common.c
+++ b/src/daemon/common.c
else if (kn->data_type == KSTAT_DATA_UINT32)
retval = (long long)kn->value.ui32;
else if (kn->data_type == KSTAT_DATA_INT64)
- retval = (long long)
- kn->value.i64; /* According to ANSI C99 `long long' must hold
- at least 64 bits */
+ retval =
+ (long long)kn->value.i64; /* According to ANSI C99 `long long' must hold
+ at least 64 bits */
else if (kn->data_type == KSTAT_DATA_UINT64)
retval = (long long)kn->value.ui64; /* XXX: Might overflow! */
else
diff --git a/src/utils_lua.c b/src/utils_lua.c
index 7f2ba04c7d2db3081ba7d48795427da195ec901c..dcb84afa0753fa23704fff2e5bd210771ecbe2de 100644 (file)
--- a/src/utils_lua.c
+++ b/src/utils_lua.c
* GCC will complain about the macro definition. */
#define DONT_POISON_SPRINTF_YET
-#include "utils_lua.h"
#include "common.h"
+#include "utils_lua.h"
static int ltoc_values(lua_State *L, /* {{{ */
const data_set_t *ds, value_t *ret_values) {