X-Git-Url: https://git.octo.it/?p=collectd.git;a=blobdiff_plain;f=src%2Fcpu.c;h=2a6971292a5ca676b2466308eaf62a226a2130c7;hp=a5a136ecf7aedb81dc16f2e61a97be024215efde;hb=06a86a60a7dabc685bdbd81ce3d36ea5f7e2c2d4;hpb=1035fba8812893e50d00a871e3399cc1ece3b384 diff --git a/src/cpu.c b/src/cpu.c index a5a136ec..2a697129 100644 --- a/src/cpu.c +++ b/src/cpu.c @@ -98,9 +98,11 @@ #define COLLECTD_CPU_STATE_INTERRUPT 5 #define COLLECTD_CPU_STATE_SOFTIRQ 6 #define COLLECTD_CPU_STATE_STEAL 7 -#define COLLECTD_CPU_STATE_IDLE 8 -#define COLLECTD_CPU_STATE_ACTIVE 9 /* sum of (!idle) */ -#define COLLECTD_CPU_STATE_MAX 10 /* #states */ +#define COLLECTD_CPU_STATE_GUEST 8 +#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 */ #if HAVE_STATGRAB_H #include @@ -117,9 +119,9 @@ #error "No applicable input method." #endif -static const char *cpu_state_names[] = {"user", "system", "wait", "nice", - "swap", "interrupt", "softirq", "steal", - "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; @@ -132,6 +134,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 @@ -178,36 +183,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 _Bool report_by_cpu = 1; -static _Bool report_by_state = 1; -static _Bool report_percent = 0; -static _Bool report_num_cpu = 0; - -static const char *config_keys[] = {"ReportByCpu", "ReportByState", - "ReportNumCpu", "ValuesPercentage"}; +static size_t global_cpu_num; + +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", + "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); + else if (strcasecmp(key, "SubtractGuestState") == 0) + subtract_guest = IS_TRUE(value); else return -1; @@ -267,8 +279,7 @@ 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 */ @@ -279,9 +290,7 @@ static int init(void) { 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; } @@ -289,9 +298,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 @@ -326,7 +333,7 @@ static void submit_value(int cpu_num, int cpu_state, const char *type, sizeof(vl.type_instance)); if (cpu_num >= 0) { - ssnprintf(vl.plugin_instance, sizeof(vl.plugin_instance), "%i", cpu_num); + snprintf(vl.plugin_instance, sizeof(vl.plugin_instance), "%i", cpu_num); } plugin_dispatch_values(&vl); } @@ -424,7 +431,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); @@ -435,9 +442,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; } @@ -500,7 +505,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 */ @@ -524,7 +529,7 @@ static void cpu_commit_without_aggregation(void) /* {{{ */ static void cpu_commit(void) /* {{{ */ { gauge_t global_rates[COLLECTD_CPU_STATE_MAX] = { - NAN, NAN, NAN, NAN, NAN, NAN, NAN, NAN, NAN, NAN /* Batman! */ + NAN, NAN, NAN, NAN, NAN, NAN, NAN, NAN, NAN, NAN, NAN, NAN /* Batman! */ }; if (report_num_cpu) @@ -544,8 +549,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}; + 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) @@ -583,7 +588,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 */ @@ -632,13 +637,11 @@ static int cpu_read(void) { FILE *fh; char buf[1024]; - char *fields[9]; + char *fields[11]; 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; } @@ -648,14 +651,16 @@ static int cpu_read(void) { if ((buf[3] < '0') || (buf[3] > '9')) continue; - numfields = strsplit(buf, fields, 9); + numfields = strsplit(buf, fields, STATIC_ARRAY_SIZE(fields)); if (numfields < 5) continue; cpu = atoi(fields[0] + 3); - cpu_stage(cpu, COLLECTD_CPU_STATE_USER, (derive_t)atoll(fields[1]), now); - cpu_stage(cpu, COLLECTD_CPU_STATE_NICE, (derive_t)atoll(fields[2]), now); + /* 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); cpu_stage(cpu, COLLECTD_CPU_STATE_IDLE, (derive_t)atoll(fields[4]), now); @@ -665,11 +670,42 @@ static int cpu_read(void) { now); cpu_stage(cpu, COLLECTD_CPU_STATE_SOFTIRQ, (derive_t)atoll(fields[7]), now); + } - if (numfields >= 9) - cpu_stage(cpu, COLLECTD_CPU_STATE_STEAL, (derive_t)atoll(fields[8]), - now); + if (numfields >= 9) { /* Steal (since Linux 2.6.11) */ + cpu_stage(cpu, COLLECTD_CPU_STATE_STEAL, (derive_t)atoll(fields[8]), now); } + + if (numfields >= 10) { /* Guest (since Linux 2.6.24) */ + if (report_guest) { + long long value = atoll(fields[9]); + cpu_stage(cpu, COLLECTD_CPU_STATE_GUEST, (derive_t)value, now); + /* Guest is included in User; optionally subtract Guest from User: */ + if (subtract_guest) { + user_value -= value; + if (user_value < 0) + user_value = 0; + } + } + } + + if (numfields >= 11) { /* Guest_nice (since Linux 2.6.33) */ + if (report_guest) { + long long value = atoll(fields[10]); + cpu_stage(cpu, COLLECTD_CPU_STATE_GUEST_NICE, (derive_t)value, now); + /* Guest_nice is included in Nice; optionally subtract Guest_nice from + Nice: */ + if (subtract_guest) { + nice_value -= value; + if (nice_value < 0) + nice_value = 0; + } + } + } + + /* Eventually stage User and Nice: */ + cpu_stage(cpu, COLLECTD_CPU_STATE_USER, (derive_t)user_value, now); + cpu_stage(cpu, COLLECTD_CPU_STATE_NICE, (derive_t)nice_value, now); } fclose(fh); /* }}} #endif defined(KERNEL_LINUX) */ @@ -718,9 +754,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; } } @@ -735,9 +769,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; } @@ -765,9 +797,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; } @@ -788,9 +818,7 @@ static int cpu_read(void) { 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; } @@ -824,9 +852,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; } @@ -838,9 +864,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; }