debug

modules/Manager/src/Manager.cpp

@@ -4,7 +4,7 @@
  * @Autor: lishengyin
  * @Date: 2022-01-11 11:47:46
  * @LastEditors: lishengyin
- * @LastEditTime: 2022-01-12 11:18:40
+ * @LastEditTime: 2022-01-12 16:47:32
  */
 #include "Manager.h"
 
@@ -64,10 +64,10 @@ namespace MIVA{
      */    
     int32_t Manager::getStartPower(){
         std::shared_ptr<Inference> Infer = Inference::CreateNew();
-        std::shared_ptr<deviceState> m_deviceState = deviceState::CreateNew();
+        // std::shared_ptr<deviceState> m_deviceState = deviceState::CreateNew();
         int result = ERR;
         if(Infer == nullptr) return result;
-        if(m_deviceState->getDeviceState() != OK) return result;
+        // if(m_deviceState->getDeviceState() != OK) return result;
         // 从内存、温度、fd、播放是否停止一起来判定是否可以启动
         if(decideMemoryResult() && decideTempResult() && decideFdResult() && decidePlayResult()) result = OK;
         return result;
@@ -95,7 +95,13 @@ namespace MIVA{
      * @return {*}
      */    
     int32_t Manager::getClearPower(){
-        return OK;
+        std::shared_ptr<Inference> Infer = Inference::CreateNew();
+        std::shared_ptr<deviceState> m_deviceState = deviceState::CreateNew();
+        int result = ERR;
+        if(Infer == nullptr) return result;
+        if(m_deviceState->getDeviceState() != OK) return result;
+        if(!decideFdResult() || !decidePlayResult()) result = OK;
+        return result;
     }
 
     /**

modules/deviceState/include/deviceState.h

@@ -4,7 +4,7 @@
  * @Autor: lishengyin
  * @Date: 2022-01-11 10:44:52
  * @LastEditors: lishengyin
- * @LastEditTime: 2022-01-12 11:02:19
+ * @LastEditTime: 2022-01-12 16:27:43
  */
 #pragma once
 
@@ -47,10 +47,10 @@ namespace MIVA
         int GpuUsage;
         int MemoryUsage;
         int CpuTemp;
-        int GpuTemp;
-        int AUXTemp;
-        int A0Temp;
-        int ThermalTemp;
+        int GpuTemp = 0;
+        int AUXTemp = 0;
+        int A0Temp = 0;
+        int ThermalTemp = 0;
         int FdUsage;
         
     public:
@@ -83,7 +83,7 @@ namespace MIVA
          * @param {*}
          * @return {*}
          */        
-        int32_t SyncFdThreshold(int sourceNum);
+        int32_t SyncFdThreshold(int sourceNum, bool outState);
     private:
         mutex m_mutex;
     };

modules/deviceState/src/deviceState.cpp

@@ -4,7 +4,7 @@
  * @Autor: lishengyin
  * @Date: 2022-01-11 10:45:05
  * @LastEditors: lishengyin
- * @LastEditTime: 2022-01-12 11:01:39
+ * @LastEditTime: 2022-01-12 17:14:50
  */
 #include "deviceState.h"
 
@@ -42,12 +42,13 @@ namespace MIVA
 
         this->CpuUsage = m_monitor->getCpuUsage();
         this->GpuUsage = m_monitor->getGpuUsage();
-        this->MemoryUsage = m_monitor->getMemoryUsage();
-        this->CpuTemp = m_monitor->getCpuTemp();
-        this->GpuTemp = m_monitor->getGpuTemp();
-        this->AUXTemp = m_monitor->getAUXTemp();
-        this->A0Temp = m_monitor->getA0Temp();
-        this->ThermalTemp = m_monitor->getThermalTemp();
+        // this->MemoryUsage = m_monitor->getMemoryUsage();
+        this->MemoryUsage = 3000;
+        // this->CpuTemp = m_monitor->getCpuTemp();
+        // this->GpuTemp = m_monitor->getGpuTemp();
+        // this->AUXTemp = m_monitor->getAUXTemp();
+        // this->A0Temp = m_monitor->getA0Temp();
+        // this->ThermalTemp = m_monitor->getThermalTemp();
         this->FdUsage = m_monitor->getFdUsage();
         
         return 0;
@@ -73,20 +74,22 @@ namespace MIVA
      * @param {*}
      * @return {*}
      */    
-    int32_t deviceState::SyncFdThreshold(int sourceNum){
+    int32_t deviceState::SyncFdThreshold(int sourceNum, bool outState){
         std::lock_guard<mutex> gurad(m_mutex);
         static int num = 0;
         static int fdMin = 3000;
-        if(num != sourceNum){
-            num = sourceNum;
-            fdMin = 3000;
-        }
-        if(this->FdUsage < fdMin) {
-            fdMin = this->FdUsage;
-            vector<vector<string>> sqlRet;
-            SqlWriter sqlUpdate("UPDATE MIVA_DB.MivaConfig SET FdThreshold='?'");
-            sqlUpdate << this->FdUsage << sqlRet;
-            return 0;
+        // if(num != sourceNum || outState){
+        //     num = sourceNum;
+        //     fdMin = 3000;
+        // }
+        if((this->FdUsage > fdMin && this->FdUsage - fdMin <= 20) || this->FdUsage < fdMin){
+            if(this->FdUsage > 0) {
+                fdMin = this->FdUsage;
+                vector<vector<string>> sqlRet;
+                SqlWriter sqlUpdate("UPDATE MIVA_DB.MivaConfig SET FdThreshold='?'");
+                sqlUpdate << this->FdUsage << sqlRet;
+                return 0;
+            }
         }
         return -1;
     }

modules/inference/include/inference.h

@@ -4,7 +4,7 @@
  * @Autor: lishengyin
  * @Date: 2021-10-13 09:37:51
  * @LastEditors: lishengyin
- * @LastEditTime: 2022-01-11 13:54:08
+ * @LastEditTime: 2022-01-13 10:12:53
  */
 #pragma once
 #include <iostream>

modules/inference/src/inference.cpp

@@ -4,7 +4,7 @@
  * @Autor: lishengyin
  * @Date: 2021-10-13 09:35:37
  * @LastEditors: lishengyin
- * @LastEditTime: 2022-01-11 15:22:21
+ * @LastEditTime: 2022-01-13 10:23:20
  */
 #include "inference.h"
 
@@ -310,23 +310,9 @@ namespace MIVA{
             return ERR;
         }
         DebugL << "StartTask" << endl;
-        GstState state;
-        GstStateChangeReturn state_return;
-        state_return = gst_element_set_state(this->pipeline, GST_STATE_PAUSED);
-        // gst_element_get_state(this->pipeline,&state,NULL, GST_CLOCK_TIME_NONE);
-        // if(state == GST_STATE_PLAYING){
-        //     state_return = gst_element_set_state(this->pipeline, GST_STATE_PAUSED);
-        //     StateResulit(state_return);
-        //     // for (iter = this->m_InferInfo->DataSources.begin(); iter != this->m_InferInfo->DataSources.end(); iter++){
-        //     //     if(iter->source_bin != NULL){
-        //     //         state_return = gst_element_set_state(iter->source_bin, GST_STATE_PLAYING);
-        //     //         StateResulit(state_return);
-        //     //     }
-        //     // }
-        // } 
-        state_return = gst_element_set_state(this->pipeline, GST_STATE_PLAYING);
-        StateResulit(state_return);
-
+        gst_element_set_state(this->pipeline, GST_STATE_PAUSED);
+        gst_element_set_state(this->pipeline, GST_STATE_PLAYING);
+    
         m_frames.clear();
         this->Play = true;
         return OK;
@@ -885,11 +871,8 @@ namespace MIVA{
         GstStateChangeReturn state_return;
         for (auto iter = this->m_InferInfo->DataSources.begin(); iter != this->m_InferInfo->DataSources.end(); iter++){
             if(iter->source_bin != NULL){
-                gst_element_get_state(iter->source_bin,&state,NULL, GST_CLOCK_TIME_NONE);
-                if(state == GST_STATE_PLAYING){
-                    state_return = gst_element_set_state(iter->source_bin, GST_STATE_NULL);
-                    StateResulit(state_return);
-                }
+                state_return = gst_element_set_state(iter->source_bin, GST_STATE_NULL);
+                // StateResulit(state_return);
             }
         }
     }

modules/monitor/src/monitor.cpp

@@ -4,7 +4,7 @@
  * @Autor: lishengyin
  * @Date: 2022-01-10 15:01:23
  * @LastEditors: lishengyin
- * @LastEditTime: 2022-01-12 09:28:25
+ * @LastEditTime: 2022-01-13 10:16:34
  */
 #include <monitor.h>
 
@@ -12,7 +12,6 @@ namespace MIVA
 {
     std::shared_ptr<monitor> m_monitor = nullptr;
     monitor::monitor(){
-
     }
     
     monitor::~monitor(){
@@ -44,8 +43,8 @@ namespace MIVA
      * @return {*}
      */    
     int32_t monitor::getMemoryUsage(){
-        this->file = fopen("/proc/meminfo","r");
         int32_t MemoryUsage = 0;
+        this->file = fopen("/proc/meminfo","r");
         char keyword[20];
         char valuech[20];
         long mem = 0;
@@ -65,7 +64,6 @@ namespace MIVA
      */    
     int32_t monitor::getCpuUsage(){
         int32_t CpuUsage = 0;
-
         return CpuUsage;
     }
 
@@ -168,7 +166,8 @@ namespace MIVA
      */    
     int32_t monitor::getFdUsage(){
         int32_t fdUsage = 0;
-        string shell = "lsof -p $(pidof main) | wc -l";
+        //string shell = "lsof -p $(pidof main) | wc -l";
+        string shell = "cat ./fd_Check";
         vector<string> results;
 
         CShell::exeShellCmd(shell, results);

modules/recorder/src/recorder.cpp

@@ -102,6 +102,7 @@ namespace MIVA
         for(auto videowriter = this->videoWriters.begin(); videowriter != this->videoWriters.end(); videowriter++){
             if(videowriter->second.videoWriter != nullptr){
                 videowriter->second.videoWriter->release();
+                videowriter->second.videoWriter.reset();
                 videowriter->second.videoWriter = nullptr;
             }
             videowriter->second.fileName = "";

modules/userApp/src/user_app.cpp

@@ -4,7 +4,7 @@
  * @Autor: lishengyin
  * @Date: 2021-10-13 09:35:42
  * @LastEditors: lishengyin
- * @LastEditTime: 2022-01-12 11:31:45
+ * @LastEditTime: 2022-01-13 10:13:53
  */
 #include "user_app.h"
 
@@ -13,6 +13,8 @@ struct timespec time1 = {0, 0};
 struct timespec time2 = {0, 0};
 struct timespec time3 = {0, 0};
 
+bool outState = false;
+
 namespace MIVA
 {  
     /**
@@ -96,7 +98,7 @@ namespace MIVA
         this->m_monitor = monitor::CreateNew();
         this->m_deviceState = deviceState::CreateNew();
         this->m_manager = Manager::CreateNew();
-
+        this->m_deviceState->getDeviceState();
         // 查询基础配置
         SqlWriter sqlSelectConfig("SELECT account,outType,outPath,outEnable,ClearType,recordMax,validTime,MemoryThreshold,TempThreshold,FdThreshold FROM MIVA_DB.`MivaConfig`");
         sqlSelectConfig << sqlRet;
@@ -198,7 +200,7 @@ namespace MIVA
                 this->ListenInferPer();
         });
         
-        InfoL << "System initialization is successful!";
+        InfoL << "System initialization is successful!" << endl;
         return OK;
     }
     
@@ -210,14 +212,18 @@ namespace MIVA
      */    
     void UserApp::Destroy()
     {
-        InfoL << "System exited successfully!";
-        this->m_timer0 = nullptr;
-        this->m_timer1 = nullptr;
-        this->m_timer2 = nullptr;
-        this->m_udpClient = nullptr;
-        this->m_tcpClient = nullptr; 
-        this->m_Infer = nullptr;
-        this->m_monitor = nullptr;
+        InfoL << "System exited successfully!" << endl;
+        this->m_Infer.reset();
+        this->m_monitor.reset();
+        this->m_timer0.reset();
+        this->m_timer1.reset();
+        this->m_timer2.reset();
+        this->m_timer3.reset();
+        this->m_timer4.reset();
+        this->m_timer5.reset();
+        this->m_timer6.reset();
+        this->m_udpClient.reset();
+        this->m_tcpClient.reset(); 
     }
     
     /**
@@ -267,6 +273,25 @@ namespace MIVA
             return true;
         },nullptr);
 
+        /**
+         * @description: 监听设备数据
+         * @param {*}
+         * @return {*}
+         */        
+        this->m_timer6 = std::make_shared<Timer>(2.0f,[&](){
+            // 设备数据
+            char ctime[80];
+            getDataTime(ctime);
+            std::string Ctime = ctime;
+            this->m_deviceState->getDeviceState();
+            this->m_deviceState->SyncDeviceState(Ctime);
+            if(this->m_manager->getSyncFdThresholdPower() == OK){
+                this->m_deviceState->SyncFdThreshold((int)this->m_InferInfo->DataSources.size(), outState); 
+            } 
+            if(this->m_manager->getClearPower() == OK && this->m_Infer->Play == false) this->m_Infer->CheckTask();
+            return true;
+        },nullptr);
+
         // 记录时间
         clock_gettime(CLOCK_BOOTTIME, &time1);
         InfoL << "Task started successfully!" << endl;
@@ -305,6 +330,7 @@ namespace MIVA
             this->ListenInferData();
             this->m_Infer->Recorder();
             this->m_Infer->StopTask();
+            outState = false;
             // 清除历史
             if(m_recorder->RecordEnable) this->m_Cleaner->ClearHistory();
         }
@@ -513,7 +539,9 @@ namespace MIVA
             {  
                 // 广播收到关门的信号
                 if(this->m_manager->getStartPower() == OK) this->ListenClosed();
-                else WarnL << "推理未结束或内存所剩不足或资源未释放完全" << endl;
+                else{
+                    WarnL << "推理未结束或内存所剩不足或资源未释放完全" << endl;
+                } 
             }
         }
     }
@@ -560,11 +588,7 @@ namespace MIVA
         char ctime[80];
         getDataTime(ctime);
         std::string Ctime = ctime;
-        // 设备数据
-        this->m_deviceState->getDeviceState();
-        this->m_deviceState->SyncDeviceState(Ctime);
-        if(this->m_manager->getSyncFdThresholdPower() == OK) this->m_deviceState->SyncFdThreshold((int)this->m_InferInfo->DataSources.size());  
-
+ 
         SqlWriter sqlSelectConfig("SELECT account,outType,outPath,outEnable,ClearType,recordMax,validTime,MemoryThreshold,TempThreshold,FdThreshold FROM MIVA_DB.`MivaConfig`");
         sqlSelectConfig << sqlRet;
         for(auto &line : sqlRet)
@@ -572,6 +596,8 @@ namespace MIVA
             this->account = line[0];
             this->m_recorder->outType = std::atoi(line[1].c_str());
             this->m_recorder->Dir = line[2];
+            if(this->m_recorder->RecordEnable != std::atoi(line[3].c_str()) ? true:false) outState = true;
+            if(this->m_Cleaner->ClearType != std::atoi(line[4].c_str())) outState = true;
             this->m_recorder->RecordEnable = std::atoi(line[3].c_str()) ? true:false;
             this->m_Cleaner->ClearType = std::atoi(line[4].c_str());
             this->m_Cleaner->recordMax = std::atoi(line[5].c_str());
@@ -702,15 +728,14 @@ namespace MIVA
         sqlUpdata << sqlRet;
         if(m_Infer->StartTask() == OK){
             this->start = true;
+            if(this->m_timer5 != nullptr) this->m_timer5.reset();
             // 超时处理
             this->m_timer5 = std::make_shared<Timer>(30.0f,[&](){
-                if(this->m_Infer->Play){
-                    this->ListenInferPer();
-                    WarnL << "推理时间过长。。。。。。。。" << endl;
+                if(this->m_manager->getClearPower() == OK){
+                    if(this->m_Infer->Play) this->ListenInferPer();
+                    this->m_Infer->CheckTask();
+                    WarnL << "此次推理时间过长" << endl;
                 }
-                this->m_Infer->CheckTask();
-                WarnL << "推理超时定时器" << endl;
-                
                 return false;
             },nullptr);
         }
@@ -808,7 +833,6 @@ namespace MIVA
     {
         uint32_t result = 0;
         
-        
         return num;
     }
 

source/bin/check_fd.sh

@@ -1,2 +1,2 @@
 #!/bin/bash
-lsof -p $(pidof main) | wc -l
+lsof -p $(pidof main) | wc -l > ./fd_Check

source/bin/checkfd.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+lsof -p $(pidof main) | wc -l