Connect top.c to the build only on Linux.

[monky] / src / linux.c

diff --git a/src/linux.c b/src/linux.c
index dd1f273..2bcf7ed 100644 (file)
--- a/src/linux.c
+++ b/src/linux.c
@@ -320,21 +320,24 @@ void update_total_processes()
        update_sysinfo();
 }
 
-static unsigned int cpu_user, cpu_system, cpu_nice;
-static double last_cpu_sum;
-static int clock_ticks;
+#define CPU_SAMPLE_COUNT 15
+struct cpu_info {
+       unsigned int cpu_user;
+       unsigned int cpu_system;
+       unsigned int cpu_nice;
+       double last_cpu_sum;
+       int clock_ticks;
+       double cpu_val[CPU_SAMPLE_COUNT];
+};
+static short cpu_setup = 0;
+static int rep;
+
 
 static FILE *stat_fp;
 
-inline static void update_stat()
+void get_cpu_count()
 {
-       // FIXME: arbitrary size?
-       static double cpu_val[15];
-       static int rep;
        char buf[256];
-       unsigned int i;
-       double curtmp;
-
        if (stat_fp == NULL)
                stat_fp = open_file("/proc/stat", &rep);
        else
@@ -348,37 +351,86 @@ inline static void update_stat()
                if (fgets(buf, 255, stat_fp) == NULL)
                        break;
 
+               if (strncmp(buf, "cpu", 3) == 0 && isdigit(buf[3])) {
+                       info.cpu_count++;
+               }
+       }
+       info.cpu_usage = malloc((info.cpu_count + 1) * sizeof(float));
+}
+
+
+inline static void update_stat()
+{
+       static struct cpu_info *cpu = NULL;
+       char buf[256];
+       unsigned int i;
+       unsigned int index;
+       double curtmp;
+       if (!cpu_setup) {
+               get_cpu_count();
+               cpu_setup = 1;
+       }
+       if (cpu == NULL) {
+               cpu = malloc((info.cpu_count + 1) * sizeof(struct cpu_info));
+               for (index = 0; index < info.cpu_count + 1; ++index) {
+                       cpu[index].clock_ticks = 0;
+                       cpu[index].last_cpu_sum = 0;
+                       for (i = 0; i < CPU_SAMPLE_COUNT; ++i) {
+                               cpu[index].cpu_val[i] = 0;
+                       }
+               }
+       }
+       if (stat_fp == NULL) {
+               stat_fp = open_file("/proc/stat", &rep);
+       } else {
+               fseek(stat_fp, 0, SEEK_SET);
+       }
+       if (stat_fp == NULL) {
+               return;
+       }
+       index = 0;
+       while (!feof(stat_fp)) {
+               if (fgets(buf, 255, stat_fp) == NULL)
+                       break;
+
                if (strncmp(buf, "procs_running ", 14) == 0) {
                        sscanf(buf, "%*s %d", &info.run_procs);
                        info.mask |= (1 << INFO_RUN_PROCS);
                } else if (strncmp(buf, "cpu ", 4) == 0) {
-                       sscanf(buf, "%*s %u %u %u", &cpu_user, &cpu_nice,
-                              &cpu_system);
+                       sscanf(buf, "%*s %u %u %u", &(cpu[index].cpu_user), &(cpu[index].cpu_nice), &(cpu[index].cpu_system));
+                       index++;
+                       info.mask |= (1 << INFO_CPU);
+               } else if (strncmp(buf, "cpu", 3) == 0 && isdigit(buf[3]) && index <= info.cpu_count) {
+                       sscanf(buf, "%*s %u %u %u", &(cpu[index].cpu_user), &(cpu[index].cpu_nice), &(cpu[index].cpu_system));
+                       index++;
                        info.mask |= (1 << INFO_CPU);
-               } else if (strncmp(buf, "cpu", 3) == 0 && isdigit(buf[3])) {
-                       info.cpu_count++;
                }
        }
-
-       {
+       for (index = 0; index < info.cpu_count + 1; index++) {
                double delta;
                delta = current_update_time - last_update_time;
-               if (delta <= 0.001)
+               if (delta <= 0.001) {
                        return;
+               }
 
-               if (clock_ticks == 0)
-                       clock_ticks = sysconf(_SC_CLK_TCK);
+               if (cpu[index].clock_ticks == 0) {
+                       cpu[index].clock_ticks = sysconf(_SC_CLK_TCK);
+               }
                curtmp = 0;
-               cpu_val[0] =
-                   (cpu_user + cpu_nice + cpu_system -
-                    last_cpu_sum) / delta / (double) clock_ticks /
-                   info.cpu_count;
-               for (i = 0; i < info.cpu_avg_samples; i++)
-                       curtmp += cpu_val[i];
-               info.cpu_usage = curtmp / info.cpu_avg_samples;
-               last_cpu_sum = cpu_user + cpu_nice + cpu_system;
+               cpu[index].cpu_val[0] =
+                               (cpu[index].cpu_user + cpu[index].cpu_nice + cpu[index].cpu_system -
+                               cpu[index].last_cpu_sum) / delta / (double) cpu[index].clock_ticks;
+               for (i = 0; i < info.cpu_avg_samples; i++) {
+                       curtmp += cpu[index].cpu_val[i];
+               }
+               if (index == 0) {
+                       info.cpu_usage[index] = curtmp / info.cpu_avg_samples / info.cpu_count;
+               } else {
+                       info.cpu_usage[index] = curtmp / info.cpu_avg_samples;
+               }
+               cpu[index].last_cpu_sum = cpu[index].cpu_user + cpu[index].cpu_nice + cpu[index].cpu_system;
                for (i = info.cpu_avg_samples; i > 1; i--)
-                       cpu_val[i - 1] = cpu_val[i - 2];
+                       cpu[index].cpu_val[i - 1] = cpu[index].cpu_val[i - 2];
 
        }
 
@@ -1161,17 +1213,16 @@ void update_diskio()
         * cd-roms and floppies, and summ them up
         */
        current = 0;
-       strcmp(buf, "fasdf");
        while (!feof(fp)) {
                fgets(buf, 512, fp);
                col_count = sscanf(buf, "%u %u %*s %*u %*u %u %*u %*u %*u %u",
                                   &major, &minor, &reads, &writes);
-               /* ignore subdevices (they have only 7 entries in their line)
+               /* ignore subdevices (they have only 3 matching entries in their line)
                 * and virtual devices (LVM, network block devices, RAM disks, Loopback)
                 *
                 * XXX ignore devices which are part of a SW RAID (MD_MAJOR)
                 */
-               if (col_count > 7 &&
+               if (col_count > 3 &&
                    major != LVM_BLK_MAJOR && major != NBD_MAJOR &&
                    major != RAMDISK_MAJOR && major != LOOP_MAJOR) {
                        current += reads + writes;