refactor of delta config

opencv-motion-detect/evdaemon.cpp

@@ -37,7 +37,7 @@ class EvDaemon {
 private:
     Server svr;
     json config;
-    json lastConfig;
+    json oldConfig;
     json deltaCfg;
     json info;
     int port = 8088;
@@ -185,50 +185,48 @@ private:
     {
         int ret = 0;
         std::lock_guard<std::mutex> lock(mutSubsystem);
-        vector<string> tmp;
-        json unkown;
-        vector<string> terms;
-        int cnt = 0;
-        string info;
-
-        for(auto &[k,v]: this->peerData["config"].items()) {
-            if(this->peerData["enabled"].count(k) != 0 && this->peerData["enabled"][k] != 0) {
-                if((this->peerData["status"].count(k) == 0 || this->peerData["status"][k] == 0)) {
-                    tmp.push_back(k);
-                    info += (cnt == 0? "" : string(", ")) + k;
-                }
-                else if(this->peerData["status"][k] == -1) {
-                    unkown[k] = -1;
-                }
-            }
-            else {
-                terms.push_back(k);
-            }
-            cnt++;
-        }
-
         if(subs.size() != 0) {
             for(auto &k: subs) {
-                pid_t pid = 0;
-                if(std::find(terms.begin(), terms.end(), k) != terms.end()) {
-                    // ignore
-                    spdlog::warn("evdaemon {} skip startup {} since it's disabled.", this->devSn, k);
-                }else{
+                if((this->peerData["status"].count(k) == 0 || this->peerData["status"][k] == 0) && this->peerData["config"].count(k) != 0 &&  this->peerData["enabled"].count(k) != 0 && this->peerData["enabled"][k] != 0){
+                    pid_t pid;
                     ret = zmqhelper::forkSubsystem(devSn, k, portRouter, pid);
                     if(0 == ret) {
                         this->peerData["status"][k] = 0;
                         this->peerData["pids"][k] = pid;
-                        spdlog::info("evdaemon {} created subsystem {}", devSn, k);
+                        spdlog::info("evdaemon {} created subsystem {}", this->devSn, k);
                     }
                     else {
-                        spdlog::info("evdaemon {} failed to create subsystem {}", devSn, k);
+                        spdlog::info("evdaemon {} failed to create subsystem {}", this->devSn, k);
                     }
-                }    
+                }else{
+                    spdlog::warn("evdaemon {} refuse to start subsystem {}, maybe it's disabled", this->devSn, k);
+                }
             }
         }else{
-            // cold startup, ignore diff.
             if(this->bColdStart) {
+                vector<string> tmp;
+                json unkown;
+                vector<string> terms;
+                string info;
+                int cnt = 0;
+                for(auto &[k,v]: this->peerData["config"].items()) {
+                    if(this->peerData["enabled"].count(k) != 0 && this->peerData["enabled"][k] != 0) {
+                        if((this->peerData["status"].count(k) == 0 || this->peerData["status"][k] == 0)) {
+                            tmp.push_back(k);
+                            info += (cnt == 0? "" : string(", ")) + k;
+                        }
+                        else if(this->peerData["status"][k] == -1) {
+                            unkown[k] = -1;
+                        }
+                    }
+                    else {
+                        terms.push_back(k);
+                    }
+                    cnt++;
+                }
+
                 spdlog::info("evdaemon {} will start following subsystems: {}", devSn, info);
+                //
                 for(string &e : tmp) {
                     pid_t pid = 0;
                     ret = zmqhelper::forkSubsystem(devSn, e, portRouter, pid);
@@ -242,6 +240,12 @@ private:
                     }
                 }
 
+                for(string &e: terms) {
+                    if(this->peerData["pids"].count(e) != 0) {
+                        kill(this->peerData["pids"][e], SIGTERM);
+                    }
+                }
+
                 while(unkown.size() != 0 && cnt < 3) {
                     this_thread::sleep_for(chrono::seconds(3));
                     for(auto &[k,v]: unkown.items()) {
@@ -253,15 +257,6 @@ private:
                     cnt++;
                 }
 
-                for(string &e: terms) {
-                    // if(this->peerData["pids"].count(e) != 0) {
-                    //     kill(this->peerData["pids"][e], SIGTERM);
-                    // }
-                    if(this->peerData["pids"].count(e) != 0 && this->peerData["pids"].count(e) != -1) {
-
-                    }
-                }
-
                 for(auto &[k,v]: unkown.items()) {
                     pid_t pid = 0;
                     ret = zmqhelper::forkSubsystem(devSn, k, portRouter, pid);
@@ -273,25 +268,31 @@ private:
                     else {
                         spdlog::info("evdaemon {} failed to create subsystem {}", devSn, k);
                     }
-                } 
+                }
+                this->bColdStart = false;
             }else{
-                // TODO: load delta config
-                json mods;
-                set<int> ipcs;
+                // calc diff
+                auto mods = cfgutils::getModulesOperFromConfDiff(this->oldConfig, this->config, this->deltaCfg, this->devSn);
+                this->deltaCfg = json();
+                for(auto &[k,v]: mods.items()) {
+                    if(v == 0) {
+                        // send stop msg
+                    }
+                }
             }
-                
         }
-        this->bColdStart = false;
-        this->deltaCfg = json();
         return ret;
     }
     
