evmlmotion: delta packet ts

opencv-motion-detect/evmlmotion.cpp

@@ -852,6 +852,8 @@ public:
     ~EvMLMotion()
     {
         if(pSub != nullptr) {
+            int i = 0;
+            zmq_setsockopt(pSub, ZMQ_LINGER, &i, sizeof(i));
             zmq_close(pSub);
             pSub = nullptr;
         }
@@ -860,13 +862,27 @@ public:
             pSubCtx = nullptr;
         }
         if(pDealer != nullptr) {
-            zmq_close(pSub);
+            int i = 0;
+            zmq_setsockopt(pDealer, ZMQ_LINGER, &i, sizeof(i));
+            zmq_close(pDealer);
             pDealer = nullptr;
         }
         if(pDealerCtx != nullptr) {
             zmq_ctx_destroy(pSub);
             pDealerCtx = nullptr;
         }
+
+        if(pDaemon != nullptr) {
+            int i = 0;
+            zmq_setsockopt(pDaemon, ZMQ_LINGER, &i, sizeof(i));
+            zmq_close(pDaemon);
+            pDaemon = nullptr;
+        }
+        
+        if(pDaemonCtx != nullptr) {
+            zmq_ctx_destroy(pDaemonCtx);
+            pDaemonCtx = nullptr;
+        }
     };
 };
 

opencv-motion-detect/evpuller.cpp

@@ -502,6 +502,8 @@ public:
     ~EvPuller()
     {
         if(pPub != nullptr) {
+            int i = 0;
+            zmq_setsockopt(pPub, ZMQ_LINGER, &i, sizeof(i));
             zmq_close(pPub);
             pPub = nullptr;
         }
@@ -510,13 +512,27 @@ public:
             pPubCtx = nullptr;
         }
         if(pDealer != nullptr) {
+            int i = 0;
+            zmq_setsockopt(pDealer, ZMQ_LINGER, &i, sizeof(i));
             zmq_close(pDealer);
             pDealer= nullptr;
         }
         if(pDealerCtx != nullptr) {
-            zmq_ctx_destroy(pPubCtx);
+            zmq_ctx_destroy(pDealerCtx);
             pDealerCtx = nullptr;
         }
+
+        if(pDaemon != nullptr) {
+            int i = 0;
+            zmq_setsockopt(pDaemon, ZMQ_LINGER, &i, sizeof(i));
+            zmq_close(pDaemon);
+            pDaemon = nullptr;
+        }
+        
+        if(pDaemonCtx != nullptr) {
+            zmq_ctx_destroy(pDaemonCtx);
+            pDaemonCtx = nullptr;
+        }
     }
 };
 

opencv-motion-detect/evpusher.cpp

@@ -562,6 +562,8 @@ public:
     ~EvPusher()
     {
         if(pSub != nullptr) {
+            int i = 0;
+            zmq_setsockopt(pSub, ZMQ_LINGER, &i, sizeof(i));
             zmq_close(pSub);
             pSub = nullptr;
         }
@@ -570,14 +572,29 @@ public:
             pSubCtx = nullptr;
         }
         if(pDealer != nullptr) {
-            zmq_close(pSub);
+            int i = 0;
+            zmq_setsockopt(pDealer, ZMQ_LINGER, &i, sizeof(i));
+            zmq_close(pDealer);
             pDealer = nullptr;
         }
         if(pDealerCtx != nullptr) {
-            zmq_ctx_destroy(pSub);
+            zmq_ctx_destroy(pDealerCtx);
             pDealerCtx = nullptr;
         }
 
+        if(pDaemon != nullptr) {
+            int i = 0;
+            zmq_setsockopt(pDaemon, ZMQ_LINGER, &i, sizeof(i));
+            zmq_close(pDaemon);
+            pDaemon = nullptr;
+        }
+        
+        if(pDaemonCtx != nullptr) {
+            zmq_ctx_destroy(pDaemonCtx);
+            pDaemonCtx = nullptr;
+        }
+        
+
         freeStream();
     }
 };

opencv-motion-detect/evslicer.cpp

@@ -1104,6 +1104,8 @@ public:
     ~EvSlicer()
     {
         if(pSub != nullptr) {
+            int i = 0;
+            zmq_setsockopt(pSub, ZMQ_LINGER, &i, sizeof(i));
             zmq_close(pSub);
             pSub = nullptr;
         }
@@ -1111,14 +1113,29 @@ public:
             zmq_ctx_destroy(pSubCtx);
             pSubCtx = nullptr;
         }
+
         if(pDealer != nullptr) {
-            zmq_close(pSub);
+            int i = 0;
+            zmq_setsockopt(pDealer, ZMQ_LINGER, &i, sizeof(i));
+            zmq_close(pDealer);
             pDealer = nullptr;
         }
         if(pDealerCtx != nullptr) {
-            zmq_ctx_destroy(pSub);
+            zmq_ctx_destroy(pDealerCtx);
             pDealerCtx = nullptr;
         }
+
+        if(pDaemon != nullptr) {
+            int i = 0;
+            zmq_setsockopt(pDaemon, ZMQ_LINGER, &i, sizeof(i));
+            zmq_close(pDaemon);
+            pDaemon = nullptr;
+        }
+        if(pDaemonCtx != nullptr) {
+            zmq_ctx_destroy(pDaemonCtx);
+            pDaemonCtx = nullptr;
+        }
+
         freeStream();
     };
 };