From 39c3f4ae0466fcfa9f6620bd49ed26757c367431 Mon Sep 17 00:00:00 2001
From: pandx <dxpan2002@163.com>
Date: Sun, 17 Nov 2024 09:37:04 +0800
Subject: [PATCH 1/3] modify update and upgrade clear logic.

---
 scheduler/update_cfg.cpp  | 6 +++++-
 scheduler/upgrade_cfg.cpp | 4 ++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/scheduler/update_cfg.cpp b/scheduler/update_cfg.cpp
index 341d1d9..66e79ae 100644
--- a/scheduler/update_cfg.cpp
+++ b/scheduler/update_cfg.cpp
@@ -35,7 +35,11 @@ int UpdateCfg::ReadCfg(std::unordered_set<int>& update) {
     return 0; 
 }
 
-int UpdateCfg::WriteCfg(std::unordered_set<int> &update) { 
+int UpdateCfg::WriteCfg(std::unordered_set<int> &update) {
+    if (update.size() == 0) {
+        ClearCfg();
+        return 0;
+    } 
     Json::Value root;
     for (auto item : update) {
         root.append(item);
diff --git a/scheduler/upgrade_cfg.cpp b/scheduler/upgrade_cfg.cpp
index 2beb7cb..09eb1c6 100644
--- a/scheduler/upgrade_cfg.cpp
+++ b/scheduler/upgrade_cfg.cpp
@@ -51,6 +51,10 @@ int UpgradeCfg::ReadCfg(std::map<int, UpgradeInfo> &upgrade) {
 }
 
 int UpgradeCfg::WriteCfg(std::map<int, UpgradeInfo> &upgrade) {
+    if (upgrade.size() == 0) {
+        ClearCfg();
+        return 0;
+    }
     Json::Value root;        
     for (auto item : upgrade) {
         Json::Value upgrade_item;

From b40651380415a00b37bf52ef15c913fd50108926 Mon Sep 17 00:00:00 2001
From: pandx <dxpan2002@163.com>
Date: Sun, 17 Nov 2024 10:40:05 +0800
Subject: [PATCH 2/3] modify project output.

---
 .cproject                       | 2 +-
 .settings/language.settings.xml | 4 ++--
 uart/uart.cpp                   | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.cproject b/.cproject
index 17b8cd2..41e7f75 100644
--- a/.cproject
+++ b/.cproject
@@ -101,7 +101,7 @@
 				</extensions>
 			</storageModule>
 			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-				<configuration artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release" cleanCommand="rm -rf" description="" errorParsers="org.eclipse.cdt.core.GASErrorParser;org.eclipse.cdt.core.GmakeErrorParser;org.eclipse.cdt.core.GLDErrorParser;org.eclipse.cdt.core.CWDLocator;org.eclipse.cdt.core.GCCErrorParser" id="cdt.managedbuild.config.gnu.cross.exe.release.770635657" name="Release" optionalBuildProperties="org.eclipse.cdt.docker.launcher.containerbuild.property.selectedvolumes=,org.eclipse.cdt.docker.launcher.containerbuild.property.volumes=" parent="cdt.managedbuild.config.gnu.cross.exe.release" postannouncebuildStep="" postbuildStep="cp WirelessGateway Cidn-SH;arm-linux-gnueabihf-strip Cidn-SH" preannouncebuildStep="" prebuildStep="">
+				<configuration artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release" cleanCommand="rm -rf" description="" errorParsers="org.eclipse.cdt.core.GASErrorParser;org.eclipse.cdt.core.GmakeErrorParser;org.eclipse.cdt.core.GLDErrorParser;org.eclipse.cdt.core.CWDLocator;org.eclipse.cdt.core.GCCErrorParser" id="cdt.managedbuild.config.gnu.cross.exe.release.770635657" name="Release" optionalBuildProperties="org.eclipse.cdt.docker.launcher.containerbuild.property.selectedvolumes=,org.eclipse.cdt.docker.launcher.containerbuild.property.volumes=" parent="cdt.managedbuild.config.gnu.cross.exe.release" postannouncebuildStep="" postbuildStep="cp WLG Cidn-SH;arm-linux-gnueabihf-strip Cidn-SH" preannouncebuildStep="" prebuildStep="">
 					<folderInfo id="cdt.managedbuild.config.gnu.cross.exe.release.770635657." name="/" resourcePath="">
 						<toolChain errorParsers="" id="cdt.managedbuild.toolchain.gnu.cross.exe.release.1737804687" name="Cross GCC" superClass="cdt.managedbuild.toolchain.gnu.cross.exe.release">
 							<option id="cdt.managedbuild.option.gnu.cross.prefix.1625525504" name="Prefix" superClass="cdt.managedbuild.option.gnu.cross.prefix" useByScannerDiscovery="false" value="arm-linux-gnueabihf-" valueType="string"/>
diff --git a/.settings/language.settings.xml b/.settings/language.settings.xml
index 3fbc4db..915f0d3 100644
--- a/.settings/language.settings.xml
+++ b/.settings/language.settings.xml
@@ -5,7 +5,7 @@
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
 			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
-			<provider class="org.eclipse.cdt.internal.build.crossgcc.CrossGCCBuiltinSpecsDetector" console="false" env-hash="-469859550318386951" id="org.eclipse.cdt.build.crossgcc.CrossGCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+			<provider class="org.eclipse.cdt.internal.build.crossgcc.CrossGCCBuiltinSpecsDetector" console="false" env-hash="-1102353172776392420" id="org.eclipse.cdt.build.crossgcc.CrossGCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>
@@ -16,7 +16,7 @@
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
 			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
-			<provider class="org.eclipse.cdt.internal.build.crossgcc.CrossGCCBuiltinSpecsDetector" console="false" env-hash="-469859550318386951" id="org.eclipse.cdt.build.crossgcc.CrossGCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+			<provider class="org.eclipse.cdt.internal.build.crossgcc.CrossGCCBuiltinSpecsDetector" console="false" env-hash="-1102353172776392420" id="org.eclipse.cdt.build.crossgcc.CrossGCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>
diff --git a/uart/uart.cpp b/uart/uart.cpp
index f349a96..1bc81d1 100644
--- a/uart/uart.cpp
+++ b/uart/uart.cpp
@@ -226,7 +226,7 @@ int Uart::ZigbeeTest() {
 }
 
 void Uart::WriteToUart(const char *strSend, int pLen) {
-    if (!bUpdate) 
+    if (bUpdate) 
     {
         printf( "Write To Uart Start:\n");
         for (int i = 0; i < pLen; i++) {

From 95e00f919b5019d2f927e7dc34722683d5b5146c Mon Sep 17 00:00:00 2001
From: pandx <dxpan2002@163.com>
Date: Sun, 17 Nov 2024 16:32:53 +0800
Subject: [PATCH 3/3] add protection for upgrade file.

---
 dbaccess/sql_db.cpp       | 10 +++++++---
 scheduler/schedule.cpp    | 26 ++++++++++++++++----------
 scheduler/schedule.hpp    |  6 ++++--
 scheduler/upgrade_cfg.cpp | 10 +++++++++-
 4 files changed, 36 insertions(+), 16 deletions(-)

diff --git a/dbaccess/sql_db.cpp b/dbaccess/sql_db.cpp
index 15bb1ee..fb05c5c 100644
--- a/dbaccess/sql_db.cpp
+++ b/dbaccess/sql_db.cpp
@@ -1351,6 +1351,12 @@ int SqliteDB::CalculateData() {
         int planCount = 0, planCountStatistic = 0, StatisticCountTotal = 0, SixCountTotal = 0, TimingCountTotal = 0, CountWaveXTotal = 0, waveInterVal = 0, featureInterVal = 0;
         int CountWaveYTotal = 0, CountWaveZTotal = 0;
         for (size_t i = 0; i < vecRet.size(); i++) {
+            featureInterVal = atoi(vecRet[i][3].c_str());
+            waveInterVal = atoi(vecRet[i][4].c_str());
+            if (featureInterVal == 0 || waveInterVal == 0) {
+                zlog_error(zct, "featureInterVal:%d or waveInterVal:%d is 0", featureInterVal, waveInterVal);
+                continue;
+            }
             planCount = 1440 / atoi(vecRet[i][4].c_str());
             planCountStatistic = 1440 / atoi(vecRet[i][3].c_str());
             int rate = readIntValue("config", "waveRate", (char *)GlobalConfig::Config_G.c_str());
@@ -1472,9 +1478,7 @@ int SqliteDB::CalculateData() {
                     }
                     zlog_info(zct, "3 update ZigbeePower ");
                 }
-            }
-            featureInterVal = atoi(vecRet[i][3].c_str());
-            waveInterVal = atoi(vecRet[i][4].c_str());
+            }            
         }
         zlog_info(zct, "Node Count = %d , featureInterVal = %d , waveInterVal = %d", vecRet.size(), featureInterVal, waveInterVal);
         zlog_info(zct, "plan Statistic Count = %d , 06 Count = %d , Timing Count = %d , CountWaveX = %d ", planCountStatistic * vecRet.size(), planCount * vecRet.size(), planCount * vecRet.size(), planCount * vecRet.size());
diff --git a/scheduler/schedule.cpp b/scheduler/schedule.cpp
index aa115b4..0f7b78e 100644
--- a/scheduler/schedule.cpp
+++ b/scheduler/schedule.cpp
@@ -24,7 +24,7 @@ int SensorScheduler::StartSchedule(int short_addr, int &next_duration) {
     }
 
     current_ts_ = GetLocalTs();
-    CleanIdleOccupiedSet(current_ts_);
+    CleanIdleOccupiedSet();
 
     nth_wave_start_slice_ = (current_ts_ - start_timestamp_) / wave_form_send_interval_;
     current_wave_start_ts_ = nth_wave_start_slice_ * wave_form_send_interval_ + start_timestamp_;
@@ -167,9 +167,9 @@ long SensorScheduler::CalcNextTimestamp(int id, uint16_t short_addr) {
                     if (slice_sensor_id_[i+forward_wave_slice_num] == 0) {
                         // 判断此空闲位置是否被占用
                         long current_wave_slice_ts = current_wave_start_ts_ + nth_eigen_value_slice_ * eigen_value_send_interval_ + eigen_value_slice_total_seconds_ + i * seconds_per_wave_slice_;
-                        if (free_slice_ocuppied_.count(current_wave_slice_ts) == 0) {
+                        if (!IdleSliceOccupied(i+forward_wave_slice_num)) {
                             available_ts = current_wave_slice_ts;
-                            free_slice_ocuppied_.insert(available_ts);
+                            free_slice_ocuppied_.push_back(i+forward_wave_slice_num);
                             zlog_warn(zct, "[Nxt][%d:%x] %d nth free wave slice will be used to upgrade, utc time:[%s]", id, short_addr, i+forward_wave_slice_num, GetUTCTime(available_ts).c_str());
                             break;
                         }
@@ -641,12 +641,18 @@ void SensorScheduler::ClearScheduleCfg(int short_addr) {
     
 }
 
-void SensorScheduler::CleanIdleOccupiedSet(long ts) {
-    if (free_slice_ocuppied_.size() > 5) {
-        for (auto it = free_slice_ocuppied_.begin(); it != free_slice_ocuppied_.end();) {
-            if ((*it) < ts) {
-                it = free_slice_ocuppied_.erase(it);
-            } else ++it;
+void SensorScheduler::CleanIdleOccupiedSet() {
+	int min_num = 0;
+    while (free_slice_ocuppied_.size() > free_slice_ && free_slice_ > min_num) {
+        free_slice_ocuppied_.pop_front();
+    }    
+}
+
+bool SensorScheduler::IdleSliceOccupied(int slice_id) {
+    for (auto item : free_slice_ocuppied_) {
+        if (slice_id == item) {
+            return true;
         }
     }
-}
\ No newline at end of file
+    return false;
+}
diff --git a/scheduler/schedule.hpp b/scheduler/schedule.hpp
index f3b72ad..e9939ad 100644
--- a/scheduler/schedule.hpp
+++ b/scheduler/schedule.hpp
@@ -4,6 +4,7 @@
 #include <iostream>
 #include <map>
 #include <unordered_set>
+#include <list>
 #include <vector>
 #include <stdint.h>
 #include <boost/container/detail/singleton.hpp>
@@ -101,7 +102,8 @@ public:
 
 private:
     void UpdateUpgradeInfo(int id);
-    void CleanIdleOccupiedSet(long ts);
+    void CleanIdleOccupiedSet();
+    bool IdleSliceOccupied(int slice_id); // 索引号
 
     // user config
     int eigen_value_send_interval_;
@@ -125,7 +127,7 @@ private:
     std::map<uint16_t, int> short_addr_map_; // base_relation.json
 
     // 空闲时间戳被占用
-    std::unordered_set<long> free_slice_ocuppied_;
+    std::list<int> free_slice_ocuppied_;
 
     // sensor config update
     std::unordered_set<int> update_;
diff --git a/scheduler/upgrade_cfg.cpp b/scheduler/upgrade_cfg.cpp
index 09eb1c6..00f137a 100644
--- a/scheduler/upgrade_cfg.cpp
+++ b/scheduler/upgrade_cfg.cpp
@@ -7,12 +7,20 @@ extern zlog_category_t *zct;
 extern zlog_category_t *zbt;
 
 int UpgradeCfg::ReadCfg(std::map<int, UpgradeInfo> &upgrade) {
-    std::ifstream upgrade_file(UPGRADE_CONFIG);
+    std::ifstream upgrade_file(UPGRADE_CONFIG);    
     if (!upgrade_file.good()) {
         zlog_info(zbt, "[UpgradeCfg] no such file");
         return 0;
     }
 
+    upgrade_file.seekg(0, std::ios::end);
+    std::streampos file_size = upgrade_file.tellg();
+    if (file_size > 256000) {
+        zlog_error(zct, "upgrade file exception, will remove it");
+        ClearCfg();
+        return 1;
+    }
+    upgrade_file.seekg(0, std::ios::beg);
     Json::Reader reader;
     Json::Value root;
     if (!reader.parse(upgrade_file, root, false)) {