Преглед изворни кода

优化writeDeviceIMEI()函数和writeMCUVersion()函数, 增强其并发操作时的安全性

niujiuru пре 8 месеци
родитељ
комит
468b169518
2 измењених фајлова са 34 додато и 8 уклоњено
  1. 15 4
      main.go
  2. 19 4
      mcu_ctrl_board/mcu_ctrl_board.go

+ 15 - 4
main.go

@@ -157,12 +157,23 @@ func help() {
 }
 }
 
 
 func writeDeviceIMEI() {
 func writeDeviceIMEI() {
+	const path = "/var/device_imei.txt"
+	tmp := path + ".tmp"
+
 	for {
 	for {
-		imei := netmgrd.GetIMEI()
-		if imei == netmgrd.ErrUnknownModemTypeMsg || imei == "" {
+		imei := strings.TrimSpace(netmgrd.GetIMEI())
+		if imei == "" || imei == netmgrd.ErrUnknownModemTypeMsg {
+			time.Sleep(time.Second)
 			continue
 			continue
 		}
 		}
-		os.WriteFile("/var/device_imei.txt", []byte(strings.TrimSpace(imei)+"\n"), 0644)
-		break
+
+		if old, err := os.ReadFile(path); err == nil && strings.TrimSpace(string(old)) == imei {
+			return
+		}
+
+		if os.WriteFile(tmp, []byte(imei+"\n"), 0644) == nil {
+			_ = os.Rename(tmp, path)
+		}
+		return
 	}
 	}
 }
 }

+ 19 - 4
mcu_ctrl_board/mcu_ctrl_board.go

@@ -278,10 +278,7 @@ func RTU_NotifyPwrWillOff() C.int {
 //export MCU_IsNeedUpgrade
 //export MCU_IsNeedUpgrade
 func MCU_IsNeedUpgrade(ver *C.char) C.int {
 func MCU_IsNeedUpgrade(ver *C.char) C.int {
 	version := C.GoString(ver)
 	version := C.GoString(ver)
-	if version != "" { // 存储MCU当前的版本号
-		os.WriteFile(filepath.Join(baseapp.VAR_DIR, "mcu_firmware_version.txt"),
-			[]byte(strings.TrimSpace(version)+"\n"), 0644)
-	}
+	writeMCUVersion(version)
 
 
 	needUpgrade, _, _ := isBoardNeedUpgrade()
 	needUpgrade, _, _ := isBoardNeedUpgrade()
 	if needUpgrade {
 	if needUpgrade {
@@ -304,3 +301,21 @@ func MCU_UpgradeFirmware() C.int {
 
 
 	return 0
 	return 0
 }
 }
+
+func writeMCUVersion(version string) {
+	if version == "" {
+		return
+	}
+
+	path := filepath.Join(baseapp.VAR_DIR, "mcu_firmware_version.txt")
+	tmp := path + ".tmp"
+	data := []byte(strings.TrimSpace(version) + "\n")
+
+	if old, err := os.ReadFile(path); err == nil && strings.TrimSpace(string(old)) == strings.TrimSpace(version) {
+		return
+	}
+
+	if os.WriteFile(tmp, data, 0644) == nil {
+		_ = os.Rename(tmp, path)
+	}
+}