X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fturbostat.c;h=fc1b5dccc0dd3c4b2c2c848b1de1f9a57c95c156;hb=9de86bc9ce5961281632944a04efbc2314828a2f;hp=61c2abd4f61727893a11fcccc0e43f280a54e015;hpb=a3b73247f54fed7e020e01bdc6432f06f2954048;p=collectd.git diff --git a/src/turbostat.c b/src/turbostat.c index 61c2abd4..fc1b5dcc 100644 --- a/src/turbostat.c +++ b/src/turbostat.c @@ -252,7 +252,7 @@ open_msr(unsigned int cpu, _Bool multiple_read) CPU_ZERO_S(cpu_affinity_setsize, cpu_affinity_set); CPU_SET_S(cpu, cpu_affinity_setsize, cpu_affinity_set); if (sched_setaffinity(0, cpu_affinity_setsize, cpu_affinity_set) == -1) { - ERROR("Turbostat plugin: Could not migrate to CPU %d", cpu); + ERROR("turbostat plugin: Could not migrate to CPU %d", cpu); return -1; } } @@ -260,7 +260,7 @@ open_msr(unsigned int cpu, _Bool multiple_read) ssnprintf(pathname, sizeof(pathname), "/dev/cpu/%d/msr", cpu); fd = open(pathname, O_RDONLY); if (fd < 0) { - ERROR("Turbostat plugin: failed to open %s", pathname); + ERROR("turbostat plugin: failed to open %s", pathname); return -1; } return fd; @@ -277,7 +277,7 @@ read_msr(int fd, off_t offset, unsigned long long *msr) retval = pread(fd, msr, sizeof *msr, offset); if (retval != sizeof *msr) { - ERROR("Turbostat plugin: MSR offset 0x%llx read failed", + ERROR("turbostat plugin: MSR offset 0x%llx read failed", (unsigned long long)offset); return -1; } @@ -330,7 +330,7 @@ get_counters(struct thread_data *t, struct core_data *c, struct pkg_data *p) #define READ_MSR(msr, dst) \ do { \ if (read_msr(msr_fd, msr, dst)) { \ - ERROR("Turbostat plugin: Unable to read " #msr); \ + ERROR("turbostat plugin: Unable to read " #msr); \ retval = -1; \ goto out; \ } \ @@ -457,13 +457,13 @@ delta_core(struct core_data *delta, const struct core_data *new, const struct co */ static inline int __attribute__((warn_unused_result)) delta_thread(struct thread_data *delta, const struct thread_data *new, const struct thread_data *old, - const struct core_data *core_delta) + const struct core_data *cdelta) { delta->tsc = new->tsc - old->tsc; /* check for TSC < 1 Mcycles over interval */ if (delta->tsc < (1000 * 1000)) { - WARNING("Turbostat plugin: Insanely slow TSC rate, TSC stops " + WARNING("turbostat plugin: Insanely slow TSC rate, TSC stops " "in idle? You can disable all c-states by booting with" " 'idle=poll' or just the deep ones with" " 'processor.max_cstate=1'"); @@ -477,7 +477,7 @@ delta_thread(struct thread_data *delta, const struct thread_data *new, const str delta->mperf = new->mperf - old->mperf; } else { if (!aperf_mperf_unstable) { - WARNING("Turbostat plugin: APERF or MPERF went " + WARNING("turbostat plugin: APERF or MPERF went " "backwards. Frequency results do not cover " "the entire interval. Fix this by running " "Linux-2.6.30 or later."); @@ -491,16 +491,16 @@ delta_thread(struct thread_data *delta, const struct thread_data *new, const str * it is possible for mperf's non-halted cycles + idle states * to exceed TSC's all cycles: show c1 = 0% in that case. */ - if ((delta->mperf + core_delta->c3 + core_delta->c6 + core_delta->c7) > delta->tsc) + if ((delta->mperf + cdelta->c3 + cdelta->c6 + cdelta->c7) > delta->tsc) delta->c1 = 0; else { /* normal case, derive c1 */ - delta->c1 = delta->tsc - delta->mperf - core_delta->c3 - - core_delta->c6 - core_delta->c7; + delta->c1 = delta->tsc - delta->mperf - cdelta->c3 + - cdelta->c6 - cdelta->c7; } if (delta->mperf == 0) { - WARNING("Turbostat plugin: cpu%d MPERF 0!", old->cpu_id); + WARNING("turbostat plugin: cpu%d MPERF 0!", old->cpu_id); delta->mperf = 1; /* divide by 0 protection */ } @@ -560,17 +560,17 @@ submit_counters(struct thread_data *t, struct core_data *c, struct pkg_data *p) if (!aperf_mperf_unstable) turbostat_submit(name, "percent", "c1", 100.0 * t->c1/t->tsc); - turbostat_submit("Average", "frequency", name, 1.0 / 1000000 * t->aperf / interval_float); + turbostat_submit(name, "frequency", "average", 1.0 / 1000000 * t->aperf / interval_float); if ((!aperf_mperf_unstable) || (!(t->aperf > t->tsc || t->mperf > t->tsc))) - turbostat_submit("Buzy", "frequency", name, 1.0 * t->tsc / 1000000 * t->aperf / t->mperf / interval_float); + turbostat_submit(name, "frequency", "busy", 1.0 * t->tsc / 1000000 * t->aperf / t->mperf / interval_float); /* Sanity check (should stay stable) */ - turbostat_submit("TSC", "gauge", name, 1.0 * t->tsc / 1000000 / interval_float); + turbostat_submit(name, "gauge", "TSC", 1.0 * t->tsc / 1000000 / interval_float); /* SMI */ if (do_smi) - turbostat_submit(NULL, "current", name, t->smi_count); + turbostat_submit(name, "count", NULL, t->smi_count); /* submit per-core data only for 1st thread in core */ if (!(t->flags & CPU_IS_FIRST_THREAD_IN_CORE)) @@ -586,7 +586,7 @@ submit_counters(struct thread_data *t, struct core_data *c, struct pkg_data *p) turbostat_submit(name, "percent", "c7", 100.0 * c->c7/t->tsc); if (do_dts) - turbostat_submit(NULL, "temperature", name, c->core_temp_c); + turbostat_submit(name, "temperature", NULL, c->core_temp_c); /* submit per-package data only for 1st core in package */ if (!(t->flags & CPU_IS_FIRST_CORE_IN_PACKAGE)) @@ -595,7 +595,7 @@ submit_counters(struct thread_data *t, struct core_data *c, struct pkg_data *p) ssnprintf(name, sizeof(name), "pkg%02d", p->package_id); if (do_ptm) - turbostat_submit(NULL, "temperature", name, p->pkg_temp_c); + turbostat_submit(name, "temperature", NULL, p->pkg_temp_c); if (do_pkg_cstate & (1 << 2)) turbostat_submit(name, "percent", "pc2", 100.0 * p->pc2/t->tsc); @@ -614,13 +614,13 @@ submit_counters(struct thread_data *t, struct core_data *c, struct pkg_data *p) if (do_rapl) { if (do_rapl & RAPL_PKG) - turbostat_submit(name, "power", "Pkg_W", p->energy_pkg * rapl_energy_units / interval_float); + turbostat_submit(name, "power", "pkg", p->energy_pkg * rapl_energy_units / interval_float); if (do_rapl & RAPL_CORES) - turbostat_submit(name, "power", "Cor_W", p->energy_cores * rapl_energy_units / interval_float); + turbostat_submit(name, "power", "cores", p->energy_cores * rapl_energy_units / interval_float); if (do_rapl & RAPL_GFX) - turbostat_submit(name, "power", "GFX_W", p->energy_gfx * rapl_energy_units / interval_float); + turbostat_submit(name, "power", "GFX", p->energy_gfx * rapl_energy_units / interval_float); if (do_rapl & RAPL_DRAM) - turbostat_submit(name, "power", "RAM_W", p->energy_dram * rapl_energy_units / interval_float); + turbostat_submit(name, "power", "DRAM", p->energy_dram * rapl_energy_units / interval_float); } done: return 0; @@ -794,7 +794,7 @@ set_temperature_target(struct thread_data *t, struct core_data *c, struct pkg_da guess: p->tcc_activation_temp = TJMAX_DEFAULT; - WARNING("Turbostat plugin: cpu%d: Guessing tjMax %d C," + WARNING("turbostat plugin: cpu%d: Guessing tjMax %d C," " Please use TCCActivationTemp to specify it.", t->cpu_id, p->tcc_activation_temp); @@ -805,7 +805,7 @@ guess: * Identify the functionality of the CPU */ static int __attribute__((warn_unused_result)) -probe_cpu() +probe_cpu(void) { unsigned int eax, ebx, ecx, edx, max_level; unsigned int fms, family, model; @@ -819,7 +819,7 @@ probe_cpu() max_level = ebx = ecx = edx = 0; __get_cpuid(0, &max_level, &ebx, &ecx, &edx); if (ebx != 0x756e6547 && edx != 0x49656e69 && ecx != 0x6c65746e) { - ERROR("Turbostat plugin: Unsupported CPU (not Intel)"); + ERROR("turbostat plugin: Unsupported CPU (not Intel)"); return -1; } @@ -842,7 +842,7 @@ probe_cpu() if (family == 6 || family == 0xf) model += ((fms >> 16) & 0xf) << 4; if (!(edx & (1 << 5))) { - ERROR("Turbostat plugin: Unsupported CPU (no MSR support)"); + ERROR("turbostat plugin: Unsupported CPU (no MSR support)"); return -1; } @@ -863,7 +863,7 @@ probe_cpu() do_dts = eax & (1 << 0); do_ptm = eax & (1 << 6); if (!(ecx & (1 << 0))) { - ERROR("Turbostat plugin: Unsupported CPU (No APERF)"); + ERROR("turbostat plugin: Unsupported CPU (No APERF)"); return -1; } @@ -973,7 +973,7 @@ probe_cpu() do_rapl = 0; } } else { - ERROR("Turbostat plugin: Unsupported CPU (family: %#x, " + ERROR("turbostat plugin: Unsupported CPU (family: %#x, " "model: %#x)", family, model); return -1; } @@ -1026,17 +1026,18 @@ parse_int_file(const char *fmt, ...) len = vsnprintf(path, sizeof(path), fmt, args); va_end(args); if (len < 0 || len >= PATH_MAX) { - ERROR("Turbostat plugin: path truncated: '%s'", path); + ERROR("turbostat plugin: path truncated: '%s'", path); return -1; } filep = fopen(path, "r"); if (!filep) { - ERROR("Turbostat plugin: Failed to open '%s'", path); + ERROR("turbostat plugin: Failed to open '%s'", path); return -1; } if (fscanf(filep, "%d", &value) != 1) { - ERROR("Turbostat plugin: Failed to parse number from '%s'", path); + ERROR("turbostat plugin: Failed to parse number from '%s'", path); + fclose(filep); return -1; } fclose(filep); @@ -1055,7 +1056,7 @@ get_threads_on_core(unsigned int cpu) ssnprintf(path, sizeof(path), "/sys/devices/system/cpu/cpu%d/topology/thread_siblings_list", cpu); filep = fopen(path, "r"); if (!filep) { - ERROR("Turbostat plugin: Failed to open '%s'", path); + ERROR("turbostat plugin: Failed to open '%s'", path); return -1; } /* @@ -1086,13 +1087,13 @@ for_all_proc_cpus(int (func)(unsigned int)) fp = fopen("/proc/stat", "r"); if (!fp) { - ERROR("Turbostat plugin: Failed to open /proc/stat"); + ERROR("turbostat plugin: Failed to open /proc/stat"); return -1; } retval = fscanf(fp, "cpu %*d %*d %*d %*d %*d %*d %*d %*d %*d %*d\n"); if (retval != 0) { - ERROR("Turbostat plugin: Failed to parse /proc/stat"); + ERROR("turbostat plugin: Failed to parse /proc/stat"); fclose(fp); return -1; } @@ -1134,7 +1135,7 @@ static int __attribute__((warn_unused_result)) allocate_cpu_set(cpu_set_t ** set, size_t * size) { *set = CPU_ALLOC(topology.max_cpu_id + 1); if (*set == NULL) { - ERROR("Turbostat plugin: Unable to allocate CPU state"); + ERROR("turbostat plugin: Unable to allocate CPU state"); return -1; } *size = CPU_ALLOC_SIZE(topology.max_cpu_id + 1); @@ -1146,12 +1147,12 @@ allocate_cpu_set(cpu_set_t ** set, size_t * size) { * Build a local representation of the cpu distribution */ static int __attribute__((warn_unused_result)) -topology_probe() +topology_probe(void) { unsigned int i; int ret; - unsigned int max_package_id, max_core_id, max_thread_id; - max_package_id = max_core_id = max_thread_id = 0; + unsigned int max_package_id, max_core_id, max_threads; + max_package_id = max_core_id = max_threads = 0; /* Clean topology */ free(topology.cpus); @@ -1163,7 +1164,7 @@ topology_probe() topology.cpus = calloc(1, (topology.max_cpu_id + 1) * sizeof(struct cpu_topology)); if (topology.cpus == NULL) { - ERROR("Turbostat plugin: Unable to allocate memory for CPU topology"); + ERROR("turbostat plugin: Unable to allocate memory for CPU topology"); return -1; } @@ -1190,7 +1191,7 @@ topology_probe() struct cpu_topology *cpu = &topology.cpus[i]; if (cpu_is_not_present(i)) { - WARNING("Turbostat plugin: cpu%d NOT PRESENT", i); + WARNING("turbostat plugin: cpu%d NOT PRESENT", i); continue; } @@ -1220,21 +1221,21 @@ topology_probe() goto err; else num_threads = (unsigned int) ret; - if (num_threads > max_thread_id) - max_thread_id = num_threads; + if (num_threads > max_threads) + max_threads = num_threads; ret = parse_int_file("/sys/devices/system/cpu/cpu%d/topology/thread_siblings_list", i); if (ret < 0) goto err; else if ((unsigned int) ret == i) cpu->first_thread_in_core = 1; - DEBUG("Turbostat plugin: cpu %d pkg %d core %d\n", + DEBUG("turbostat plugin: cpu %d pkg %d core %d\n", i, cpu->package_id, cpu->core_id); } /* Num is max + 1 (need to count 0) */ topology.num_packages = max_package_id + 1; topology.num_cores = max_core_id + 1; - topology.num_threads = max_thread_id + 1; + topology.num_threads = max_threads; return 0; err: @@ -1253,32 +1254,45 @@ allocate_counters(struct thread_data **threads, struct core_data **cores, struct unsigned int i; unsigned int total_threads, total_cores; + if ((topology.num_threads == 0) + || (topology.num_cores == 0) + || (topology.num_packages == 0)) + { + ERROR ("turbostat plugin: Invalid topology: %u threads, %u cores, %u packages", + topology.num_threads, topology.num_cores, topology.num_packages); + return -1; + } + total_threads = topology.num_threads * topology.num_cores * topology.num_packages; *threads = calloc(total_threads, sizeof(struct thread_data)); if (*threads == NULL) - goto err; + { + ERROR ("turbostat plugin: calloc failed"); + return -1; + } + + for (i = 0; i < total_threads; ++i) + (*threads)[i].cpu_id = topology.max_cpu_id + 1; total_cores = topology.num_cores * topology.num_packages; *cores = calloc(total_cores, sizeof(struct core_data)); if (*cores == NULL) - goto err_clean_threads; + { + ERROR ("turbostat plugin: calloc failed"); + sfree (threads); + return -1; + } *packages = calloc(topology.num_packages, sizeof(struct pkg_data)); if (*packages == NULL) - goto err_clean_cores; - - for (i = 0; i < topology.num_packages; i++) - (*packages)[i].package_id = i; + { + ERROR ("turbostat plugin: calloc failed"); + sfree (cores); + sfree (threads); + return -1; + } return 0; - -err_clean_cores: - free(*cores); -err_clean_threads: - free(*threads); -err: - ERROR("Turbostat plugin: Failled to allocate memory for counters"); - return -1; } static void @@ -1409,7 +1423,7 @@ turbostat_read(void) if ((ret = setup_all_buffers()) < 0) return ret; if (for_all_proc_cpus(cpu_is_not_present)) { - ERROR("Turbostat plugin: CPU appeared just after " + ERROR("turbostat plugin: CPU appeared just after " "initialization"); return -1; } @@ -1417,7 +1431,7 @@ turbostat_read(void) /* Saving the scheduling affinity, as it will be modified by get_counters */ if (sched_getaffinity(0, cpu_saved_affinity_setsize, cpu_saved_affinity_set) != 0) { - ERROR("Turbostat plugin: Unable to save the CPU affinity"); + ERROR("turbostat plugin: Unable to save the CPU affinity"); return -1; } @@ -1478,7 +1492,7 @@ check_permissions(void) return 0; #ifndef HAVE_SYS_CAPABILITY_H } else { - ERROR("Turbostat plugin: Initialization failed: this plugin " + ERROR("turbostat plugin: Initialization failed: this plugin " "requires collectd to run as root"); return -1; } @@ -1489,12 +1503,12 @@ check_permissions(void) cap_header->pid = getpid(); cap_header->version = _LINUX_CAPABILITY_VERSION; if (capget(cap_header, cap_data) < 0) { - ERROR("Turbostat plugin: capget failed"); + ERROR("turbostat plugin: capget failed"); return -1; } if ((cap_data->effective & (1 << CAP_SYS_RAWIO)) == 0) { - WARNING("Turbostat plugin: Collectd doesn't have the " + WARNING("turbostat plugin: Collectd doesn't have the " "CAP_SYS_RAWIO capability. If you don't want to run " "collectd as root, try running \"setcap " "cap_sys_rawio=ep\" on collectd binary"); @@ -1502,7 +1516,7 @@ check_permissions(void) } if (euidaccess("/dev/cpu/0/msr", R_OK)) { - WARNING("Turbostat plugin: Collectd cannot open" + WARNING("turbostat plugin: Collectd cannot open " "/dev/cpu/0/msr. If you don't want to run collectd as " "root, you need to change the ownership (chown) and " "permissions on /dev/cpu/*/msr to allow such access"); @@ -1510,7 +1524,7 @@ check_permissions(void) } if (ret != 0) - ERROR("Turbostat plugin: Initialization failed: this plugin " + ERROR("turbostat plugin: Initialization failed: this plugin " "requires collectd to either to run as root or give " "collectd a special capability (CAP_SYS_RAWIO) and read " "access to /dev/cpu/*/msr (see previous warnings)"); @@ -1525,8 +1539,8 @@ turbostat_init(void) int ret; if (stat("/dev/cpu/0/msr", &sb)) { - ERROR("Turbostat plugin: Initialization failed: /dev/cpu/0/msr" - " does not exist while the CPU supports MSR. You may be " + ERROR("turbostat plugin: Initialization failed: /dev/cpu/0/msr " + "does not exist while the CPU supports MSR. You may be " "missing the corresponding kernel module, please try '# " "modprobe msr'"); return -1; @@ -1555,7 +1569,7 @@ turbostat_config(const char *key, const char *value) if (strcasecmp("CoreCstates", key) == 0) { tmp_val = strtoul(value, &end, 0); if (*end != '\0' || tmp_val > UINT_MAX) { - ERROR("Turbostat plugin: Invalid CoreCstates '%s'", + ERROR("turbostat plugin: Invalid CoreCstates '%s'", value); return -1; } @@ -1564,7 +1578,7 @@ turbostat_config(const char *key, const char *value) } else if (strcasecmp("PackageCstates", key) == 0) { tmp_val = strtoul(value, &end, 0); if (*end != '\0' || tmp_val > UINT_MAX) { - ERROR("Turbostat plugin: Invalid PackageCstates '%s'", + ERROR("turbostat plugin: Invalid PackageCstates '%s'", value); return -1; } @@ -1582,7 +1596,7 @@ turbostat_config(const char *key, const char *value) } else if (strcasecmp("RunningAveragePowerLimit", key) == 0) { tmp_val = strtoul(value, &end, 0); if (*end != '\0' || tmp_val > UINT_MAX) { - ERROR("Turbostat plugin: Invalid RunningAveragePowerLimit '%s'", + ERROR("turbostat plugin: Invalid RunningAveragePowerLimit '%s'", value); return -1; } @@ -1591,13 +1605,13 @@ turbostat_config(const char *key, const char *value) } else if (strcasecmp("TCCActivationTemp", key) == 0) { tmp_val = strtoul(value, &end, 0); if (*end != '\0' || tmp_val > UINT_MAX) { - ERROR("Turbostat plugin: Invalid TCCActivationTemp '%s'", + ERROR("turbostat plugin: Invalid TCCActivationTemp '%s'", value); return -1; } tcc_activation_temp = (unsigned int) tmp_val; } else { - ERROR("Turbostat plugin: Invalid configuration option '%s'", + ERROR("turbostat plugin: Invalid configuration option '%s'", key); return -1; }