![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/multimeter.c b/src/multimeter.c
index 09073abab2d7449804e764151d45b028238e671a..775eb57e27bff64201f81e83cf6528c36fa0608e 100644 (file)
--- a/src/multimeter.c
+++ b/src/multimeter.c
* Peter Holik <peter at holik.at>
*
* Used multimeter: Metex M-4650CR
- *
**/
#include "collectd.h"
#include "common.h"
#include "plugin.h"
-#include <termios.h>
-#include <sys/ioctl.h>
-#include <math.h>
-
-#define MODULE_NAME "multimeter"
-
-static char *multimeter_file = "multimeter.rrd";
-
-static char *ds_def[] =
-{
- "DS:value:GAUGE:"COLLECTD_HEARTBEAT":U:U",
- NULL
-};
-static int ds_num = 1;
+#if HAVE_TERMIOS_H && HAVE_SYS_IOCTL_H && HAVE_MATH_H
+# include <termios.h>
+# include <sys/ioctl.h>
+# include <math.h>
+#else
+# error "No applicable input method."
+#endif
static int fd = -1;
-static int multimeter_timeval_sub (struct timeval *tv1, struct timeval *tv2,
- struct timeval *res)
-{
- if ((tv1->tv_sec < tv2->tv_sec) ||
- ((tv1->tv_sec == tv2->tv_sec) && (tv1->tv_usec < tv2->tv_usec)))
- return (-1);
-
- res->tv_sec = tv1->tv_sec - tv2->tv_sec;
- res->tv_usec = tv1->tv_usec - tv2->tv_usec;
-
- assert ((res->tv_sec > 0) || ((res->tv_sec == 0) && (res->tv_usec > 0)));
-
- while (res->tv_usec < 0)
- {
- res->tv_usec += 1000000;
- res->tv_sec--;
- }
- return (0);
-}
#define LINE_LENGTH 14
static int multimeter_read_value(double *value)
{
if (gettimeofday (&time_end, NULL) < 0)
{
- syslog (LOG_ERR, MODULE_NAME": 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++;
struct timeval timeout;
struct timeval time_now;
- write(fd, "D", 1);
+ status = swrite (fd, "D", 1);
+ if (status < 0)
+ {
+ ERROR ("multimeter plugin: swrite failed.");
+ return (-1);
+ }
FD_ZERO(&rfds);
FD_SET(fd, &rfds);
if (gettimeofday (&time_now, NULL) < 0)
{
- syslog (LOG_ERR, MODULE_NAME": gettimeofday failed: %s",
- strerror (errno));
+ char errbuf[1024];
+ ERROR ("multimeter plugin: "
+ "gettimeofday failed: %s",
+ sstrerror (errno, errbuf,
+ sizeof (errbuf)));
return (-1);
}
- if (multimeter_timeval_sub (&time_end, &time_now, &timeout) == -1)
+ if (timeval_cmp (time_end, time_now, &timeout) < 0)
break;
status = select(fd+1, &rfds, NULL, NULL, &timeout);
}
else /* status == -1 */
{
- syslog (LOG_ERR, MODULE_NAME": select failed: %s",
- strerror (errno));
+ char errbuf[1024];
+ ERROR ("multimeter plugin: "
+ "select failed: %s",
+ sstrerror (errno, errbuf, sizeof (errbuf)));
break;
}
}
} while (--retry);
return (-2); /* no value received */
-}
+} /* int multimeter_read_value */
-static void multimeter_init (void)
+static int multimeter_init (void)
{
int i;
char device[] = "/dev/ttyS ";
tcsetattr(fd, TCSANOW, &tios);
ioctl(fd, TIOCMBIC, &rts);
- if (multimeter_read_value(&value) < -1)
+ if (multimeter_read_value (&value) < -1)
{
- close(fd);
+ close (fd);
fd = -1;
}
else
{
- syslog (LOG_INFO, MODULE_NAME" found (%s)", device);
- return;
+ INFO ("multimeter plugin: Device "
+ "found at %s", device);
+ return (0);
}
}
}
- syslog (LOG_ERR, MODULE_NAME" not found");
+
+ ERROR ("multimeter plugin: No device found");
+ return (-1);
}
#undef LINE_LENGTH
-static void multimeter_write (char *host, char *inst, char *val)
+static void multimeter_submit (double value)
{
- rrd_update_file (host, multimeter_file, val, ds_def, ds_num);
-}
-#define BUFSIZE 128
-static void multimeter_submit (double *value)
-{
- char buf[BUFSIZE];
+ value_t values[1];
+ value_list_t vl = VALUE_LIST_INIT;
- if (snprintf (buf, BUFSIZE, "%u:%f", (unsigned int) curtime, *value) >= BUFSIZE)
- return;
+ values[0].gauge = value;
- plugin_submit (MODULE_NAME, "-", buf);
+ vl.values = values;
+ vl.values_len = 1;
+ 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 (&vl);
}
-#undef BUFSIZE
-static void multimeter_read (void)
+static int multimeter_read (void)
{
double value;
- if (fd > -1 && !(multimeter_read_value(&value)))
- multimeter_submit (&value);
-}
+ if (fd < 0)
+ return (-1);
-void module_register (void)
+ if (multimeter_read_value (&value) != 0)
+ return (-1);
+
+ multimeter_submit (value);
+ return (0);
+} /* int multimeter_read */
+
+static int multimeter_shutdown (void)
{
- plugin_register (MODULE_NAME, multimeter_init, multimeter_read, multimeter_write);
+ if (fd >= 0)
+ {
+ close (fd);
+ fd = -1;
+ }
+
+ return (0);
}
-#undef MODULE_NAME
+void module_register (void)
+{
+ plugin_register_init ("multimeter", multimeter_init);
+ plugin_register_read ("multimeter", multimeter_read);
+ plugin_register_shutdown ("multimeter", multimeter_shutdown);
+} /* void module_register */