X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fcpu.c;h=3dbe80eeb1b7f4727b491803e93e841cac09200a;hb=f1b5b8611d87a7904c31ae4b28ea47f11f3c38b9;hp=8a4e10e684ddfa370a8a5f9e6fdc38b7fc291fd4;hpb=6e419a825c50f9c97471aba7d50521bfc7e19828;p=collectd.git diff --git a/src/cpu.c b/src/cpu.c index 8a4e10e6..3dbe80ee 100644 --- a/src/cpu.c +++ b/src/cpu.c @@ -1,7 +1,9 @@ /** * collectd - src/cpu.c * Copyright (C) 2005-2009 Florian octo Forster - * Copyright (C) 2009 Simon Kuhnle + * Copyright (C) 2008 Oleg King + * Copyright (C) 2009 Simon Kuhnle + * Copyright (C) 2009 Manuel Sanmartin * * 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 @@ -18,7 +20,9 @@ * * Authors: * Florian octo Forster + * Oleg King * Simon Kuhnle + * Manuel Sanmartin **/ #include "collectd.h" @@ -86,8 +90,13 @@ # include #endif +# ifdef HAVE_PERFSTAT +# include +# include +# endif /* HAVE_PERFSTAT */ + #if !PROCESSOR_CPU_LOAD_INFO && !KERNEL_LINUX && !HAVE_LIBKSTAT \ - && !CAN_USE_SYSCTL && !HAVE_SYSCTLBYNAME && !HAVE_LIBSTATGRAB + && !CAN_USE_SYSCTL && !HAVE_SYSCTLBYNAME && !HAVE_LIBSTATGRAB && !HAVE_PERFSTAT # error "No applicable input method." #endif @@ -121,11 +130,20 @@ static int numcpu; #elif defined(HAVE_SYSCTLBYNAME) static int numcpu; +# ifdef HAVE_SYSCTL_KERN_CP_TIMES +static int maxcpu; +# endif /* HAVE_SYSCTL_KERN_CP_TIMES */ /* #endif HAVE_SYSCTLBYNAME */ #elif defined(HAVE_LIBSTATGRAB) /* no variables needed */ -#endif /* HAVE_LIBSTATGRAB */ +/* #endif HAVE_LIBSTATGRAB */ + +#elif defined(HAVE_PERFSTAT) +static perfstat_cpu_t *perfcpu; +static int numcpu; +static int pnumcpu; +#endif /* HAVE_PERFSTAT */ static int init (void) { @@ -145,7 +163,7 @@ static int init (void) DEBUG ("host_processors returned %i %s", (int) cpu_list_len, cpu_list_len == 1 ? "processor" : "processors"); INFO ("cpu plugin: Found %i processor%s.", (int) cpu_list_len, cpu_list_len == 1 ? "" : "s"); - cpu_temp_retry_max = 86400 / interval_g; + cpu_temp_retry_max = 86400 / CDTIME_T_TO_TIME_T (interval_g); /* #endif PROCESSOR_CPU_LOAD_INFO */ #elif defined(HAVE_LIBKSTAT) @@ -191,18 +209,34 @@ static int init (void) if (sysctlbyname ("hw.ncpu", &numcpu, &numcpu_size, NULL, 0) < 0) { char errbuf[1024]; - WARNING ("cpu plugin: sysctlbyname: %s", + WARNING ("cpu plugin: sysctlbyname(hw.ncpu): %s", sstrerror (errno, errbuf, sizeof (errbuf))); return (-1); } +#ifdef HAVE_SYSCTL_KERN_CP_TIMES + 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))); + return (-1); + } +#else if (numcpu != 1) NOTICE ("cpu: Only one processor supported when using `sysctlbyname' (found %i)", numcpu); +#endif /* #endif HAVE_SYSCTLBYNAME */ #elif defined(HAVE_LIBSTATGRAB) /* nothing to initialize */ -#endif /* HAVE_LIBSTATGRAB */ +/* #endif HAVE_LIBSTATGRAB */ + +#elif defined(HAVE_PERFSTAT) + /* nothing to initialize */ +#endif /* HAVE_PERFSTAT */ return (0); } /* int init */ @@ -218,7 +252,7 @@ static void submit (int cpu_num, const char *type_instance, counter_t value) vl.values_len = 1; sstrncpy (vl.host, hostname_g, sizeof (vl.host)); sstrncpy (vl.plugin, "cpu", sizeof (vl.plugin)); - ssnprintf (vl.plugin_instance, sizeof (vl.type_instance), + ssnprintf (vl.plugin_instance, sizeof (vl.plugin_instance), "%i", cpu_num); sstrncpy (vl.type, "cpu", sizeof (vl.type)); sstrncpy (vl.type_instance, type_instance, sizeof (vl.type_instance)); @@ -462,7 +496,30 @@ static int cpu_read (void) submit (i, "interrupt", cpuinfo[i][CP_INTR]); } /* #endif CAN_USE_SYSCTL */ +#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)); + + 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))); + return (-1); + } + + for (i = 0; i < numcpu; i++) { + submit (i, "user", cpuinfo[i][CP_USER]); + submit (i, "nice", cpuinfo[i][CP_NICE]); + submit (i, "system", cpuinfo[i][CP_SYS]); + submit (i, "idle", cpuinfo[i][CP_IDLE]); + submit (i, "interrupt", cpuinfo[i][CP_INTR]); + } +/* #endif HAVE_SYSCTL_KERN_CP_TIMES */ #elif defined(HAVE_SYSCTLBYNAME) long cpuinfo[CPUSTATES]; size_t cpuinfo_size; @@ -500,7 +557,46 @@ static int cpu_read (void) submit (0, "system", (counter_t) cs->kernel); submit (0, "user", (counter_t) cs->user); submit (0, "wait", (counter_t) cs->iowait); -#endif /* HAVE_LIBSTATGRAB */ +/* #endif HAVE_LIBSTATGRAB */ + +#elif defined(HAVE_PERFSTAT) + perfstat_id_t id; + int i, cpus; + + 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))); + return (-1); + } + + if (pnumcpu != numcpu || perfcpu == NULL) + { + if (perfcpu != NULL) + free(perfcpu); + perfcpu = malloc(numcpu * sizeof(perfstat_cpu_t)); + } + pnumcpu = numcpu; + + 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))); + return (-1); + } + + for (i = 0; i < cpus; i++) + { + submit (i, "idle", (counter_t) perfcpu[i].idle); + submit (i, "system", (counter_t) perfcpu[i].sys); + submit (i, "user", (counter_t) perfcpu[i].user); + submit (i, "wait", (counter_t) perfcpu[i].wait); + } +#endif /* HAVE_PERFSTAT */ return (0); }