X-Git-Url: https://git.octo.it/?p=collectd.git;a=blobdiff_plain;f=src%2Fapple_sensors.c;h=19d5a49f31731ead712a4d78409bdd87b492007e;hp=29d509157723e7939acbf2988ad899764025010e;hb=633c3966f770e4d46651a2fe219a18d8a9907a9f;hpb=d561a8387f633491bdcd7fe6964f0b63ae694af5 diff --git a/src/apple_sensors.c b/src/apple_sensors.c index 29d50915..19d5a49f 100644 --- a/src/apple_sensors.c +++ b/src/apple_sensors.c @@ -2,27 +2,31 @@ * collectd - src/apple_sensors.c * Copyright (C) 2006,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 License as published by the - * Free Software Foundation; only version 2 of the License is applicable. + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: * - * 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. + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. * - * 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 + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. * * Authors: - * Florian octo Forster + * Florian octo Forster **/ #include "collectd.h" #include "common.h" #include "plugin.h" -#include "utils_debug.h" #if HAVE_CTYPE_H # include @@ -50,37 +54,8 @@ # include #endif -#if HAVE_IOKIT_IOKITLIB_H -# define IOKIT_HAVE_READ 1 -#else -# define IOKIT_HAVE_READ 0 -#endif - -#if HAVE_IOKIT_IOKITLIB_H static mach_port_t io_master_port = MACH_PORT_NULL; -#endif - -static data_source_t data_source_fanspeed[1] = -{ - {"value", DS_TYPE_GAUGE, 0, NAN} -}; -static data_set_t fanspeed_ds = -{ - "fanspeed", 1, data_source_fanspeed -}; - -static data_source_t data_source_temperature[1] = -{ - {"value", DS_TYPE_GAUGE, -273.15, NAN} -}; - -static data_set_t temperature_ds = -{ - "temperature", 1, data_source_temperature -}; - -#if IOKIT_HAVE_READ static int as_init (void) { kern_return_t status; @@ -95,7 +70,7 @@ static int as_init (void) status = IOMasterPort (MACH_PORT_NULL, &io_master_port); if (status != kIOReturnSuccess) { - syslog (LOG_ERR, "IOMasterPort failed: %s", + ERROR ("IOMasterPort failed: %s", mach_error_string (status)); io_master_port = MACH_PORT_NULL; return (-1); @@ -110,20 +85,20 @@ static void as_submit (const char *type, const char *type_instance, value_t values[1]; value_list_t vl = VALUE_LIST_INIT; - DBG ("type = %s; type_instance = %s; val = %f;", + DEBUG ("type = %s; type_instance = %s; val = %f;", type, type_instance, val); values[0].gauge = val; vl.values = values; vl.values_len = 1; - vl.time = time (NULL); - strcpy (vl.host, hostname_g); - strcpy (vl.plugin, "apple_sensors"); - strcpy (vl.plugin_instance, ""); - strcpy (vl.type_instance, type_instance); + sstrncpy (vl.host, hostname_g, sizeof (vl.host)); + sstrncpy (vl.plugin, "apple_sensors", sizeof (vl.plugin)); + sstrncpy (vl.plugin_instance, "", sizeof (vl.plugin_instance)); + sstrncpy (vl.type, type, sizeof (vl.type)); + sstrncpy (vl.type_instance, type_instance, sizeof (vl.type_instance)); - plugin_dispatch_values (type, &vl); + plugin_dispatch_values (&vl); } static int as_read (void) @@ -148,7 +123,7 @@ static int as_read (void) &iterator); if (status != kIOReturnSuccess) { - syslog (LOG_ERR, "IOServiceGetMatchingServices failed: %s", + ERROR ("IOServiceGetMatchingServices failed: %s", mach_error_string (status)); return (-1); } @@ -162,7 +137,7 @@ static int as_read (void) kNilOptions); if (status != kIOReturnSuccess) { - DBG ("IORegistryEntryCreateCFProperties failed: %s", + DEBUG ("IORegistryEntryCreateCFProperties failed: %s", mach_error_string (status)); continue; } @@ -176,10 +151,10 @@ static int as_read (void) if (CFGetTypeID (property) != CFStringGetTypeID ()) continue; if (!CFStringGetCString (property, - type, 128, + type, sizeof (type), kCFStringEncodingASCII)) continue; - type[127] = '\0'; + type[sizeof (type) - 1] = '\0'; /* Copy the sensor location. This will be used as `instance'. */ property = NULL; @@ -190,10 +165,10 @@ static int as_read (void) if (CFGetTypeID (property) != CFStringGetTypeID ()) continue; if (!CFStringGetCString (property, - inst, 128, + inst, sizeof (inst), kCFStringEncodingASCII)) continue; - inst[127] = '\0'; + inst[sizeof (inst) - 1] = '\0'; for (i = 0; i < 128; i++) { if (inst[i] == '\0') @@ -222,17 +197,17 @@ static int as_read (void) if (strcmp (type, "temperature") == 0) { value_double = ((double) value_int) / 65536.0; - strcpy (type, "temperature"); + sstrncpy (type, "temperature", sizeof (type)); } else if (strcmp (type, "temp") == 0) { value_double = ((double) value_int) / 10.0; - strcpy (type, "temperature"); + sstrncpy (type, "temperature", sizeof (type)); } else if (strcmp (type, "fanspeed") == 0) { value_double = ((double) value_int) / 65536.0; - strcpy (type, "fanspeed"); + sstrncpy (type, "fanspeed", sizeof (type)); } else if (strcmp (type, "voltage") == 0) { @@ -242,11 +217,11 @@ static int as_read (void) else if (strcmp (type, "adc") == 0) { value_double = ((double) value_int) / 10.0; - strcpy (type, "fanspeed"); + sstrncpy (type, "fanspeed", sizeof (type)); } else { - DBG ("apple_sensors: Read unknown sensor type: %s", + DEBUG ("apple_sensors: Read unknown sensor type: %s", type); value_double = (double) value_int; } @@ -261,15 +236,9 @@ static int as_read (void) return (0); } /* int as_read */ -#endif /* IOKIT_HAVE_READ */ void module_register (void) { - plugin_register_data_set (&fanspeed_ds); - plugin_register_data_set (&temperature_ds); - -#if IOKIT_HAVE_READ plugin_register_init ("apple_sensors", as_init); plugin_register_read ("apple_sensors", as_read); -#endif /* IOKIT_HAVE_READ */ -} +} /* void module_register */