[add] 上传系统启动时间

hardware_info.c

@@ -1,37 +1,50 @@
 /* 硬盘温度 */
-// #include <unistd.h>
-// #include <stdio.h>
-// #include <string.h>
+#include <unistd.h>
+#include <stdio.h>
+#include <string.h>
+#include <errno.h>
 #include <getopt.h>
-// #include <unistd.h>
-// #include <stdlib.h>
+#include <unistd.h>
+#include <stdlib.h>
 #include <sys/ioctl.h>
 #include <linux/hdreg.h>
 #include <scsi/scsi.h>
 #include <scsi/sg.h>
 #include <scsi/scsi_ioctl.h>
 #include <fcntl.h>
+#include <netinet/in.h>
 
 #define   DEF(X)   1
 static int debug;
 
+void set_debug(int data)
+{
+    debug = data;
+}
+
 #define CPU_TEMP_FILE1    "/sys/class/hwmon/hwmon1/temp3_input"
 #define CPU_TEMP_FILE2    "/sys/class/therma/temp"
 
-int get_cpu_temp(int file_type)
+int get_cpu_temp(void)
 {
     int cpu_temp;
+    FILE *fp;
+    char *file_name = CPU_TEMP_FILE1;
 
-    /* cpu温度获取 */
-    FILE *fp = fopen(file_type ? CPU_TEMP_FILE1 : CPU_TEMP_FILE2, "r");
+    if (!(fp = fopen(file_name, "r")))
+    {
+        file_name = CPU_TEMP_FILE2;
+        fp = fopen(file_name, "r");
+    }
 
-    if (NULL == fp)
+    if (!fp)
     {
-        printf("open file failed,%s\n", strerror(errno));
+        printf("open file failed, %s\n", strerror(errno));
+        return 0;
     }
     else
     {
-        // rewind(fp);
+        // rewind(fp); // 指向流的开头
         fscanf(fp, "%d", &cpu_temp);
         fclose(fp);
     }
@@ -496,7 +509,7 @@ int scsi_get_temperature(int fd)
 {
     unsigned char buf[1024];
     unsigned char smartsupport;
-    char gBuf[GBUF_SIZE];
+    //char gBuf[GBUF_SIZE];
 
     if (0 != scsi_smart_mode_page1c_handler(fd, SMART_SUPPORT, &smartsupport))
     {
@@ -759,39 +772,73 @@ int sata_get_temperature(int fd)
 }
 #endif
 
-
 /* 获取硬盘温度 */
-int get_sata_hddtemp(char *device, int *value)
+static char hdd_dev[] = "/dev/sdx";
+static int hdd_init_flag;
+
+int hdd_moudle_init(void)
+{
+    if (find_hdd_dev(hdd_dev, sizeof(hdd_dev)))
+    {
+        printf("no hdd dev !!!!\n");
+        return -1;
+    }
+
+    return 0;
+}
+
+int find_hdd_dev(char *hdd_dev, int size)
+{
+    int i;
+
+    for (i = 0; i <= 'z' - 'a'; i++)
+    {
+        snprintf(hdd_dev, size, "/dev/sd%c", 'a' + i);
+
+        if (get_sata_hddtemp(hdd_dev) > 0)
+        {
+            printf("find hdd dev: %s\n", hdd_dev);
+            return 0;
+        }
+    } 
+
+    return -1;
+}
+
+int get_sata_hddtemp(void)
 {
+    int temp;
     int fd = 0;
-    fd = open(device, O_RDONLY | O_NONBLOCK);
+
+    fd = open(hdd_dev, O_RDONLY | O_NONBLOCK);
 
     if (fd < 0)
     {
-        printf("open hdd device err!\n");
-        return (-1);
+        // printf("open hdd device err!\n");
+        return 0;
     }
 
     if (sata_probe(fd))
     {
-        *value = sata_get_temperature(fd);
+        temp = sata_get_temperature(fd);
     }
     else if (ata_probe(fd))
     {
-        *value = ata_get_temperature(fd);
+        temp = ata_get_temperature(fd);
     }
     else if (scsi_probe(fd))
     {
-        *value = scsi_get_temperature(fd);
+        temp = scsi_get_temperature(fd);
     }
 
-    if (*value < 0)
+    close(fd);
+
+    if (temp < 0)
     {
-        return -1;
+        return 0;
     }
 
-    close(fd);
-    return 0;
+    return temp;
 }
 
 
@@ -944,3 +991,21 @@ float cal_mem_occupy(void)
     get_mem_occupy(&omem);
     return (100.0 * (omem.total - omem.available) / omem.total);
 }
+
+
+int hardware_info_init(void)
+{
+    hdd_moudle_init();
+}
+
+#include <sys/sysinfo.h>
+
+long get_system_uptime(void)
+{
+    struct sysinfo info;
+
+    if (sysinfo(&info))
+            return -1;
+
+    return info.uptime;
+}

hardware_info.h

@@ -1,13 +1,17 @@
 #ifndef __HW_INFO__
 #define __HW_INFO__
 
+int hardware_info_init(void);
 /* 获取硬盘温度 */
-static int get_sata_hddtemp(char *device, int *value);
+int get_sata_hddtemp(void);
 /* 获取cpu使用率 */
 double get_sysCpuUsage(void);
 /* 获取内存使用率 */
 float cal_mem_occupy(void);
 /* 获取cpu温度 */
-int get_cpu_temp(int file_type);
+int get_cpu_temp(void);
 
+void set_debug(int data);
+
+long get_system_uptime(void);
 #endif

server-monitor.c

@@ -1,20 +1,19 @@
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <stdbool.h>
 #include <stdint.h>
 #include <mosquitto.h>
 #include <time.h>
 #include <unistd.h>
 #include <string.h>
-#include <errno.h>
-
-#define MQTT_SERVER_IP    "127.0.0.1"
-#define MQTT_SERVER_PORT  1883
-#define MQTT_SERVER_USER  "iops"
-#define MQTT_SERVER_PASSWORD "12345678"
-#define MQTT_SUB_TOPIC "n3150-sensors"
+#include "hardware_info.h"
 
+#define MQTT_SERVER_IP        "127.0.0.1"
+#define MQTT_SERVER_PORT      1883
+#define MQTT_SERVER_USER      "iops"
+#define MQTT_SERVER_PASSWORD  "12345678"
+#define MQTT_THIS_CLIEN_NAME  "n3150-sensors"
+#define MQTT_PUB_TOPIC        "server-status"
 
 // 连接回调函数，当连接成功时会进入这里，可以在这里进行连接成功之后的操作，比如连接之后的信息同步
 void my_connect_callback(struct mosquitto *mosq, void *obj, int rc)
@@ -40,6 +39,7 @@ void my_message_callback(struct mosquitto *mosq, void *obj, const struct mosquit
 // 订阅消息回调
 void my_subscribe_callback(struct mosquitto *mosq, void *obj, int mid, int qos_count, const int *granted_qos)
 {
+    #if 0
     int i;
     time_t t;
     struct tm *lt;
@@ -53,56 +53,25 @@ void my_subscribe_callback(struct mosquitto *mosq, void *obj, int mid, int qos_c
     {
         printf("%d: granted_qos[%d]=%d\n", __LINE__, i, granted_qos[i]);
     }
+    #endif
 }
 
-int print_usage(void)
-{
-    printf("Usage:\n");
-    printf("          satatemp  [-d]  /dev/sda\n");
-    printf("          -d print debug  info\n");
-    return 0;
-}
+
 
 int main(int argc, char *argv[])
 {
-    struct mosquitto *m_hMqtt;
-    char *topic1 = "server-status";
-    char content[256];
-
-    int cpu_temp = 0;
-    int hdd_temp = 0;
-    char *device = NULL;
-
-    if (3 == argc)
-    {
-        if (0 != strncmp(argv[1], "-d", strlen("-d")))
-        {
-            print_usage();
-            return -1;
-        }
-
-        device = argv[2];
-    }
-    else if (argc == 2)
-    {
-        if (0 != strncmp(argv[1], "/dev/", strlen("/dev/")))
-        {
-            print_usage();
-            return -1;
-        }
-
-        device = argv[1];
-    }
-    else
-    {
-        print_usage();
-        return -1;
-    }
+    /* 不配置流缓冲区，PRINT_LOG会立即写入文件 */
+    setbuf(stdout, NULL);
+    setbuf(stderr, NULL);
 
+    struct mosquitto *m_hMqtt;
+    char content[1024];
+    
+    hardware_info_init();
     //初始化lib库函数
     mosquitto_lib_init();
     // 定义一个客户端名为subtest的发布端。客户端表示订阅端的唯一性
-    m_hMqtt = mosquitto_new(MQTT_SUB_TOPIC, true, "data");
+    m_hMqtt = mosquitto_new(MQTT_THIS_CLIEN_NAME, true, MQTT_THIS_CLIEN_NAME);
     //设置连接确认回调
     mosquitto_connect_callback_set(m_hMqtt, my_connect_callback);
     //设置断开连接确认回调
@@ -126,15 +95,14 @@ int main(int argc, char *argv[])
 
     //mosquitto_subscribe(m_hMqtt,NULL,topic1,1);
     //mosquitto_subscribe(m_hMqtt,NULL,topic2,1);
-    mosquitto_loop_start(m_hMqtt); //mosquitto会创建一个进程实时运行发送心跳包和接收订阅的主题消息
+    //mosquitto_loop_start(m_hMqtt); //mosquitto会创建一个进程实时运行发送心跳包和接收订阅的主题消息
 
     while (1)
     {
-        sleep(5);
-        get_sata_hddtemp(device, &hdd_temp);
-        sprintf(content, "{\"cpu_temp\" : \"%d\", \"hdd_temp\" : \"%d\", \"cpu_rate\" : \"%0.2f\", \"mem_rate\" : \"%0.2f\"}",
-                get_cpu_temp(1), hdd_temp, get_sysCpuUsage(), cal_mem_occupy());
-        mosquitto_publish(m_hMqtt, NULL, topic1, strlen(content), content, 0, false);
+        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());
+        mosquitto_publish(m_hMqtt, NULL, MQTT_PUB_TOPIC, strlen(content), content, 0, false);
     }
 
     //mosquitto_loop_stop(m_hMqtt, false);