X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fcpu.c;h=36c49720f1bcf464f33a2e653236d80c64f5dcd5;hb=c76419c0cf983f1ecd3d36aa236cc4e3f9cff733;hp=9c432d1791d0090191842aa364c48d761b5da72e;hpb=21ab7512825cf8177d5eee5101344b45d0854610;p=collectd.git diff --git a/src/cpu.c b/src/cpu.c index 9c432d17..36c49720 100644 --- a/src/cpu.c +++ b/src/cpu.c @@ -28,6 +28,7 @@ **/ #include "collectd.h" + #include "common.h" #include "plugin.h" @@ -161,6 +162,12 @@ static int maxcpu; /* #endif HAVE_LIBSTATGRAB */ #elif defined(HAVE_PERFSTAT) +#define TOTAL_IDLE 0 +#define TOTAL_USER 1 +#define TOTAL_SYS 2 +#define TOTAL_WAIT 3 +#define TOTAL_STAT_NUM 4 +static value_to_rate_state_t total_conv[TOTAL_STAT_NUM]; static perfstat_cpu_t *perfcpu; static int numcpu; static int pnumcpu; @@ -191,11 +198,13 @@ 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 int config_keys_num = STATIC_ARRAY_SIZE (config_keys); @@ -208,6 +217,8 @@ static int cpu_config (char const *key, char const *value) /* {{{ */ report_percent = IS_TRUE (value) ? 1 : 0; else if (strcasecmp (key, "ReportByState") == 0) report_by_state = IS_TRUE (value) ? 1 : 0; + else if (strcasecmp (key, "ReportNumCpu") == 0) + report_num_cpu = IS_TRUE (value) ? 1 : 0; else return (-1); @@ -320,15 +331,11 @@ static int init (void) static void submit_value (int cpu_num, int cpu_state, const char *type, value_t value) { - value_t values[1]; value_list_t vl = VALUE_LIST_INIT; - memcpy(&values[0], &value, sizeof(value)); - - vl.values = values; + vl.values = &value; vl.values_len = 1; - sstrncpy (vl.host, hostname_g, sizeof (vl.host)); sstrncpy (vl.plugin, "cpu", sizeof (vl.plugin)); sstrncpy (vl.type, type, sizeof (vl.type)); sstrncpy (vl.type_instance, cpu_state_names[cpu_state], @@ -341,26 +348,22 @@ static void submit_value (int cpu_num, int cpu_state, const char *type, value_t plugin_dispatch_values (&vl); } -static void submit_percent(int cpu_num, int cpu_state, gauge_t percent) +static void submit_percent (int cpu_num, int cpu_state, gauge_t value) { - value_t value; - /* This function is called for all known CPU states, but each read * method will only report a subset. The remaining states are left as * NAN and we ignore them here. */ - if (isnan (percent)) + if (isnan (value)) return; - value.gauge = percent; - submit_value (cpu_num, cpu_state, "percent", value); + submit_value (cpu_num, cpu_state, "percent", + (value_t) { .gauge = value }); } -static void submit_derive(int cpu_num, int cpu_state, derive_t derive) +static void submit_derive (int cpu_num, int cpu_state, derive_t value) { - value_t value; - - value.derive = derive; - submit_value (cpu_num, cpu_state, "cpu", value); + submit_value (cpu_num, cpu_state, "cpu", + (value_t) { .derive = value }); } /* Takes the zero-index number of a CPU and makes sure that the module-global @@ -401,23 +404,38 @@ static cpu_state_t *get_cpu_state (size_t cpu_num, size_t state) /* {{{ */ return (&cpu_states[index]); } /* }}} cpu_state_t *get_cpu_state */ +#if defined(HAVE_PERFSTAT) /* {{{ */ +/* populate global aggregate cpu rate */ +static int total_rate(gauge_t *sum_by_state, size_t state, derive_t d, + value_to_rate_state_t* conv, cdtime_t now) +{ + gauge_t rate = NAN; + int status = value_to_rate (&rate, (value_t) { .derive = d }, DS_TYPE_DERIVE, now, conv); + if (status != 0) + return (status); + + sum_by_state[state] = rate; + + if (state != COLLECTD_CPU_STATE_IDLE) + RATE_ADD (sum_by_state[COLLECTD_CPU_STATE_ACTIVE], sum_by_state[state]); + return (0); +} +#endif /* }}} HAVE_PERFSTAT */ + /* Populates the per-CPU COLLECTD_CPU_STATE_ACTIVE rate and the global rate_by_state * array. */ static void aggregate (gauge_t *sum_by_state) /* {{{ */ { - size_t cpu_num; - size_t state; - - for (state = 0; state < COLLECTD_CPU_STATE_MAX; state++) + for (size_t state = 0; state < COLLECTD_CPU_STATE_MAX; state++) sum_by_state[state] = NAN; - for (cpu_num = 0; cpu_num < global_cpu_num; cpu_num++) + 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); this_cpu_states[COLLECTD_CPU_STATE_ACTIVE].rate = NAN; - for (state = 0; state < COLLECTD_CPU_STATE_ACTIVE; state++) + for (size_t state = 0; state < COLLECTD_CPU_STATE_ACTIVE; state++) { if (!this_cpu_states[state].has_value) continue; @@ -432,6 +450,27 @@ static void aggregate (gauge_t *sum_by_state) /* {{{ */ RATE_ADD (sum_by_state[COLLECTD_CPU_STATE_ACTIVE], this_cpu_states[COLLECTD_CPU_STATE_ACTIVE].rate); } + +#if defined(HAVE_PERFSTAT) /* {{{ */ + cdtime_t now = cdtime (); + 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))); + return; + } + + /* Reset COLLECTD_CPU_STATE_ACTIVE */ + sum_by_state[COLLECTD_CPU_STATE_ACTIVE] = NAN; + + /* Physical Processor Utilization */ + total_rate(sum_by_state, COLLECTD_CPU_STATE_IDLE, (derive_t) cputotal.pidle, &total_conv[TOTAL_IDLE], now); + total_rate(sum_by_state, COLLECTD_CPU_STATE_USER, (derive_t) cputotal.puser, &total_conv[TOTAL_USER], now); + total_rate(sum_by_state, COLLECTD_CPU_STATE_SYSTEM, (derive_t) cputotal.psys , &total_conv[TOTAL_SYS], now); + total_rate(sum_by_state, COLLECTD_CPU_STATE_WAIT, (derive_t) cputotal.pwait, &total_conv[TOTAL_WAIT], now); +#endif /* }}} HAVE_PERFSTAT */ } /* }}} void aggregate */ /* Commits (dispatches) the values for one CPU or the global aggregation. @@ -442,7 +481,6 @@ static void aggregate (gauge_t *sum_by_state) /* {{{ */ static void cpu_commit_one (int cpu_num, /* {{{ */ gauge_t rates[static COLLECTD_CPU_STATE_MAX]) { - size_t state; gauge_t sum; sum = rates[COLLECTD_CPU_STATE_ACTIVE]; @@ -455,20 +493,32 @@ static void cpu_commit_one (int cpu_num, /* {{{ */ return; } - for (state = 0; state < COLLECTD_CPU_STATE_ACTIVE; state++) + for (size_t state = 0; state < COLLECTD_CPU_STATE_ACTIVE; state++) { gauge_t percent = 100.0 * rates[state] / sum; submit_percent (cpu_num, state, percent); } } /* }}} void cpu_commit_one */ +/* Commits the number of cores */ +static void cpu_commit_num_cpu (gauge_t value) /* {{{ */ +{ + value_list_t vl = VALUE_LIST_INIT; + + vl.values = &(value_t) { .gauge = value }; + vl.values_len = 1; + + sstrncpy (vl.plugin, "cpu", sizeof (vl.plugin)); + sstrncpy (vl.type, "count", sizeof (vl.type)); + + plugin_dispatch_values (&vl); +} /* }}} void cpu_commit_num_cpu */ + /* Resets the internal aggregation. This is called by the read callback after * each iteration / after each call to cpu_commit(). */ static void cpu_reset (void) /* {{{ */ { - size_t i; - - for (i = 0; i < cpu_states_num; i++) + for (size_t i = 0; i < cpu_states_num; i++) cpu_states[i].has_value = 0; global_cpu_num = 0; @@ -477,13 +527,9 @@ static void cpu_reset (void) /* {{{ */ /* Legacy behavior: Dispatches the raw derive values without any aggregation. */ static void cpu_commit_without_aggregation (void) /* {{{ */ { - int state; - - for (state = 0; state < COLLECTD_CPU_STATE_ACTIVE; state++) + for (int state = 0; state < COLLECTD_CPU_STATE_ACTIVE; state++) { - size_t cpu_num; - - for (cpu_num = 0; cpu_num < global_cpu_num; cpu_num++) + for (size_t cpu_num = 0; cpu_num < global_cpu_num; cpu_num++) { cpu_state_t *s = get_cpu_state (cpu_num, state); @@ -501,7 +547,9 @@ static void cpu_commit (void) /* {{{ */ gauge_t global_rates[COLLECTD_CPU_STATE_MAX] = { NAN, NAN, NAN, NAN, NAN, NAN, NAN, NAN, NAN, NAN /* Batman! */ }; - size_t cpu_num; + + if (report_num_cpu) + cpu_commit_num_cpu ((gauge_t) global_cpu_num); if (report_by_state && report_by_cpu && !report_percent) { @@ -517,15 +565,14 @@ static void cpu_commit (void) /* {{{ */ return; } - for (cpu_num = 0; cpu_num < global_cpu_num; cpu_num++) + 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 }; - size_t state; - for (state = 0; state < COLLECTD_CPU_STATE_MAX; state++) + for (size_t state = 0; state < COLLECTD_CPU_STATE_MAX; state++) if (this_cpu_states[state].has_value) local_rates[state] = this_cpu_states[state].rate; @@ -541,7 +588,7 @@ static int cpu_stage (size_t cpu_num, size_t state, derive_t d, cdtime_t now) /* int status; cpu_state_t *s; gauge_t rate = NAN; - value_t val = {.derive = d}; + value_t val = { .derive = d }; if (state >= COLLECTD_CPU_STATE_ACTIVE) return (EINVAL); @@ -569,8 +616,6 @@ static int cpu_read (void) cdtime_t now = cdtime (); #if PROCESSOR_CPU_LOAD_INFO /* {{{ */ - int cpu; - kern_return_t status; processor_cpu_load_info_data_t cpu_info; @@ -578,7 +623,7 @@ static int cpu_read (void) host_t cpu_host; - for (cpu = 0; cpu < cpu_list_len; cpu++) + for (mach_msg_type_number_t cpu = 0; cpu < cpu_list_len; cpu++) { cpu_host = 0; cpu_info_len = PROCESSOR_BASIC_INFO_COUNT; @@ -653,13 +698,12 @@ static int cpu_read (void) /* }}} #endif defined(KERNEL_LINUX) */ #elif defined(HAVE_LIBKSTAT) /* {{{ */ - int cpu; static cpu_stat_t cs; if (kc == NULL) return (-1); - for (cpu = 0; cpu < numcpu; cpu++) + for (int cpu = 0; cpu < numcpu; cpu++) { if (kstat_read (kc, ksp[cpu], &cs) == -1) continue; /* error message? */ @@ -675,7 +719,6 @@ static int cpu_read (void) uint64_t cpuinfo[numcpu][CPUSTATES]; size_t cpuinfo_size; int status; - int i; if (numcpu < 1) { @@ -688,7 +731,7 @@ static int cpu_read (void) #if defined(KERN_CPTIME2) if (numcpu > 1) { - for (i = 0; i < numcpu; i++) { + for (int i = 0; i < numcpu; i++) { int mib[] = {CTL_KERN, KERN_CPTIME2, i}; cpuinfo_size = sizeof (cpuinfo[0]); @@ -721,12 +764,12 @@ static int cpu_read (void) return (-1); } - for(i = 0; i < CPUSTATES; i++) { + for(int i = 0; i < CPUSTATES; i++) { cpuinfo[0][i] = cpuinfo_tmp[i]; } } - for (i = 0; i < numcpu; i++) { + for (int i = 0; i < numcpu; i++) { cpu_stage (i, COLLECTD_CPU_STATE_USER, (derive_t) cpuinfo[i][CP_USER], now); cpu_stage (i, COLLECTD_CPU_STATE_NICE, (derive_t) cpuinfo[i][CP_NICE], now); cpu_stage (i, COLLECTD_CPU_STATE_SYSTEM, (derive_t) cpuinfo[i][CP_SYS], now); @@ -738,7 +781,6 @@ static int cpu_read (void) #elif defined(HAVE_SYSCTLBYNAME) && defined(HAVE_SYSCTL_KERN_CP_TIMES) /* {{{ */ long cpuinfo[maxcpu][CPUSTATES]; size_t cpuinfo_size; - int i; memset (cpuinfo, 0, sizeof (cpuinfo)); @@ -751,7 +793,7 @@ static int cpu_read (void) return (-1); } - for (i = 0; i < numcpu; i++) { + for (int i = 0; i < numcpu; i++) { cpu_stage (i, COLLECTD_CPU_STATE_USER, (derive_t) cpuinfo[i][CP_USER], now); cpu_stage (i, COLLECTD_CPU_STATE_NICE, (derive_t) cpuinfo[i][CP_NICE], now); cpu_stage (i, COLLECTD_CPU_STATE_SYSTEM, (derive_t) cpuinfo[i][CP_SYS], now); @@ -801,7 +843,7 @@ static int cpu_read (void) #elif defined(HAVE_PERFSTAT) /* {{{ */ perfstat_id_t id; - int i, cpus; + int cpus; numcpu = perfstat_cpu(NULL, NULL, sizeof(perfstat_cpu_t), 0); if(numcpu == -1) @@ -828,7 +870,7 @@ static int cpu_read (void) return (-1); } - for (i = 0; i < cpus; i++) + for (int i = 0; i < cpus; i++) { cpu_stage (i, COLLECTD_CPU_STATE_IDLE, (derive_t) perfcpu[i].idle, now); cpu_stage (i, COLLECTD_CPU_STATE_SYSTEM, (derive_t) perfcpu[i].sys, now);