X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fmultimeter.c;h=9321daf8e9176831903ec89e1aee70def9f5cd3a;hb=2ede5e7fd0f7e75edd1fba531cd870bb16092e71;hp=317745b285ad1798761ab651bfc1057fd065d0c6;hpb=444a2bce1161bb09c268f42757fc0fec83990549;p=collectd.git diff --git a/src/multimeter.c b/src/multimeter.c index 317745b2..9321daf8 100644 --- a/src/multimeter.c +++ b/src/multimeter.c @@ -20,48 +20,23 @@ * Peter Holik * * Used multimeter: Metex M-4650CR - * **/ -#include -#include -#include #include "collectd.h" + #include "common.h" #include "plugin.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 +# include +# include +#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) { @@ -75,8 +50,10 @@ 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++; @@ -90,18 +67,26 @@ static int multimeter_read_value(double *value) 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); @@ -150,34 +135,35 @@ static int multimeter_read_value(double *value) } 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 "; - for (i = 0; i < 10; i++) + for (int i = 0; i < 10; i++) { - device[strlen(device)-1] = i + '0'; + device[strlen(device)-1] = i + '0'; - if ((fd = open(device, O_RDWR | O_NOCTTY)) > 0) + if ((fd = open(device, O_RDWR | O_NOCTTY)) != -1) { - struct termios tios; + struct termios tios = { 0 }; int rts = TIOCM_RTS; double value; tios.c_cflag = B1200 | CS7 | CSTOPB | CREAD | CLOCAL; tios.c_iflag = IGNBRK | IGNPAR; - tios.c_oflag = 0; + tios.c_oflag = 0; tios.c_lflag = 0; tios.c_cc[VTIME] = 3; tios.c_cc[VMIN] = LINE_LENGTH; @@ -185,50 +171,66 @@ static void multimeter_init (void) tcflush(fd, TCIFLUSH); 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) -{ - rrd_update_file (host, multimeter_file, val, ds_def, ds_num); -} -#define BUFSIZE 128 -static void multimeter_submit (double *value) +static void multimeter_submit (double value) { - char buf[BUFSIZE]; + value_list_t vl = VALUE_LIST_INIT; - if (snprintf (buf, BUFSIZE, "%u:%f", (unsigned int) curtime, *value) >= BUFSIZE) - return; + vl.values = &(value_t) { .gauge = value }; + vl.values_len = 1; + sstrncpy (vl.plugin, "multimeter", sizeof (vl.plugin)); + sstrncpy (vl.type, "multimeter", sizeof (vl.type)); - plugin_submit (MODULE_NAME, NULL, buf); + 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 */