[add] 负载和进程数量

hardware_info.c

@@ -1000,12 +1000,44 @@ int hardware_info_init(void)
 
 #include <sys/sysinfo.h>
 
-long get_system_uptime(void)
+#if 0
+struct sysinfo 
+{
+    long uptime; /* Seconds since boot */
+    unsigned long loads[3]; /* 1, 5, and 15 minute Load averages */
+    unsigned long totalram; /* Total usable main memory size */
+    unsigned long freeram; /* Available memory size */
+    unsigned long sharedram; /* Amount of shared memory */
+    unsigned long bufferram; /* Memory used by buffers */
+    unsigned long totalswap; /* Total swap space size */
+    unsigned long freeswap; /* swap space still available */
+    unsigned short procs; /* Number of current processes */
+    char _f[22]; /* Pads structure to 64 bytes */
+};
+#endif
+
+// #include <stdio.h>
+int get_system_info(long *uptime, float *load, int *procs)
 {
     struct sysinfo info;
 
     if (sysinfo(&info))
-            return -1;
+        return -1;
 
-    return info.uptime;
+    if (uptime)
+        *uptime = info.uptime;
+    
+    // if (mem_occupy) ²»¶Ô
+    //     *mem_occupy = (100.0 * (info.totalram - info.freeram) / info.totalram);
+
+    const float load_1m = info.loads[0] / 65536.0;
+
+    if (load)
+        *load = (load_1m / 4) * 100 ;
+    
+    if (procs)
+        *procs = info.procs;
+
+    // printf("load:%f, mem_occupy:%f, totalram:%llu, freeram:%llu, procs:%d\n", *load, *mem_occupy, info.totalram, info.freeram, *procs);
+    return 0;
 }

hardware_info.h

@@ -13,5 +13,6 @@ int get_cpu_temp(void);
 
 void set_debug(int data);
 
-long get_system_uptime(void);
+int get_system_info(long *uptime, float *load, int *procs);
+
 #endif

server-monitor.c

@@ -100,8 +100,18 @@ int main(int argc, char *argv[])
     while (1)
     {
         sleep(2);
-        sprintf(content, "{\"uptime\" : \"%d\", \"cpu_temp\" : \"%d\", \"hdd_temp\" : \"%d\", \"cpu_rate\" : \"%0.1f\", \"mem_rate\" : \"%0.1f\"}",
-                get_system_uptime(), get_cpu_temp(), get_sata_hddtemp(), get_sysCpuUsage(), cal_mem_occupy());
+        long uptime;
+        float load; // 1分钟的负载
+        int *procs;
+
+        if (get_system_info(&uptime, &load, &procs) < 0)
+        {
+            printf("get_system_info fail!\n");
+            continue;
+        }
+            
+        sprintf(content, "{\"uptime\" : \"%d\", \"load\" : \"%0.1f\", \"procs\" : \"%d\", \"cpu_temp\" : \"%d\", \"hdd_temp\" : \"%d\", \"cpu_rate\" : \"%0.1f\", \"mem_rate\" : \"%0.1f\"}",
+                uptime, load, procs, get_cpu_temp(), get_sata_hddtemp(), get_sysCpuUsage(), cal_mem_occupy());
         mosquitto_publish(m_hMqtt, NULL, MQTT_PUB_TOPIC, strlen(content), content, 0, false);
     }