X-Git-Url: https://git.octo.it/?p=collectd.git;a=blobdiff_plain;f=src%2Fcpu.c;h=92ebfd806d12769a4661c9da8205387e4a47e4da;hp=d48ab886332912a1c09e62c477d0048209dc9ab6;hb=ba1032ee3f400ae7210fca0b21d96c593d99286d;hpb=0eff2a882a9265fd59d4f7a265c6b6810acb0032 diff --git a/src/cpu.c b/src/cpu.c index d48ab886..92ebfd80 100644 --- a/src/cpu.c +++ b/src/cpu.c @@ -29,8 +29,8 @@ #include "collectd.h" -#include "common.h" #include "plugin.h" +#include "utils/common/common.h" #ifdef HAVE_MACH_KERN_RETURN_H #include @@ -58,15 +58,14 @@ #include #endif /* HAVE_LIBKSTAT */ -#if (defined(HAVE_SYSCTL) && HAVE_SYSCTL) || \ - (defined(HAVE_SYSCTLBYNAME) && HAVE_SYSCTLBYNAME) -#ifdef HAVE_SYS_SYSCTL_H +#if defined(HAVE_SYSCTL) && defined(HAVE_SYSCTLBYNAME) +/* Implies BSD variant */ #include #endif #ifdef HAVE_SYS_DKSTAT_H +/* implies BSD variant */ #include -#endif #if !defined(CP_USER) || !defined(CP_NICE) || !defined(CP_SYS) || \ !defined(CP_INTR) || !defined(CP_IDLE) || !defined(CPUSTATES) @@ -77,18 +76,16 @@ #define CP_IDLE 4 #define CPUSTATES 5 #endif -#endif /* HAVE_SYSCTL || HAVE_SYSCTLBYNAME */ +#endif /* HAVE_SYS_DKSTAT_H */ -#if HAVE_SYSCTL +#define CAN_USE_SYSCTL 0 +#if defined(HAVE_SYSCTL) && defined(HAVE_SYSCTLBYNAME) +/* Implies BSD variant */ #if defined(CTL_HW) && defined(HW_NCPU) && defined(CTL_KERN) && \ defined(KERN_CPTIME) && defined(CPUSTATES) #define CAN_USE_SYSCTL 1 -#else -#define CAN_USE_SYSCTL 0 -#endif -#else -#define CAN_USE_SYSCTL 0 #endif +#endif /* HAVE_SYSCTL_H && HAVE_SYSCTLBYNAME */ #define COLLECTD_CPU_STATE_USER 0 #define COLLECTD_CPU_STATE_SYSTEM 1 @@ -102,7 +99,7 @@ #define COLLECTD_CPU_STATE_GUEST_NICE 9 #define COLLECTD_CPU_STATE_IDLE 10 #define COLLECTD_CPU_STATE_ACTIVE 11 /* sum of (!idle) */ -#define COLLECTD_CPU_STATE_MAX 12 /* #states */ +#define COLLECTD_CPU_STATE_MAX 12 /* #states */ #if HAVE_STATGRAB_H #include @@ -119,9 +116,9 @@ #error "No applicable input method." #endif -static const char *cpu_state_names[] = {"user", "system", "wait", "nice", - "swap", "interrupt", "softirq", "steal", - "guest", "guest_nice", "idle", "active"}; +static const char *cpu_state_names[] = { + "user", "system", "wait", "nice", "swap", "interrupt", + "softirq", "steal", "guest", "guest_nice", "idle", "active"}; #ifdef PROCESSOR_CPU_LOAD_INFO static mach_port_t port_host; @@ -134,6 +131,9 @@ static mach_msg_type_number_t cpu_list_len; /* #endif KERNEL_LINUX */ #elif defined(HAVE_LIBKSTAT) +#if HAVE_KSTAT_H +#include +#endif /* colleague tells me that Sun doesn't sell systems with more than 100 or so * CPUs.. */ #define MAX_NUMCPU 256 @@ -143,10 +143,12 @@ static int numcpu; /* #endif HAVE_LIBKSTAT */ #elif CAN_USE_SYSCTL +/* Only possible for BSD variant */ static int numcpu; /* #endif CAN_USE_SYSCTL */ #elif defined(HAVE_SYSCTLBYNAME) +/* Implies BSD variant */ static int numcpu; #ifdef HAVE_SYSCTL_KERN_CP_TIMES static int maxcpu; @@ -180,43 +182,43 @@ static int pnumcpu; struct cpu_state_s { value_to_rate_state_t conv; gauge_t rate; - _Bool has_value; + bool has_value; }; typedef struct cpu_state_s cpu_state_t; -static cpu_state_t *cpu_states = NULL; -static size_t cpu_states_num = 0; /* #cpu_states allocated */ +static cpu_state_t *cpu_states; +static size_t cpu_states_num; /* #cpu_states allocated */ /* Highest CPU number in the current iteration. Used by the dispatch logic to * determine how many CPUs there were. Reset to 0 by cpu_reset(). */ -static size_t global_cpu_num = 0; +static size_t global_cpu_num; -static _Bool report_by_cpu = 1; -static _Bool report_by_state = 1; -static _Bool report_percent = 0; -static _Bool report_num_cpu = 0; -static _Bool report_guest = 0; -static _Bool subtract_guest = 1; +static bool report_by_cpu = true; +static bool report_by_state = true; +static bool report_percent; +static bool report_num_cpu; +static bool report_guest; +static bool subtract_guest = true; -static const char *config_keys[] = {"ReportByCpu", "ReportByState", - "ReportNumCpu", "ValuesPercentage", +static const char *config_keys[] = {"ReportByCpu", "ReportByState", + "ReportNumCpu", "ValuesPercentage", "ReportGuestState", "SubtractGuestState"}; static int config_keys_num = STATIC_ARRAY_SIZE(config_keys); static int cpu_config(char const *key, char const *value) /* {{{ */ { if (strcasecmp(key, "ReportByCpu") == 0) - report_by_cpu = IS_TRUE(value) ? 1 : 0; + report_by_cpu = IS_TRUE(value); else if (strcasecmp(key, "ValuesPercentage") == 0) - report_percent = IS_TRUE(value) ? 1 : 0; + report_percent = IS_TRUE(value); else if (strcasecmp(key, "ReportByState") == 0) - report_by_state = IS_TRUE(value) ? 1 : 0; + report_by_state = IS_TRUE(value); else if (strcasecmp(key, "ReportNumCpu") == 0) - report_num_cpu = IS_TRUE(value) ? 1 : 0; + report_num_cpu = IS_TRUE(value); else if (strcasecmp(key, "ReportGuestState") == 0) - report_guest = IS_TRUE(value) ? 1 : 0; + report_guest = IS_TRUE(value); else if (strcasecmp(key, "SubtractGuestState") == 0) - subtract_guest = IS_TRUE(value) ? 1 : 0; + subtract_guest = IS_TRUE(value); else return -1; @@ -248,7 +250,7 @@ static int init(void) { INFO("cpu plugin: Found %i processor%s.", (int)cpu_list_len, cpu_list_len == 1 ? "" : "s"); -/* #endif PROCESSOR_CPU_LOAD_INFO */ + /* #endif PROCESSOR_CPU_LOAD_INFO */ #elif defined(HAVE_LIBKSTAT) kstat_t *ksp_chain; @@ -264,9 +266,10 @@ static int init(void) { ksp_chain = ksp_chain->ks_next) if (strncmp(ksp_chain->ks_module, "cpu_stat", 8) == 0) ksp[numcpu++] = ksp_chain; -/* #endif HAVE_LIBKSTAT */ + /* #endif HAVE_LIBKSTAT */ #elif CAN_USE_SYSCTL + /* Only on BSD variant */ size_t numcpu_size; int mib[2] = {CTL_HW, HW_NCPU}; int status; @@ -276,21 +279,19 @@ static int init(void) { status = sysctl(mib, STATIC_ARRAY_SIZE(mib), &numcpu, &numcpu_size, NULL, 0); if (status == -1) { - char errbuf[1024]; - WARNING("cpu plugin: sysctl: %s", sstrerror(errno, errbuf, sizeof(errbuf))); + WARNING("cpu plugin: sysctl: %s", STRERRNO); return -1; } -/* #endif CAN_USE_SYSCTL */ + /* #endif CAN_USE_SYSCTL */ #elif defined(HAVE_SYSCTLBYNAME) + /* Only on BSD varient */ size_t numcpu_size; numcpu_size = sizeof(numcpu); if (sysctlbyname("hw.ncpu", &numcpu, &numcpu_size, NULL, 0) < 0) { - char errbuf[1024]; - WARNING("cpu plugin: sysctlbyname(hw.ncpu): %s", - sstrerror(errno, errbuf, sizeof(errbuf))); + WARNING("cpu plugin: sysctlbyname(hw.ncpu): %s", STRERRNO); return -1; } @@ -298,9 +299,7 @@ static int init(void) { numcpu_size = sizeof(maxcpu); if (sysctlbyname("kern.smp.maxcpus", &maxcpu, &numcpu_size, NULL, 0) < 0) { - char errbuf[1024]; - WARNING("cpu plugin: sysctlbyname(kern.smp.maxcpus): %s", - sstrerror(errno, errbuf, sizeof(errbuf))); + WARNING("cpu plugin: sysctlbyname(kern.smp.maxcpus): %s", STRERRNO); return -1; } #else @@ -309,7 +308,7 @@ static int init(void) { "%i)", numcpu); #endif -/* #endif HAVE_SYSCTLBYNAME */ + /* #endif HAVE_SYSCTLBYNAME */ #elif defined(HAVE_LIBSTATGRAB) /* nothing to initialize */ @@ -433,7 +432,7 @@ static void aggregate(gauge_t *sum_by_state) /* {{{ */ } if (!isnan(this_cpu_states[COLLECTD_CPU_STATE_ACTIVE].rate)) - this_cpu_states[COLLECTD_CPU_STATE_ACTIVE].has_value = 1; + this_cpu_states[COLLECTD_CPU_STATE_ACTIVE].has_value = true; RATE_ADD(sum_by_state[COLLECTD_CPU_STATE_ACTIVE], this_cpu_states[COLLECTD_CPU_STATE_ACTIVE].rate); @@ -444,9 +443,7 @@ static void aggregate(gauge_t *sum_by_state) /* {{{ */ perfstat_cpu_total_t cputotal = {0}; if (!perfstat_cpu_total(NULL, &cputotal, sizeof(cputotal), 1)) { - char errbuf[1024]; - WARNING("cpu plugin: perfstat_cpu_total: %s", - sstrerror(errno, errbuf, sizeof(errbuf))); + WARNING("cpu plugin: perfstat_cpu_total: %s", STRERRNO); return; } @@ -509,7 +506,7 @@ static void cpu_commit_num_cpu(gauge_t value) /* {{{ */ static void cpu_reset(void) /* {{{ */ { for (size_t i = 0; i < cpu_states_num; i++) - cpu_states[i].has_value = 0; + cpu_states[i].has_value = false; global_cpu_num = 0; } /* }}} void cpu_reset */ @@ -553,9 +550,8 @@ static void cpu_commit(void) /* {{{ */ for (size_t cpu_num = 0; cpu_num < global_cpu_num; cpu_num++) { cpu_state_t *this_cpu_states = get_cpu_state(cpu_num, 0); - gauge_t local_rates[COLLECTD_CPU_STATE_MAX] = {NAN, NAN, NAN, NAN, NAN, - NAN, NAN, NAN, NAN, NAN, - NAN, NAN }; + gauge_t local_rates[COLLECTD_CPU_STATE_MAX] = { + NAN, NAN, NAN, NAN, NAN, NAN, NAN, NAN, NAN, NAN, NAN, NAN}; for (size_t state = 0; state < COLLECTD_CPU_STATE_MAX; state++) if (this_cpu_states[state].has_value) @@ -593,7 +589,7 @@ static int cpu_stage(size_t cpu_num, size_t state, derive_t d, return status; s->rate = rate; - s->has_value = 1; + s->has_value = true; return 0; } /* }}} int cpu_stage */ @@ -635,7 +631,7 @@ static int cpu_read(void) { cpu_stage(cpu, COLLECTD_CPU_STATE_IDLE, (derive_t)cpu_info.cpu_ticks[CPU_STATE_IDLE], now); } -/* }}} #endif PROCESSOR_CPU_LOAD_INFO */ + /* }}} #endif PROCESSOR_CPU_LOAD_INFO */ #elif defined(KERNEL_LINUX) /* {{{ */ int cpu; @@ -646,9 +642,7 @@ static int cpu_read(void) { int numfields; if ((fh = fopen("/proc/stat", "r")) == NULL) { - char errbuf[1024]; - ERROR("cpu plugin: fopen (/proc/stat) failed: %s", - sstrerror(errno, errbuf, sizeof(errbuf))); + ERROR("cpu plugin: fopen (/proc/stat) failed: %s", STRERRNO); return -1; } @@ -664,7 +658,8 @@ static int cpu_read(void) { cpu = atoi(fields[0] + 3); - /* Do not stage User and Nice immediately: we may need to alter them later: */ + /* Do not stage User and Nice immediately: we may need to alter them later: + */ long long user_value = atoll(fields[1]); long long nice_value = atoll(fields[2]); cpu_stage(cpu, COLLECTD_CPU_STATE_SYSTEM, (derive_t)atoll(fields[3]), now); @@ -676,7 +671,7 @@ static int cpu_read(void) { now); cpu_stage(cpu, COLLECTD_CPU_STATE_SOFTIRQ, (derive_t)atoll(fields[7]), now); - } + } if (numfields >= 9) { /* Steal (since Linux 2.6.11) */ cpu_stage(cpu, COLLECTD_CPU_STATE_STEAL, (derive_t)atoll(fields[8]), now); @@ -689,7 +684,8 @@ static int cpu_read(void) { /* Guest is included in User; optionally subtract Guest from User: */ if (subtract_guest) { user_value -= value; - if (user_value < 0) user_value = 0; + if (user_value < 0) + user_value = 0; } } } @@ -702,7 +698,8 @@ static int cpu_read(void) { Nice: */ if (subtract_guest) { nice_value -= value; - if (nice_value < 0) nice_value = 0; + if (nice_value < 0) + nice_value = 0; } } } @@ -712,7 +709,7 @@ static int cpu_read(void) { cpu_stage(cpu, COLLECTD_CPU_STATE_NICE, (derive_t)nice_value, now); } fclose(fh); -/* }}} #endif defined(KERNEL_LINUX) */ + /* }}} #endif defined(KERNEL_LINUX) */ #elif defined(HAVE_LIBKSTAT) /* {{{ */ static cpu_stat_t cs; @@ -733,9 +730,10 @@ static int cpu_read(void) { cpu_stage(ksp[cpu]->ks_instance, COLLECTD_CPU_STATE_WAIT, (derive_t)cs.cpu_sysinfo.cpu[CPU_WAIT], now); } -/* }}} #endif defined(HAVE_LIBKSTAT) */ + /* }}} #endif defined(HAVE_LIBKSTAT) */ #elif CAN_USE_SYSCTL /* {{{ */ + /* Only on BSD variant */ uint64_t cpuinfo[numcpu][CPUSTATES]; size_t cpuinfo_size; int status; @@ -758,9 +756,7 @@ static int cpu_read(void) { status = sysctl(mib, STATIC_ARRAY_SIZE(mib), cpuinfo[i], &cpuinfo_size, NULL, 0); if (status == -1) { - char errbuf[1024]; - ERROR("cpu plugin: sysctl failed: %s.", - sstrerror(errno, errbuf, sizeof(errbuf))); + ERROR("cpu plugin: sysctl failed: %s.", STRERRNO); return -1; } } @@ -775,9 +771,7 @@ static int cpu_read(void) { status = sysctl(mib, STATIC_ARRAY_SIZE(mib), &cpuinfo_tmp, &cpuinfo_size, NULL, 0); if (status == -1) { - char errbuf[1024]; - ERROR("cpu plugin: sysctl failed: %s.", - sstrerror(errno, errbuf, sizeof(errbuf))); + ERROR("cpu plugin: sysctl failed: %s.", STRERRNO); return -1; } @@ -794,10 +788,11 @@ static int cpu_read(void) { cpu_stage(i, COLLECTD_CPU_STATE_INTERRUPT, (derive_t)cpuinfo[i][CP_INTR], now); } -/* }}} #endif CAN_USE_SYSCTL */ + /* }}} #endif CAN_USE_SYSCTL */ #elif defined(HAVE_SYSCTLBYNAME) && defined(HAVE_SYSCTL_KERN_CP_TIMES) /* {{{ \ - */ + */ + /* Only on BSD variant */ long cpuinfo[maxcpu][CPUSTATES]; size_t cpuinfo_size; @@ -805,9 +800,7 @@ static int cpu_read(void) { cpuinfo_size = sizeof(cpuinfo); if (sysctlbyname("kern.cp_times", &cpuinfo, &cpuinfo_size, NULL, 0) < 0) { - char errbuf[1024]; - ERROR("cpu plugin: sysctlbyname failed: %s.", - sstrerror(errno, errbuf, sizeof(errbuf))); + ERROR("cpu plugin: sysctlbyname failed: %s.", STRERRNO); return -1; } @@ -819,18 +812,17 @@ static int cpu_read(void) { cpu_stage(i, COLLECTD_CPU_STATE_INTERRUPT, (derive_t)cpuinfo[i][CP_INTR], now); } -/* }}} #endif HAVE_SYSCTL_KERN_CP_TIMES */ + /* }}} #endif HAVE_SYSCTL_KERN_CP_TIMES */ #elif defined(HAVE_SYSCTLBYNAME) /* {{{ */ + /* Only on BSD variant */ long cpuinfo[CPUSTATES]; size_t cpuinfo_size; cpuinfo_size = sizeof(cpuinfo); if (sysctlbyname("kern.cp_time", &cpuinfo, &cpuinfo_size, NULL, 0) < 0) { - char errbuf[1024]; - ERROR("cpu plugin: sysctlbyname failed: %s.", - sstrerror(errno, errbuf, sizeof(errbuf))); + ERROR("cpu plugin: sysctlbyname failed: %s.", STRERRNO); return -1; } @@ -839,7 +831,7 @@ static int cpu_read(void) { cpu_stage(0, COLLECTD_CPU_STATE_SYSTEM, (derive_t)cpuinfo[CP_SYS], now); cpu_stage(0, COLLECTD_CPU_STATE_IDLE, (derive_t)cpuinfo[CP_IDLE], now); cpu_stage(0, COLLECTD_CPU_STATE_INTERRUPT, (derive_t)cpuinfo[CP_INTR], now); -/* }}} #endif HAVE_SYSCTLBYNAME */ + /* }}} #endif HAVE_SYSCTLBYNAME */ #elif defined(HAVE_LIBSTATGRAB) /* {{{ */ sg_cpu_stats *cs; @@ -856,7 +848,7 @@ static int cpu_read(void) { cpu_state(0, COLLECTD_CPU_STATE_SYSTEM, (derive_t)cs->kernel); cpu_state(0, COLLECTD_CPU_STATE_USER, (derive_t)cs->user); cpu_state(0, COLLECTD_CPU_STATE_WAIT, (derive_t)cs->iowait); -/* }}} #endif HAVE_LIBSTATGRAB */ + /* }}} #endif HAVE_LIBSTATGRAB */ #elif defined(HAVE_PERFSTAT) /* {{{ */ perfstat_id_t id; @@ -864,9 +856,7 @@ static int cpu_read(void) { numcpu = perfstat_cpu(NULL, NULL, sizeof(perfstat_cpu_t), 0); if (numcpu == -1) { - char errbuf[1024]; - WARNING("cpu plugin: perfstat_cpu: %s", - sstrerror(errno, errbuf, sizeof(errbuf))); + WARNING("cpu plugin: perfstat_cpu: %s", STRERRNO); return -1; } @@ -878,9 +868,7 @@ static int cpu_read(void) { id.name[0] = '\0'; if ((cpus = perfstat_cpu(&id, perfcpu, sizeof(perfstat_cpu_t), numcpu)) < 0) { - char errbuf[1024]; - WARNING("cpu plugin: perfstat_cpu: %s", - sstrerror(errno, errbuf, sizeof(errbuf))); + WARNING("cpu plugin: perfstat_cpu: %s", STRERRNO); return -1; }