X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fcommon.c;h=6521a58bd1a07a376fda133faed70f549e122ed3;hb=7c0bcfba668deb45426cf33b5ac721d5a444e8f2;hp=6da5e33cbfaa1e24130365de6d274703be49d9bc;hpb=9f0557d03a0be5a857b5d4e52540d07eb2cc2890;p=collectd.git diff --git a/src/common.c b/src/common.c index 6da5e33c..6521a58b 100644 --- a/src/common.c +++ b/src/common.c @@ -1,21 +1,19 @@ /** * collectd - src/common.c - * Copyright (C) 2005,2006 Florian octo Forster + * Copyright (C) 2005-2007 Florian octo Forster * - * This program is free software; you can redistribute it and/ - * or modify it under the terms of the GNU General Public Li- - * cence as published by the Free Software Foundation; either - * version 2 of the Licence, or any later version. + * 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 + * Free Software Foundation; only version 2 of the License is applicable. * - * This program is distributed in the hope that it will be use- - * ful, but WITHOUT ANY WARRANTY; without even the implied war- - * ranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * See the GNU General Public Licence for more details. + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. * - * You should have received a copy of the GNU General Public - * Licence along with this program; if not, write to the Free - * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, - * USA. + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA * * Authors: * Florian octo Forster @@ -23,13 +21,16 @@ **/ #include "common.h" -#include "utils_debug.h" +#include "plugin.h" #ifdef HAVE_MATH_H # include #endif -extern int operating_mode; +/* for ntohl and htonl */ +#if HAVE_ARPA_INET_H +# include +#endif #ifdef HAVE_LIBKSTAT extern kstat_ctl_t *kc; @@ -50,20 +51,29 @@ char *sstrdup (const char *s) if((r = strdup (s)) == NULL) { - DBG ("Not enough memory."); + DEBUG ("Not enough memory."); exit(3); } return (r); } +/* Don't use the return value of `strerror_r', because the GNU-people got + * inventive there.. -octo */ +char *sstrerror (int errnum, char *buf, size_t buflen) +{ + buf[0] = '\0'; + strerror_r (errnum, buf, buflen); + return (buf); +} /* char *sstrerror */ + void *smalloc (size_t size) { void *r; if ((r = malloc (size)) == NULL) { - DBG("Not enough memory."); + DEBUG("Not enough memory."); exit(3); } @@ -104,7 +114,7 @@ ssize_t sread (int fd, void *buf, size_t count) if (status == 0) { - DBG ("Received EOF from fd %i. " + DEBUG ("Received EOF from fd %i. " "Closing fd and returning error.", fd); close (fd); @@ -151,10 +161,12 @@ int strsplit (char *string, char **fields, size_t size) { size_t i; char *ptr; + char *saveptr; i = 0; ptr = string; - while ((fields[i] = strtok (ptr, " \t")) != NULL) + saveptr = NULL; + while ((fields[i] = strtok_r (ptr, " \t", &saveptr)) != NULL) { ptr = NULL; i++; @@ -288,7 +300,9 @@ int check_create_dir (const char *file_orig) char *fields[16]; int fields_num; char *ptr; + char *saveptr; int last_is_file = 1; + int path_is_absolute = 0; int len; int i; @@ -309,9 +323,11 @@ int check_create_dir (const char *file_orig) */ if (file_orig[len - 1] == '/') last_is_file = 0; + if (file_orig[0] == '/') + path_is_absolute = 1; /* - * Create a copy for `strtok' to destroy + * Create a copy for `strtok_r' to destroy */ strncpy (file_copy, file_orig, 512); file_copy[511] = '\0'; @@ -321,8 +337,9 @@ int check_create_dir (const char *file_orig) * remove leading and trailing slashes.. */ ptr = file_copy; + saveptr = NULL; fields_num = 0; - while ((fields[fields_num] = strtok (ptr, "/")) != NULL) + while ((fields[fields_num] = strtok_r (ptr, "/", &saveptr)) != NULL) { ptr = NULL; fields_num++; @@ -343,16 +360,18 @@ int check_create_dir (const char *file_orig) */ if (fields[i][0] == '.') { - syslog (LOG_ERR, "Cowardly refusing to create a directory that begins with a `.' (dot): `%s'", file_orig); + ERROR ("Cowardly refusing to create a directory that begins with a `.' (dot): `%s'", file_orig); return (-2); } /* * Join the components together again */ - if (strjoin (dir, dir_len, fields, i + 1, "/") < 0) + dir[0] = '/'; + if (strjoin (dir + path_is_absolute, dir_len - path_is_absolute, + fields, i + 1, "/") < 0) { - syslog (LOG_ERR, "strjoin failed: `%s', component #%i", file_orig, i); + ERROR ("strjoin failed: `%s', component #%i", file_orig, i); return (-1); } @@ -362,19 +381,25 @@ int check_create_dir (const char *file_orig) { if (mkdir (dir, 0755) == -1) { - syslog (LOG_ERR, "mkdir (%s): %s", dir, strerror (errno)); + char errbuf[1024]; + ERROR ("mkdir (%s): %s", dir, + sstrerror (errno, + errbuf, sizeof (errbuf))); return (-1); } } else { - syslog (LOG_ERR, "stat (%s): %s", dir, strerror (errno)); + char errbuf[1024]; + ERROR ("stat (%s): %s", dir, + sstrerror (errno, errbuf, + sizeof (errbuf))); return (-1); } } else if (!S_ISDIR (statbuf.st_mode)) { - syslog (LOG_ERR, "stat (%s): Not a directory!", dir); + ERROR ("stat (%s): Not a directory!", dir); return (-1); } } @@ -382,140 +407,6 @@ int check_create_dir (const char *file_orig) return (0); } -static int log_create_file (char *filename, char **ds_def, int ds_num) -{ - FILE *log; - int i; - - if (check_create_dir (filename)) - return (-1); - - log = fopen (filename, "w"); - if (log == NULL) - { - syslog (LOG_WARNING, "Failed to create %s: %s", filename, - strerror(errno)); - return (-1); - } - - fprintf (log, "epoch"); - for (i = 0; i < ds_num; i++) - { - char *name; - char *tmp; - - name = strchr (ds_def[i], ':'); - if (name == NULL) - { - syslog (LOG_WARNING, "Invalid DS definition '%s' for %s", - ds_def[i], filename); - fclose(log); - remove(filename); - return (-1); - } - - name += 1; - tmp = strchr (name, ':'); - if (tmp == NULL) - { - syslog (LOG_WARNING, "Invalid DS definition '%s' for %s", - ds_def[i], filename); - fclose(log); - remove(filename); - return (-1); - } - - /* The `%.*s' is needed because there is no null-byte behind - * the name. */ - fprintf(log, ",%.*s", (int) (tmp - name), name); - } - fprintf(log, "\n"); - fclose(log); - - return 0; -} - -int log_update_file (char *host, char *file, char *values, - char **ds_def, int ds_num) -{ - char *tmp; - FILE *fp; - struct stat statbuf; - char full_file[1024]; - - /* Cook the values a bit: Substitute colons with commas */ - strsubstitute (values, ':', ','); - - /* host == NULL => local mode */ - if (host != NULL) - { - if (snprintf (full_file, 1024, "%s/%s", host, file) >= 1024) - return (-1); - } - else - { - if (snprintf (full_file, 1024, "%s", file) >= 1024) - return (-1); - } - - strncpy (full_file, file, 1024); - - tmp = full_file + strlen (full_file) - 4; - assert ((tmp != NULL) && (tmp > full_file)); - - /* Change the filename for logfiles. */ - if (strncmp (tmp, ".rrd", 4) == 0) - { - time_t now; - struct tm *tm; - - /* TODO: Find a way to minimize the calls to `localtime', since - * they are pretty expensive.. */ - now = time (NULL); - tm = localtime (&now); - - strftime (tmp, 1024 - (tmp - full_file), "-%Y-%m-%d", tm); - - /* `localtime(3)' returns a pointer to static data, - * therefore the pointer may not be free'd. */ - } - else - DBG ("The filename ends with `%s' which is unexpected.", tmp); - - if (stat (full_file, &statbuf) == -1) - { - if (errno == ENOENT) - { - if (log_create_file (full_file, ds_def, ds_num)) - return (-1); - } - else - { - syslog (LOG_ERR, "stat %s: %s", full_file, strerror (errno)); - return (-1); - } - } - else if (!S_ISREG (statbuf.st_mode)) - { - syslog (LOG_ERR, "stat %s: Not a regular file!", full_file); - return (-1); - } - - - fp = fopen (full_file, "a"); - if (fp == NULL) - { - syslog (LOG_WARNING, "Failed to append to %s: %s", full_file, - strerror(errno)); - return (-1); - } - fprintf(fp, "%s\n", values); - fclose(fp); - - return (0); -} /* int log_update_file */ - - #ifdef HAVE_LIBKSTAT int get_kstat (kstat_t **ksp_ptr, char *module, int instance, char *name) { @@ -531,13 +422,13 @@ int get_kstat (kstat_t **ksp_ptr, char *module, int instance, char *name) { if ((*ksp_ptr = kstat_lookup (kc, module, instance, name)) == NULL) { - syslog (LOG_ERR, "Cound not find kstat %s", ident); + ERROR ("Cound not find kstat %s", ident); return (-1); } if ((*ksp_ptr)->ks_type != KSTAT_TYPE_NAMED) { - syslog (LOG_WARNING, "kstat %s has wrong type", ident); + WARNING ("kstat %s has wrong type", ident); *ksp_ptr = NULL; return (-1); } @@ -550,13 +441,13 @@ int get_kstat (kstat_t **ksp_ptr, char *module, int instance, char *name) if (kstat_read (kc, *ksp_ptr, NULL) == -1) { - syslog (LOG_WARNING, "kstat %s could not be read", ident); + WARNING ("kstat %s could not be read", ident); return (-1); } if ((*ksp_ptr)->ks_type != KSTAT_TYPE_NAMED) { - syslog (LOG_WARNING, "kstat %s has wrong type", ident); + WARNING ("kstat %s has wrong type", ident); return (-1); } @@ -596,8 +487,63 @@ long long get_kstat_value (kstat_t *ksp, char *name) else if (kn->data_type == KSTAT_DATA_UINT64) retval = (long long) kn->value.ui64; /* XXX: Might overflow! */ else - syslog (LOG_WARNING, "get_kstat_value: Not a numeric value: %s", name); + WARNING ("get_kstat_value: Not a numeric value: %s", name); return (retval); } #endif /* HAVE_LIBKSTAT */ + +unsigned long long ntohll (unsigned long long n) +{ +#if __BYTE_ORDER == __BIG_ENDIAN + return (n); +#else + return (((unsigned long long) ntohl (n)) << 32) + ntohl (n >> 32); +#endif +} /* unsigned long long ntohll */ + +unsigned long long htonll (unsigned long long n) +{ +#if __BYTE_ORDER == __BIG_ENDIAN + return (n); +#else + return (((unsigned long long) htonl (n)) << 32) + htonl (n >> 32); +#endif +} /* unsigned long long htonll */ + +int format_name (char *ret, int ret_len, + const char *hostname, + const char *plugin, const char *plugin_instance, + const char *type, const char *type_instance) +{ + int status; + + assert (plugin != NULL); + assert (type != NULL); + + if ((plugin_instance == NULL) || (strlen (plugin_instance) == 0)) + { + if ((type_instance == NULL) || (strlen (type_instance) == 0)) + status = snprintf (ret, ret_len, "%s/%s/%s", + hostname, plugin, type); + else + status = snprintf (ret, ret_len, "%s/%s/%s-%s", + hostname, plugin, type, + type_instance); + } + else + { + if ((type_instance == NULL) || (strlen (type_instance) == 0)) + status = snprintf (ret, ret_len, "%s/%s-%s/%s", + hostname, plugin, plugin_instance, + type); + else + status = snprintf (ret, ret_len, "%s/%s-%s/%s-%s", + hostname, plugin, plugin_instance, + type, type_instance); + } + + if ((status < 1) || (status >= ret_len)) + return (-1); + return (0); +} /* int format_name */