Browse Source

[append]

new_master
huangyulong 3 weeks ago
parent
commit
1c53d33a66
2 changed files with 5 additions and 3 deletions
  1. 4
    2
      hardware_info.c
  2. 1
    1
      server-monitor.c

+ 4
- 2
hardware_info.c View File

999
 }
999
 }
1000
 
1000
 
1001
 #include <sys/sysinfo.h>
1001
 #include <sys/sysinfo.h>
1002
+#include <unistd.h>
1002
 
1003
 
1003
 #if 0
1004
 #if 0
1004
 struct sysinfo 
1005
 struct sysinfo 
1030
     // if (mem_occupy) ²»¶Ô
1031
     // if (mem_occupy) ²»¶Ô
1031
     //     *mem_occupy = (100.0 * (info.totalram - info.freeram) / info.totalram);
1032
     //     *mem_occupy = (100.0 * (info.totalram - info.freeram) / info.totalram);
1032
 
1033
 
1033
-    const float load_1m = info.loads[0] / 65536.0;
1034
+    const int num_cores = sysconf(_SC_NPROCESSORS_ONLN);
1035
+    float load_1m = info.loads[0] / 65536.0;
1034
 
1036
 
1035
     if (load)
1037
     if (load)
1036
-        *load = (load_1m / 4) * 100 ;
1038
+        *load = (load_1m / num_cores) * 100 ;
1037
     
1039
     
1038
     if (procs)
1040
     if (procs)
1039
         *procs = info.procs;
1041
         *procs = info.procs;

+ 1
- 1
server-monitor.c View File

101
     {
101
     {
102
         sleep(2);
102
         sleep(2);
103
         long uptime;
103
         long uptime;
104
-        float load; // 1分钟的负载
104
+        float load; // 5分钟的负载
105
         int *procs;
105
         int *procs;
106
 
106
 
107
         if (get_system_info(&uptime, &load, &procs) < 0)
107
         if (get_system_info(&uptime, &load, &procs) < 0)

Loading…
Cancel
Save