X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fload.c;h=0188da7ef38407972f5570f47fabcf622db41b4b;hb=8eb9e6285f394569d7fe6ad43a0f4e5f9bca454f;hp=b7372a1091f9e35e7ffc597570129dc3cb636c2a;hpb=a1ae4b5afaf3207a7070b85f802b41b32c0b9a20;p=collectd.git diff --git a/src/load.c b/src/load.c index b7372a10..0188da7e 100644 --- a/src/load.c +++ b/src/load.c @@ -1,6 +1,7 @@ /** * collectd - src/load.c * Copyright (C) 2005-2008 Florian octo Forster + * 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 @@ -17,8 +18,11 @@ * * Authors: * Florian octo Forster + * Manuel Sanmartin **/ +#define _BSD_SOURCE + #include "collectd.h" #include "common.h" #include "plugin.h" @@ -39,6 +43,12 @@ #endif #endif /* defined(HAVE_GETLOADAVG) */ +#ifdef HAVE_PERFSTAT +# include /* AIX 5 */ +# include +# include +#endif /* HAVE_PERFSTAT */ + static void load_submit (gauge_t snum, gauge_t mnum, gauge_t lnum) { value_t values[3]; @@ -79,7 +89,7 @@ static int load_read (void) char *fields[8]; int numfields; - + if ((loadavg = fopen ("/proc/loadavg", "r")) == NULL) { char errbuf[1024]; @@ -130,6 +140,25 @@ static int load_read (void) load_submit (snum, mnum, lnum); /* #endif HAVE_LIBSTATGRAB */ +#elif HAVE_PERFSTAT + gauge_t snum, mnum, lnum; + perfstat_cpu_total_t cputotal; + + if (perfstat_cpu_total(NULL, &cputotal, sizeof(perfstat_cpu_total_t), 1) < 0) + { + char errbuf[1024]; + WARNING ("load: perfstat_cpu : %s", + sstrerror (errno, errbuf, sizeof (errbuf))); + return (-1); + } + + snum = (float)cputotal.loadavg[0]/(float)(1<