big refacting of communitation architect

opencv-motion-detect/evdaemon.cpp

@@ -55,7 +55,16 @@ class EvDaemon{
     /// tracking sub-systems: evmgr, evpuller, evpusher, evml*, evslicer etc.
     json mapSubSystems;
 
-    int reloadCfg() {
+    int reloadCfg(string subModGid) {
+        int bootType = 0;
+        if(subModGid == "ALL") {
+            bootType = 1;
+        }else if(subModGid.empty()){
+            bootType = 2;
+        }else{
+            bootType = 3;
+        }
+
         int ret = LVDB::getSn(this->info);
         if(ret < 0) {
             spdlog::error("evdaemon {} failed to get info", this->devSn);
@@ -92,7 +101,7 @@ class EvDaemon{
                     this->peerData["config"][peerId] = v;
                     if(this->peerData["status"].count(peerId) == 0||this->peerData["status"][peerId] == 0) {
                         this->peerData["status"][peerId] = 0;
-                        if(bBootstrap) {
+                        if(bootType == 1 || (bootType == 3 && subModGid == peerId)) {
                             ret = zmqhelper::forkSubsystem(devSn, peerId, portRouter, pid);
                             if(ret != 0) {
                                 spdlog::error("evdaemon {} failed to fork subsystem: {}", devSn, peerId);
@@ -108,7 +117,6 @@ class EvDaemon{
                 }
 
                 // startup other submodules
-
                 json &ipcs = v["ipcs"];
                 for(auto &ipc : ipcs) {
                     json &modules = ipc["modules"];
@@ -130,7 +138,7 @@ class EvDaemon{
 
                                 if(this->peerData["status"].count(peerId) == 0||this->peerData["status"][peerId] == 0) {
                                     this->peerData["status"][peerId] = 0;
-                                    if(bBootstrap) {
+                                    if(bootType == 1 || (bootType == 3 && subModGid == peerId)){
                                         ret = zmqhelper::forkSubsystem(devSn, peerId, portRouter, pid);
                                         if(ret != 0) {
                                             spdlog::error("evdaemon {} failed to fork subsystem: {}", devSn, peerId);
@@ -182,7 +190,13 @@ class EvDaemon{
             while(true) {
                 if(this->bReload) {
                     cleanupSubSystems();
-                    int ret = reloadCfg();
+                    int ret;
+                    if(bBootstrap){
+                        ret = reloadCfg("ALL");
+                    }else{
+                        ret = reloadCfg("");
+                    }
+
                     if(ret != 0) {
                         cleanupSubSystems();
                     }else{
@@ -197,7 +211,7 @@ class EvDaemon{
         thMon.detach();
     }
 
-    int startSubModule(string peerId){
+    int startSubModule(string peerId) {
         int ret = 0;
         if(peerData["status"].count(peerId) == 0 || peerData["status"][peerId] == 0) {
             //
@@ -238,8 +252,7 @@ class EvDaemon{
             return -1;
         }
 
-        return 0;
-        
+        return 0;   
     }
 
     int handleMsg(vector<vector<uint8_t> > &body)
@@ -275,15 +288,19 @@ class EvDaemon{
                 if(peerData["pids"].count(selfId) != 0) {
                     peerData["pids"].erase(selfId);
                 }
-                // if(peerData["config"].count(selfId) != 0) {
-                //     peerData["config"].erase(selfId);
-                // }
-                
+
                 spdlog::warn("evdaemon {} peer disconnected: {}", devSn, selfId);
-                // restart this module
-                if(bBootstrap) {
-                    startSubModule(selfId);
-                }                
+
+                if(bBootstrap){
+                    ret = reloadCfg(selfId);
+                }else{
+                    ret = reloadCfg("");
+                }
+                
+                if(ret != 0) {
+                    cleanupSubSystems();
+                }
+                       
             }
 
             if(ret < 0) {

opencv-motion-detect/evmlmotion.cpp

@@ -179,6 +179,8 @@ private:
                 detPara.entropy = evmlmotion["entropy"];
             }
 
+            spdlog::info("evmlmotion {} detection params: entropy {}, area {}, thresh {}", selfId, detPara.entropy, detPara.area, detPara.thre);
+
             // setup sub
             pSubCtx = zmq_ctx_new();
             pSub = zmq_socket(pSubCtx, ZMQ_SUB);
@@ -411,22 +413,23 @@ private:
             first = false;
             return;
         }
+
 #ifdef DEBUG
         matShow3 = gray.clone();
         matShow2 = origin;
 #endif
+
         evtStartTm = chrono::system_clock::now();
         // TODO: AVG
         // cv::accumulateWeighted(gray, avg, 0.5);
         cv::absdiff(gray, avg, thresh);
-#ifdef DEBUG
         avg = gray.clone();
-#endif
+        
+
         if(!detect || fent < detPara.entropy){
             return;
         }
 
-        // TODO:
         cv::threshold(thresh, gray, detPara.thre, 255, cv::THRESH_BINARY);
         cv::dilate(gray, thresh, cv::Mat(), cv::Point(-1,-1), 2);
 
@@ -445,14 +448,16 @@ private:
             else {
                 hasEvent = true;
                 evtCnt++;
+
 #ifdef DEBUG
                 cv::putText(origin, "motion detected", cv::Point(10, 20), cv::FONT_HERSHEY_SIMPLEX, 0.75, cv::Scalar(0,0,255),2);
 #endif
+
                 break;
             }
         } //end for
 
-        spdlog::info("evmlmotion {} contours {} size {} hasEvent {}", selfId, cnts.size(), cv::contourArea(cnts[i]), hasEvent);
+        spdlog::info("evmlmotion {} contours {} area {}, thresh {} hasEvent {}", selfId, cnts.size(), cnts.size() == 0? 0:cv::contourArea(cnts[i]), detPara.area, hasEvent);
 
         // business logic for event
         auto dura = chrono::duration_cast<chrono::seconds>(evtStartTm - evtStartTmLast).count();