files ring

opencv-motion-detect/evmgr.cpp

@@ -122,7 +122,7 @@ private:
             //ZMQ_TCP_KEEPALIVE_INTVL
             ret = 1;
             zmq_setsockopt(pRouter, ZMQ_TCP_KEEPALIVE, &ret, sizeof (ret));
-            ret = 20;
+            ret = 5;
             zmq_setsockopt(pRouter, ZMQ_TCP_KEEPALIVE_IDLE, &ret, sizeof (ret));
             zmq_setsockopt(pRouter, ZMQ_TCP_KEEPALIVE_INTVL, &ret, sizeof (ret));
             zmq_setsockopt (pRouter, ZMQ_ROUTER_NOTIFY, &opt_notify, sizeof (opt_notify));

opencv-motion-detect/evmlmotion.cpp

@@ -323,7 +323,7 @@ private:
             //ZMQ_TCP_KEEPALIVE_INTVL
             ret = 1;
             zmq_setsockopt(pDealer, ZMQ_TCP_KEEPALIVE, &ret, sizeof (ret));
-            ret = 20;
+            ret = 5;
             zmq_setsockopt(pDealer, ZMQ_TCP_KEEPALIVE_IDLE, &ret, sizeof (ret));
             zmq_setsockopt(pDealer, ZMQ_TCP_KEEPALIVE_INTVL, &ret, sizeof (ret));
             ret = zmq_setsockopt(pDealer, ZMQ_IDENTITY, selfId.c_str(), selfId.size());

opencv-motion-detect/evpuller.cpp

@@ -266,7 +266,7 @@ private:
             //ZMQ_TCP_KEEPALIVE_INTVL
             ret = 1;
             zmq_setsockopt(pDealer, ZMQ_TCP_KEEPALIVE, &ret, sizeof (ret));
-            ret = 20;
+            ret = 5;
             zmq_setsockopt(pDealer, ZMQ_TCP_KEEPALIVE_IDLE, &ret, sizeof (ret));
             zmq_setsockopt(pDealer, ZMQ_TCP_KEEPALIVE_INTVL, &ret, sizeof (ret));
             ret = zmq_setsockopt(pDealer, ZMQ_IDENTITY, selfId.c_str(), selfId.size());

opencv-motion-detect/evpusher.cpp

@@ -119,7 +119,7 @@ private:
             //ZMQ_TCP_KEEPALIVE_INTVL
             ret = 1;
             zmq_setsockopt(pSub, ZMQ_TCP_KEEPALIVE, &ret, sizeof (ret));
-            ret = 20;
+            ret = 5;
             zmq_setsockopt(pSub, ZMQ_TCP_KEEPALIVE_IDLE, &ret, sizeof (ret));
             zmq_setsockopt(pSub, ZMQ_TCP_KEEPALIVE_INTVL, &ret, sizeof (ret));
             ret = zmq_setsockopt(pSub, ZMQ_SUBSCRIBE, "", 0);
@@ -141,7 +141,7 @@ private:
             //ZMQ_TCP_KEEPALIVE_INTVL
             ret = 1;
             zmq_setsockopt(pDealer, ZMQ_TCP_KEEPALIVE, &ret, sizeof (ret));
-            ret = 20;
+            ret = 5;
             zmq_setsockopt(pDealer, ZMQ_TCP_KEEPALIVE_IDLE, &ret, sizeof (ret));
             zmq_setsockopt(pDealer, ZMQ_TCP_KEEPALIVE_INTVL, &ret, sizeof (ret));
             ret = zmq_setsockopt(pDealer, ZMQ_IDENTITY, selfId.c_str(), selfId.size());

opencv-motion-detect/inc/zmqhelper.cpp

@@ -102,7 +102,7 @@ int setupRouter(void **ctx, void **s, string addr){
     //ZMQ_TCP_KEEPALIVE_INTVL
     ret = 1;
     zmq_setsockopt(*s, ZMQ_TCP_KEEPALIVE, &ret, sizeof (ret));
-    ret = 20;
+    ret = 5;
     zmq_setsockopt(*s, ZMQ_TCP_KEEPALIVE_IDLE, &ret, sizeof (ret));
     zmq_setsockopt(*s, ZMQ_TCP_KEEPALIVE_INTVL, &ret, sizeof (ret));
     zmq_setsockopt(*s, ZMQ_ROUTER_NOTIFY, &opt_notify, sizeof (opt_notify));
@@ -119,6 +119,11 @@ int setupDealer(void **ctx, void **s, string addr, string ident) {
     int ret = 0;
     *ctx = zmq_ctx_new();
     *s = zmq_socket(*ctx, ZMQ_DEALER);
+    ret = 1;
+    zmq_setsockopt(*s, ZMQ_TCP_KEEPALIVE, &ret, sizeof (ret));
+    ret = 5;
+    zmq_setsockopt(*s, ZMQ_TCP_KEEPALIVE_IDLE, &ret, sizeof (ret));
+    zmq_setsockopt(*s, ZMQ_TCP_KEEPALIVE_INTVL, &ret, sizeof (ret));
     ret = zmq_setsockopt(*s, ZMQ_IDENTITY, ident.c_str(), ident.size());
     ret += zmq_setsockopt (*s, ZMQ_ROUTING_ID, ident.c_str(), ident.size());
     if(ret < 0) {

opencv-motion-detect/test_rlist.cpp

@@ -14,7 +14,6 @@ void insertTsList(set<long> &_list, long elem, int maxSize) {
     }
 
     auto itr = _list.rbegin();
-
     for(; itr != _list.rend(); itr++) {
         if(*itr < elem){
             break;