|
|
@@ -999,6 +999,7 @@ int hardware_info_init(void)
|
|
999
|
999
|
}
|
|
1000
|
1000
|
|
|
1001
|
1001
|
#include <sys/sysinfo.h>
|
|
|
1002
|
+#include <unistd.h>
|
|
1002
|
1003
|
|
|
1003
|
1004
|
#if 0
|
|
1004
|
1005
|
struct sysinfo
|
|
|
@@ -1030,10 +1031,11 @@ int get_system_info(long *uptime, float *load, int *procs)
|
|
1030
|
1031
|
// if (mem_occupy) ²»¶Ô
|
|
1031
|
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
|
1037
|
if (load)
|
|
1036
|
|
- *load = (load_1m / 4) * 100 ;
|
|
|
1038
|
+ *load = (load_1m / num_cores) * 100 ;
|
|
1037
|
1039
|
|
|
1038
|
1040
|
if (procs)
|
|
1039
|
1041
|
*procs = info.procs;
|