projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'collectd-4.10' into collectd-5.0
[collectd.git]
/
src
/
onewire.c
diff --git
a/src/onewire.c
b/src/onewire.c
index
462458c
..
09a6bf0
100644
(file)
--- a/
src/onewire.c
+++ b/
src/onewire.c
@@
-59,7
+59,7
@@
static ow_family_features_t ow_family_features[] =
static int ow_family_features_num = STATIC_ARRAY_SIZE (ow_family_features);
static char *device_g = NULL;
static int ow_family_features_num = STATIC_ARRAY_SIZE (ow_family_features);
static char *device_g = NULL;
-static
int
ow_interval = 0;
+static
cdtime_t
ow_interval = 0;
static const char *config_keys[] =
{
static const char *config_keys[] =
{
@@
-106,10
+106,10
@@
static int cow_load_config (const char *key, const char *value)
}
else if (strcasecmp ("Interval", key) == 0)
{
}
else if (strcasecmp ("Interval", key) == 0)
{
-
int
tmp;
- tmp = ato
i
(value);
- if (tmp > 0)
- ow_interval =
tmp
;
+
double
tmp;
+ tmp = ato
f
(value);
+ if (tmp > 0
.0
)
+ ow_interval =
DOUBLE_TO_CDTIME_T (tmp)
;
else
ERROR ("onewire plugin: Invalid `Interval' setting: %s", value);
}
else
ERROR ("onewire plugin: Invalid `Interval' setting: %s", value);
}
@@
-306,12
+306,11
@@
static int cow_init (void)
return (1);
}
return (1);
}
- memset (&cb_interval, 0, sizeof (cb_interval));
- if (ow_interval > 0)
- cb_interval.tv_sec = (time_t) ow_interval;
+ CDTIME_T_TO_TIMESPEC (ow_interval, &cb_interval);
plugin_register_complex_read (/* group = */ NULL, "onewire", cow_read,
plugin_register_complex_read (/* group = */ NULL, "onewire", cow_read,
- &cb_interval, /* user data = */ NULL);
+ (ow_interval != 0) ? &cb_interval : NULL,
+ /* user data = */ NULL);
plugin_register_shutdown ("onewire", cow_shutdown);
return (0);
plugin_register_shutdown ("onewire", cow_shutdown);
return (0);