src/usr.bin/top/machine.c - diff

Return to machine.c CVS log

Up to [local] / src / usr.bin / top

-version 1.79, 2014/09/15 19:08:21
+version 1.80, 2014/09/17 01:56:54
 Line 141
 Line 141
 Line 141
  unsigned int    maxslp;
  int
- machine_init(struct statics *statics)
+ getncpu(void)
  {
+         int mib[] = { CTL_HW, HW_NCPU };
+         int ncpu;
          size_t size = sizeof(ncpu);
-         int mib[2], pagesize, cpu;
-         mib[0] = CTL_HW;
+         if (sysctl(mib, sizeof(mib) / sizeof(mib[0]),
-         mib[1] = HW_NCPU;
+             &ncpu, &size, NULL, 0) == -1)
-         if (sysctl(mib, 2, &ncpu, &size, NULL, 0) == -1)
+                 return (-1);
+         return (ncpu);
+ }
+ int
+ machine_init(struct statics *statics)
+ {
+         int pagesize, cpu;
+         ncpu = getncpu();
+         if (ncpu == -1)
                  return (-1);
          cpu_states = calloc(ncpu, CPUSTATES * sizeof(int64_t));
          if (cpu_states == NULL)