X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fcpu.c;h=b087d6654d2edfa84480fd5e6d5dffec80aa5392;hb=4c66592ee43abb01bfc792dac9bcc0df9d3df567;hp=74faf09a93fe9d946771dbe063dcc741e77173c6;hpb=5001a461add250d65fbfb63c95beef4b8816cdc1;p=collectd.git diff --git a/src/cpu.c b/src/cpu.c index 74faf09a..b087d665 100644 --- a/src/cpu.c +++ b/src/cpu.c @@ -1,6 +1,6 @@ /** * collectd - src/cpu.c - * Copyright (C) 2005 Florian octo Forster + * Copyright (C) 2005,2006 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 @@ -36,12 +36,18 @@ #ifdef HAVE_MACH_HOST_PRIV_H # include #endif +#if HAVE_MACH_MACH_ERROR_H +# include +#endif #ifdef HAVE_MACH_PROCESSOR_INFO_H # include #endif #ifdef HAVE_MACH_PROCESSOR_H # include #endif +#ifdef HAVE_MACH_VM_MAP_H +# include +#endif #ifdef HAVE_LIBKSTAT # include @@ -76,6 +82,12 @@ static mach_port_t port_host; static processor_port_array_t cpu_list; static mach_msg_type_number_t cpu_list_len; + +#if PROCESSOR_TEMPERATURE +static int cpu_temp_retry_counter = 0; +static int cpu_temp_retry_step = 1; +static int cpu_temp_retry_max = 1; +#endif /* PROCESSOR_TEMPERATURE */ /* #endif PROCESSOR_CPU_LOAD_INFO */ #elif defined(KERNEL_LINUX) @@ -109,11 +121,13 @@ static int ds_num = 5; static void cpu_init (void) { -#ifdef PROCESSOR_CPU_LOAD_INFO +#if PROCESSOR_CPU_LOAD_INFO || PROCESSOR_TEMPERATURE kern_return_t status; + int collectd_step; port_host = mach_host_self (); + /* FIXME: Free `cpu_list' if it's not NULL */ if ((status = host_processors (port_host, &cpu_list, &cpu_list_len)) != KERN_SUCCESS) { syslog (LOG_ERR, "cpu-plugin: host_processors returned %i\n", (int) status); @@ -123,6 +137,11 @@ static void cpu_init (void) DBG ("host_processors returned %i %s", (int) cpu_list_len, cpu_list_len == 1 ? "processor" : "processors"); syslog (LOG_INFO, "cpu-plugin: Found %i processor%s.", (int) cpu_list_len, cpu_list_len == 1 ? "" : "s"); + + collectd_step = atoi (COLLECTD_STEP); + if ((collectd_step > 0) && (collectd_step <= 86400)) + cpu_temp_retry_max = 86400 / collectd_step; + /* #endif PROCESSOR_CPU_LOAD_INFO */ #elif defined(HAVE_LIBKSTAT) @@ -193,34 +212,39 @@ static void cpu_submit (int cpu_num, unsigned long long user, static void cpu_read (void) { -#ifdef PROCESSOR_CPU_LOAD_INFO +#if PROCESSOR_CPU_LOAD_INFO || PROCESSOR_TEMPERATURE int cpu; kern_return_t status; +#if PROCESSOR_CPU_LOAD_INFO processor_cpu_load_info_data_t cpu_info; - processor_cpu_load_info_t cpu_info_ptr; mach_msg_type_number_t cpu_info_len; +#endif +#if PROCESSOR_TEMPERATURE + processor_info_data_t cpu_temp; + mach_msg_type_number_t cpu_temp_len; +#endif host_t cpu_host; for (cpu = 0; cpu < cpu_list_len; cpu++) { +#if PROCESSOR_CPU_LOAD_INFO cpu_host = 0; - cpu_info_ptr = &cpu_info; - cpu_info_len = sizeof (cpu_info); + cpu_info_len = PROCESSOR_BASIC_INFO_COUNT; if ((status = processor_info (cpu_list[cpu], PROCESSOR_CPU_LOAD_INFO, &cpu_host, - (processor_info_t) cpu_info_ptr, &cpu_info_len)) != KERN_SUCCESS) + (processor_info_t) &cpu_info, &cpu_info_len)) != KERN_SUCCESS) { - syslog (LOG_ERR, "processor_info failed with status %i\n", (int) status); + syslog (LOG_ERR, "cpu-plugin: processor_info failed with status %i\n", (int) status); continue; } if (cpu_info_len < CPU_STATE_MAX) { - syslog (LOG_ERR, "processor_info returned only %i elements..\n", cpu_info_len); + syslog (LOG_ERR, "cpu-plugin: processor_info returned only %i elements..\n", cpu_info_len); continue; } @@ -229,6 +253,51 @@ static void cpu_read (void) cpu_info.cpu_ticks[CPU_STATE_SYSTEM], cpu_info.cpu_ticks[CPU_STATE_IDLE], 0ULL); +#endif /* PROCESSOR_CPU_LOAD_INFO */ +#if PROCESSOR_TEMPERATURE + /* + * Not all Apple computers do have this ability. To minimize + * the messages sent to the syslog we do an exponential + * stepback if `processor_info' fails. We still try ~once a day + * though.. + */ + if (cpu_temp_retry_counter > 0) + { + cpu_temp_retry_counter--; + continue; + } + + cpu_temp_len = PROCESSOR_INFO_MAX; + + status = processor_info (cpu_list[cpu], + PROCESSOR_TEMPERATURE, + &cpu_host, + cpu_temp, &cpu_temp_len); + if (status != KERN_SUCCESS) + { + syslog (LOG_ERR, "cpu-plugin: processor_info failed: %s", + mach_error_string (status)); + + cpu_temp_retry_counter = cpu_temp_retry_step; + cpu_temp_retry_step *= 2; + if (cpu_temp_retry_step > cpu_temp_retry_max) + cpu_temp_retry_step = cpu_temp_retry_max; + + continue; + } + + if (cpu_temp_len != 1) + { + DBG ("processor_info (PROCESSOR_TEMPERATURE) returned %i elements..?", + (int) cpu_temp_len); + continue; + } + + cpu_temp_retry_counter = 0; + cpu_temp_retry_step = 1; + + DBG ("cpu_temp = %i", (int) cpu_temp); +#endif /* PROCESSOR_TEMPERATURE */ } /* #endif PROCESSOR_CPU_LOAD_INFO */ @@ -243,12 +312,19 @@ static void cpu_read (void) char *fields[9]; int numfields; + static complain_t complain_obj; + if ((fh = fopen ("/proc/stat", "r")) == NULL) { - syslog (LOG_WARNING, "cpu: fopen: %s", strerror (errno)); + plugin_complain (LOG_ERR, &complain_obj, "cpu plugin: " + "fopen (/proc/stat) failed: %s", + strerror (errno)); return; } + plugin_relief (LOG_NOTICE, &complain_obj, "cpu plugin: " + "fopen (/proc/stat) succeeded."); + while (fgets (buf, BUFSIZE, fh) != NULL) { if (strncmp (buf, "cpu", 3)) @@ -315,14 +391,21 @@ static void cpu_read (void) long cpuinfo[CPUSTATES]; size_t cpuinfo_size; + static complain_t complain_obj; + cpuinfo_size = sizeof (cpuinfo); if (sysctlbyname("kern.cp_time", &cpuinfo, &cpuinfo_size, NULL, 0) < 0) { - syslog (LOG_WARNING, "cpu: sysctlbyname: %s", strerror (errno)); + plugin_complain (LOG_ERR, &complain_obj, "cpu plugin: " + "sysctlbyname failed: %s.", + strerror (errno)); return; } + plugin_relief (LOG_NOTICE, &complain_obj, "cpu plugin: " + "sysctlbyname succeeded."); + cpuinfo[CP_SYS] += cpuinfo[CP_INTR]; /* FIXME: Instance is always `0' */