LingxinMeng 1 рік тому
батько
коміт
4067ab42f7

+ 6 - 5
aarch64/pji/common/config/yaml/cloud-config-pji1.yaml

@@ -72,13 +72,14 @@ hosts:
     topics:
       - /camera/color/image_raw
       - /camera/depth/points
-      #      - /diagnostics
-      #      - /locate_info
+      - /diagnostics
+      - /locate_info
       - /obstacle_detection
-      #      - /odom
-      #      - /move_base/global_costmap/costmap
-      #      - /move_base/global_costmap/costmap_updates
+      - /odom
+      - /move_base/global_costmap/costmap
+      - /move_base/global_costmap/costmap_updates
       - /scan_map_icp_amcl_node/scan_point_transformed
+      - /sys_info
 triggers:
   - label: detectfault
     topics:

+ 4 - 5
test/monitor/main/main.go

@@ -13,10 +13,9 @@ func GetCpuPercent() float64 {
 	return percent[0]
 }
 
-func GetMemPercent() float64 {
-	memory1, _ := mem.SwapMemory()
-	memory2, _ := mem.VirtualMemory()
-	return memory1.UsedPercent + memory2.UsedPercent
+func GetMemoryPercent() float64 {
+	memory, _ := mem.SwapMemory()
+	return memory.UsedPercent
 }
 
 func GetDiskPercent() float64 {
@@ -27,6 +26,6 @@ func GetDiskPercent() float64 {
 
 func main() {
 	fmt.Println("cpu总占用为:", GetCpuPercent())
-	fmt.Println("内存总占用为:", GetMemPercent())
+	fmt.Println("内存总占用为:", GetMemoryPercent())
 	fmt.Println("磁盘总占用为:", GetDiskPercent())
 }