projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
postgresql plugin: Add a couple of PQclear() calls.
[collectd.git]
/
src
/
multimeter.c
diff --git
a/src/multimeter.c
b/src/multimeter.c
index
d1cf190
..
994747f
100644
(file)
--- a/
src/multimeter.c
+++ b/
src/multimeter.c
@@
-30,23
+30,10
@@
# include <termios.h>
# include <sys/ioctl.h>
# include <math.h>
# include <termios.h>
# include <sys/ioctl.h>
# include <math.h>
-# define MULTIMETER_HAVE_READ 1
#else
#else
-# define MULTIMETER_HAVE_READ 0
-# error "multimeter cannot read!"
+# error "No applicable input method."
#endif
#endif
-static data_source_t data_source[1] =
-{
- {"value", DS_TYPE_GAUGE, NAN, NAN}
-};
-
-static data_set_t data_set =
-{
- "multimeter", 1, data_source
-};
-
-#if MULTIMETER_HAVE_READ
static int fd = -1;
static int multimeter_timeval_sub (struct timeval *tv1, struct timeval *tv2,
static int fd = -1;
static int multimeter_timeval_sub (struct timeval *tv1, struct timeval *tv2,
@@
-68,6
+55,7
@@
static int multimeter_timeval_sub (struct timeval *tv1, struct timeval *tv2,
}
return (0);
}
}
return (0);
}
+
#define LINE_LENGTH 14
static int multimeter_read_value(double *value)
{
#define LINE_LENGTH 14
static int multimeter_read_value(double *value)
{
@@
-81,8
+69,10
@@
static int multimeter_read_value(double *value)
if (gettimeofday (&time_end, NULL) < 0)
{
if (gettimeofday (&time_end, NULL) < 0)
{
- syslog (LOG_ERR, "multimeter plugin: gettimeofday failed: %s",
- strerror (errno));
+ char errbuf[1024];
+ ERROR ("multimeter plugin: gettimeofday failed: %s",
+ sstrerror (errno, errbuf,
+ sizeof (errbuf)));
return (-1);
}
time_end.tv_sec++;
return (-1);
}
time_end.tv_sec++;
@@
-103,9
+93,11
@@
static int multimeter_read_value(double *value)
if (gettimeofday (&time_now, NULL) < 0)
{
if (gettimeofday (&time_now, NULL) < 0)
{
- syslog (LOG_ERR, "multimeter plugin: "
+ char errbuf[1024];
+ ERROR ("multimeter plugin: "
"gettimeofday failed: %s",
"gettimeofday failed: %s",
- strerror (errno));
+ sstrerror (errno, errbuf,
+ sizeof (errbuf)));
return (-1);
}
if (multimeter_timeval_sub (&time_end, &time_now, &timeout) == -1)
return (-1);
}
if (multimeter_timeval_sub (&time_end, &time_now, &timeout) == -1)
@@
-157,9
+149,10
@@
static int multimeter_read_value(double *value)
}
else /* status == -1 */
{
}
else /* status == -1 */
{
- syslog (LOG_ERR, "multimeter plugin: "
+ char errbuf[1024];
+ ERROR ("multimeter plugin: "
"select failed: %s",
"select failed: %s",
- s
trerror (errno
));
+ s
strerror (errno, errbuf, sizeof (errbuf)
));
break;
}
}
break;
}
}
@@
-201,14
+194,14
@@
static int multimeter_init (void)
}
else
{
}
else
{
-
syslog (LOG_INFO,
"multimeter plugin: Device "
+
INFO (
"multimeter plugin: Device "
"found at %s", device);
return (0);
}
}
}
"found at %s", device);
return (0);
}
}
}
-
syslog (LOG_ERR,
"multimeter plugin: No device found");
+
ERROR (
"multimeter plugin: No device found");
return (-1);
}
#undef LINE_LENGTH
return (-1);
}
#undef LINE_LENGTH
@@
-223,10
+216,11
@@
static void multimeter_submit (double value)
vl.values = values;
vl.values_len = 1;
vl.time = time (NULL);
vl.values = values;
vl.values_len = 1;
vl.time = time (NULL);
- strcpy (vl.host, hostname);
- strcpy (vl.plugin, "multimeter");
+ sstrncpy (vl.host, hostname_g, sizeof (vl.host));
+ sstrncpy (vl.plugin, "multimeter", sizeof (vl.plugin));
+ sstrncpy (vl.type, "multimeter", sizeof (vl.type));
- plugin_dispatch_values (
"multimeter",
&vl);
+ plugin_dispatch_values (&vl);
}
static int multimeter_read (void)
}
static int multimeter_read (void)
@@
-253,15
+247,10
@@
static int multimeter_shutdown (void)
return (0);
}
return (0);
}
-#endif /* MULTIMETER_HAVE_READ */
void module_register (void)
{
void module_register (void)
{
- plugin_register_data_set (&data_set);
-
-#if MULTIMETER_HAVE_READ
plugin_register_init ("multimeter", multimeter_init);
plugin_register_read ("multimeter", multimeter_read);
plugin_register_shutdown ("multimeter", multimeter_shutdown);
plugin_register_init ("multimeter", multimeter_init);
plugin_register_read ("multimeter", multimeter_read);
plugin_register_shutdown ("multimeter", multimeter_shutdown);
-#endif /* MULTIMETER_HAVE_READ */
-}
+} /* void module_register */