-    void sendMsgToPeer(string peerId, string meta, string msg) {
+    void sendCmd2Peer(string peerId, string cmdVal, string msg) {
+        json meta;
+        meta["type"] = EV_MSG_META_TYPE_CMD;
+        meta["value"] = cmdVal;
         int ret = z_send(pDealer, this->daemonId, peerId, meta, msg);
         if(ret < 0) {
-            spdlog::error("evcloudsvc {} failed to send msg to peer {}: {} - {}", devSn, peerId, meta, msg);
+            spdlog::error("evcloudsvc {} failed to send msg to peer {}: {} - {}", devSn, peerId, meta.dump(), msg);
         }else{
-            spdlog::info("evcloudsvc {} successfully send msg to peer {}: {} - {}", devSn, peerId, meta, msg);
+            spdlog::info("evcloudsvc {} successfully send msg to peer {}: {} - {}", devSn, peerId, meta.dump(), msg);
         }
     }
 
@@ -469,7 +470,7 @@ private:
                             this->deltaCfg = json::diff(this->config, data);
                             spdlog::info("evdaemon {} received cloud config diff: {}\nnew: {}", devSn, this->deltaCfg.dump(4), data.dump());
                             if(this->deltaCfg.size() != 0 || this->bColdStart) {
-                                this->lastConfig = this->config;
+                                this->oldConfig = this->config;
                                 this->config = data;
                                 spdlog::info("evdaemon {} reloading config from cloud", devSn);
                                 ret = reloadCfg();

opencv-motion-detect/inc/zmqhelper.cpp

@@ -85,10 +85,8 @@ int z_send_multiple(void *s, vector<vector<uint8_t> >&body)
     return ret;
 }
 
-int z_send(void *s, string peerId, string selfId, string sMeta, string body)
+int z_send(void *s, string peerId, string selfId, const json &meta, string body)
 {
-    json meta;
-    meta["type"] = sMeta;
     vector<vector<uint8_t> > v{str2body(peerId), str2body(selfId), str2body(meta.dump()), str2body(body)};
     return z_send_multiple(s, v);
 }

opencv-motion-detect/inc/zmqhelper.hpp

@@ -27,15 +27,18 @@ namespace zmqhelper {
 #define EV_MSG_META_PING "ping"
 #define EV_MSG_META_PONG "pong"
 #define EV_MSG_META_EVENT "event"
-#define EV_MSG_META_CMD "cmd"
+
+#define EV_MSG_META_TYPE_CMD "cmd"
+#define EV_MSG_META_VALUE_CMD_RESTART "restart"
+#define EV_MSG_META_VALUE_CMD_UPDATE "update"
+#define EV_MSG_META_VALUE_CMD_STOP "stop"
+
 #define EV_MSG_META_CONFIG "config"
 #define EV_MSG_META_AVFORMATCTX "afctx"
 
 #define EV_MSG_TYPE_AI_MOTION "ai_motion"
 #define EV_MSG_TYPE_CONN_STAT "connstat"
 #define EV_MSG_TYPE_SYS_STAT "sysstat"
-#define EV_MSG_CMD_RESTART "restart"
-// #define EV_MSG_CMD_UPDATE "update"
 
 #define EV_MSG_EVENT_MOTION_START "start"
 #define EV_MSG_EVENT_MOTION_END "end"
@@ -63,7 +66,7 @@ int setupDealer(void **ctx, void **s, string addr, string ident);
 /// @return 0 success, otherwise failed.
 int recvConfigMsg(void *s, json &config, string addr, string ident);
 int forkSubsystem(string devSn, string peerId, int drPort, pid_t &pid);
-int z_send(void *s, string peerId, string selfId, string sMeta, string body);
+int z_send(void *s, string peerId, string selfId, const json &meta, string body);
 }
 
 #endif
\ No newline at end of file