X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fhddtemp.c;h=80b3419bee76d3e96efacb242bdba4f946efc5be;hb=b54b5ebf3012f180e87000ef45c6cd8387de822d;hp=1651a32d4e569a6a16c1d21a626c2a15c38cd343;hpb=586eed684dc5529c74d6e81f80e226c122494495;p=collectd.git diff --git a/src/hddtemp.c b/src/hddtemp.c index 1651a32d..80b3419b 100644 --- a/src/hddtemp.c +++ b/src/hddtemp.c @@ -1,6 +1,6 @@ /** * collectd - src/hddtemp.c - * Copyright (C) 2005 Vincent Stehlé + * Copyright (C) 2005,2006 Vincent Stehlé * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -19,12 +19,18 @@ * Authors: * Vincent Stehlé * Florian octo Forster + * + * TODO: + * Do a pass, some day, and spare some memory. We consume too much for now + * in string buffers and the like. + * **/ #include "collectd.h" #include "common.h" #include "plugin.h" #include "configfile.h" +#include "utils_debug.h" #define MODULE_NAME "hddtemp" @@ -34,18 +40,12 @@ #include #include /* for basename */ -#if 0 -/* LOCALHOST_ADDR - The ip address 127.0.0.1, as a 32 bit. */ -#define LOCALHOST_ADDR 0x7F000001 - -/* HDDTEMP_PORT - The tcp port the hddtemp daemon is listening on. */ -#define HDDTEMP_PORT 7634 +#if HAVE_LINUX_MAJOR_H +# include #endif #define HDDTEMP_DEF_HOST "127.0.0.1" -#define HDDTEMP_DEF_PORT 7634 +#define HDDTEMP_DEF_PORT "7634" /* BUFFER_SIZE Size of the buffer we use to receive from the hddtemp daemon. */ @@ -55,7 +55,7 @@ static char *filename_format = "hddtemp-%s.rrd"; static char *ds_def[] = { - "DS:value:GAUGE:25:U:U", + "DS:value:GAUGE:"COLLECTD_HEARTBEAT":U:U", NULL }; static int ds_num = 1; @@ -78,7 +78,7 @@ typedef struct hddname static hddname_t *first_hddname = NULL; static char *hddtemp_host = NULL; -static int hddtemp_port = 0; +static char *hddtemp_port = NULL; /* * NAME @@ -101,62 +101,74 @@ static int hddtemp_port = 0; * * FIXME: * we need to create a new socket each time. Is there another way? + * Hm, maybe we can re-use the `sockaddr' structure? -octo */ static int hddtemp_query_daemon (char *buffer, int buffer_size) { - int sock; + int fd; ssize_t status; int buffer_fill; - char *host; - int port; + const char *host; + const char *port; - struct hostent *srv_ent; - struct sockaddr_in srv_addr; + struct addrinfo ai_hints; + struct addrinfo *ai_list, *ai_ptr; + int ai_return; + + memset (&ai_hints, '\0', sizeof (ai_hints)); + ai_hints.ai_flags = AI_ADDRCONFIG; + ai_hints.ai_family = PF_UNSPEC; + ai_hints.ai_socktype = SOCK_STREAM; + ai_hints.ai_protocol = IPPROTO_TCP; host = hddtemp_host; if (host == NULL) host = HDDTEMP_DEF_HOST; port = hddtemp_port; - if (port == 0) + if (port == NULL) port = HDDTEMP_DEF_PORT; - /* - * Resolve `host' address and set up `srv_addr' - */ - memset (&srv_addr, '\0', sizeof (srv_addr)); - - /* - * FIXME - * use `getaddrinfo' - */ - if ((srv_ent = gethostbyname (host)) == NULL) + if ((ai_return = getaddrinfo (host, port, &ai_hints, &ai_list)) != 0) { - syslog (LOG_WARNING, "hddtemp: Could not resolve hostname `%s'", - host); + syslog (LOG_ERR, "hddtemp: getaddrinfo (%s, %s): %s", + host, port, + ai_return == EAI_SYSTEM ? strerror (errno) : gai_strerror (ai_return)); return (-1); } - - memcpy (&srv_addr.sin_addr.s_addr, srv_ent->h_addr, srv_ent->h_length); - srv_addr.sin_port = htons (port); - srv_addr.sin_family = AF_INET; - /* create our socket descriptor */ - if ((sock = socket (PF_INET, SOCK_STREAM, 0)) < 0) + fd = -1; + for (ai_ptr = ai_list; ai_ptr != NULL; ai_ptr = ai_ptr->ai_next) { - syslog (LOG_ERR, "hddtemp: could not create socket: %s", - strerror (errno)); - return (-1); + /* create our socket descriptor */ + if ((fd = socket (ai_ptr->ai_family, ai_ptr->ai_socktype, ai_ptr->ai_protocol)) < 0) + { + syslog (LOG_ERR, "hddtemp: socket: %s", + strerror (errno)); + continue; + } + + /* connect to the hddtemp daemon */ + if (connect (fd, (struct sockaddr *) ai_ptr->ai_addr, ai_ptr->ai_addrlen)) + { + DBG ("hddtemp: connect (%s, %s): %s", host, port, + strerror (errno)); + close (fd); + fd = -1; + continue; + } + + /* A socket could be opened and connecting succeeded. We're + * done. */ + break; } - /* connect to the hddtemp daemon */ - if (connect (sock, (struct sockaddr *) &srv_addr, sizeof (srv_addr))) + freeaddrinfo (ai_list); + + if (fd < 0) { - syslog (LOG_ERR, "hddtemp: Could not connect to the hddtemp " - "daemon at %s:%i: %s", - host, port, strerror (errno)); - close (sock); + syslog (LOG_ERR, "hddtemp: Could not connect to daemon."); return (-1); } @@ -164,7 +176,7 @@ static int hddtemp_query_daemon (char *buffer, int buffer_size) memset (buffer, '\0', buffer_size); buffer_fill = 0; - while ((status = read (sock, buffer + buffer_fill, buffer_size - buffer_fill)) != 0) + while ((status = read (fd, buffer + buffer_fill, buffer_size - buffer_fill)) != 0) { if (status == -1) { @@ -173,6 +185,7 @@ static int hddtemp_query_daemon (char *buffer, int buffer_size) syslog (LOG_ERR, "hddtemp: Error reading from socket: %s", strerror (errno)); + close (fd); return (-1); } buffer_fill += status; @@ -190,11 +203,11 @@ static int hddtemp_query_daemon (char *buffer, int buffer_size) { syslog (LOG_WARNING, "hddtemp: Peer has unexpectedly shut down the socket. " "Buffer: `%s'", buffer); - close (sock); + close (fd); return (-1); } - close (sock); + close (fd); return (0); } @@ -208,7 +221,9 @@ static int hddtemp_config (char *key, char *value) } else if (strcasecmp (key, "port") == 0) { - hddtemp_port = atoi (value); + if (hddtemp_port != NULL) + free (hddtemp_port); + hddtemp_port = strdup (value); } else { @@ -218,8 +233,12 @@ static int hddtemp_config (char *key, char *value) return (0); } +/* In the init-function we initialize the `hddname_t' list used to translate + * disk-names. Under Linux that's done using `/proc/partitions'. Under other + * operating-systems, it's not done at all. */ static void hddtemp_init (void) { +#if KERNEL_LINUX FILE *fh; char buf[BUFFER_SIZE]; int buflen; @@ -246,12 +265,21 @@ static void hddtemp_init (void) if ((fh = fopen ("/proc/partitions", "r")) != NULL) { + DBG ("Looking at /proc/partitions..."); + while (fgets (buf, BUFFER_SIZE, fh) != NULL) { /* Delete trailing newlines */ buflen = strlen (buf); + while ((buflen > 0) && ((buf[buflen-1] == '\n') || (buf[buflen-1] == '\r'))) buf[--buflen] = '\0'; + + /* We want lines of the form: + * + * 3 1 77842926 hda1 + * + * ...so, skip everything else. */ if (buflen == 0) continue; @@ -263,23 +291,74 @@ static void hddtemp_init (void) major = atoi (fields[0]); minor = atoi (fields[1]); - /* I know that this makes `minor' redundant, but I want - * to be able to change this beavior in the future.. - * And 4 or 8 bytes won't hurt anybody.. -octo */ - if (major == 0) - continue; - if (minor != 0) - continue; + /* We try to keep only entries, which may correspond to + * physical disks and that may have a corresponding + * entry in the hddtemp daemon. Basically, this means + * IDE and SCSI. */ + switch (major) + { + /* SCSI. */ + case SCSI_DISK0_MAJOR: + case SCSI_DISK1_MAJOR: + case SCSI_DISK2_MAJOR: + case SCSI_DISK3_MAJOR: + case SCSI_DISK4_MAJOR: + case SCSI_DISK5_MAJOR: + case SCSI_DISK6_MAJOR: + case SCSI_DISK7_MAJOR: + case SCSI_DISK8_MAJOR: + case SCSI_DISK9_MAJOR: + case SCSI_DISK10_MAJOR: + case SCSI_DISK11_MAJOR: + case SCSI_DISK12_MAJOR: + case SCSI_DISK13_MAJOR: + case SCSI_DISK14_MAJOR: + case SCSI_DISK15_MAJOR: + /* SCSI disks minors are multiples of 16. + * Keep only those. */ + if (minor % 16) + continue; + break; + + /* IDE. */ + case IDE0_MAJOR: + case IDE1_MAJOR: + case IDE2_MAJOR: + case IDE3_MAJOR: + case IDE4_MAJOR: + case IDE5_MAJOR: + case IDE6_MAJOR: + case IDE7_MAJOR: + case IDE8_MAJOR: + case IDE9_MAJOR: + /* IDE disks minors can only be 0 or 64. + * Keep only those. */ + if(minor != 0 && minor != 64) + continue; + break; + + /* Skip all other majors. */ + default: + DBG ("Skipping unknown major %i", major); + continue; + } /* switch (major) */ if ((name = strdup (fields[3])) == NULL) + { + syslog (LOG_ERR, "hddtemp: strdup(%s) == NULL", fields[3]); continue; + } if ((entry = (hddname_t *) malloc (sizeof (hddname_t))) == NULL) { + syslog (LOG_ERR, "hddtemp: malloc (%u) == NULL", + (unsigned int) sizeof (hddname_t)); free (name); continue; } + DBG ("Found disk: %s (%u:%u).", name, major, minor); + entry->major = major; entry->minor = minor; entry->name = name; @@ -295,9 +374,12 @@ static void hddtemp_init (void) first_hddname = entry; } } + fclose (fh); } - - return; + else + DBG ("Could not open /proc/partitions: %s", + strerror (errno)); +#endif /* KERNEL_LINUX */ } static void hddtemp_write (char *host, char *inst, char *val) @@ -315,6 +397,14 @@ static void hddtemp_write (char *host, char *inst, char *val) rrd_update_file (host, filename, val, ds_def, ds_num); } +/* + * hddtemp_get_name + * + * Description: + * Try to "cook" a bit the drive name as returned + * by the hddtemp daemon. The intend is to transform disk + * names into - when possible. + */ static char *hddtemp_get_name (char *drive) { hddname_t *list; @@ -325,7 +415,10 @@ static char *hddtemp_get_name (char *drive) break; if (list == NULL) + { + DBG ("Don't know %s, keeping name as-is.", drive); return (strdup (drive)); + } if ((ret = (char *) malloc (128 * sizeof (char))) == NULL) return (NULL); @@ -343,7 +436,8 @@ static void hddtemp_submit (char *inst, double temperature) { char buf[BUFFER_SIZE]; - if (snprintf (buf, BUFFER_SIZE, "%u:%.3f", (unsigned int) curtime, temperature) >= BUFFER_SIZE) + if (snprintf (buf, BUFFER_SIZE, "%u:%.3f", (unsigned int) curtime, temperature) + >= BUFFER_SIZE) return; plugin_submit (MODULE_NAME, inst, buf); @@ -409,12 +503,12 @@ static void hddtemp_read (void) char *mode; mode = fields[4*i + 3]; + name = basename (fields[4*i + 0]); /* Skip non-temperature information */ if (mode[0] != 'C' && mode[0] != 'F') continue; - name = basename (fields[4*i + 0]); temperature = atof (fields[4*i + 2]); /* Convert farenheit to celsius */