Added missing include of 'kstat.h'

[collectd.git] / src / cpu.c

diff --git a/src/cpu.c b/src/cpu.c
index cdacf42..b898477 100644 (file)
--- a/src/cpu.c
+++ b/src/cpu.c
@@ -134,6 +134,9 @@ static mach_msg_type_number_t cpu_list_len;
 /* #endif KERNEL_LINUX */
 
 #elif defined(HAVE_LIBKSTAT)
+#if HAVE_KSTAT_H
+#include <kstat.h>
+#endif
 /* colleague tells me that Sun doesn't sell systems with more than 100 or so
  * CPUs.. */
 #define MAX_NUMCPU 256
@@ -644,7 +647,6 @@ static int cpu_read(void) {
 
   char *fields[11];
   int numfields;
-  long long user_value, nice_value, value;
 
   if ((fh = fopen("/proc/stat", "r")) == NULL) {
     char errbuf[1024];
@@ -666,8 +668,8 @@ static int cpu_read(void) {
     cpu = atoi(fields[0] + 3);
 
     /* Do not stage User and Nice immediately: we may need to alter them later: */
-    user_value = atoll(fields[1]);
-    nice_value = atoll(fields[2]);
+    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);
 
@@ -677,40 +679,37 @@ static int cpu_read(void) {
                 now);
       cpu_stage(cpu, COLLECTD_CPU_STATE_SOFTIRQ, (derive_t)atoll(fields[7]),
                 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 >= 9) {
-        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) {
-            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) {
-              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;
-              }
-            }
-          }
+    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);