nooping interval can be defined by user

garryyan · garryyan · commit fee4ead26f10 · 2017-01-06T12:48:24.000+08:00
diff --git a/mars/libraries/mars_android_sdk/jni/longlink_packer.cc b/mars/libraries/mars_android_sdk/jni/longlink_packer.cc
@@ -126,6 +126,10 @@ uint32_t signal_keep_cmdid() {
 void longlink_noop_req_body(AutoBuffer& _body) {}
 void longlink_noop_resp_body(AutoBuffer& _body) {}
 
+uint32_t longlink_noop_interval() {
+	return 0;
+}
+
 bool longlink_complexconnect_need_verify() {  
     return false;
 }
diff --git a/mars/libraries/mars_android_sdk/jni/longlink_packer.cc.rewriteme b/mars/libraries/mars_android_sdk/jni/longlink_packer.cc.rewriteme
@@ -126,6 +126,10 @@ uint32_t signal_keep_cmdid() {
 void longlink_noop_req_body(AutoBuffer& _body) {}
 void longlink_noop_resp_body(AutoBuffer& _body) {}
 
+uint32_t longlink_noop_interval() {
+	return 0;
+}
+
 bool longlink_complexconnect_need_verify() {  
     return false;
 }
diff --git a/mars/libraries/mars_android_sdk/jni/longlink_packer.h b/mars/libraries/mars_android_sdk/jni/longlink_packer.h
@@ -43,6 +43,8 @@ uint32_t signal_keep_cmdid();
 void longlink_noop_req_body(AutoBuffer& _body);
 void longlink_noop_resp_body(AutoBuffer& _body);
 
+uint32_t longlink_noop_interval();
+
 bool longlink_complexconnect_need_verify();
 bool is_push_data(uint32_t _cmdid, uint32_t _taskid);
 
diff --git a/mars/stn/proto/longlink_packer.cc b/mars/stn/proto/longlink_packer.cc
@@ -126,6 +126,10 @@ uint32_t signal_keep_cmdid() {
 void longlink_noop_req_body(AutoBuffer& _body) {}
 void longlink_noop_resp_body(AutoBuffer& _body) {}
 
+uint32_t longlink_noop_interval() {
+	return 0;
+}
+
 bool longlink_complexconnect_need_verify() {  
     return false;
 }
diff --git a/mars/stn/proto/longlink_packer.h b/mars/stn/proto/longlink_packer.h
@@ -43,6 +43,8 @@ uint32_t signal_keep_cmdid();
 void longlink_noop_req_body(AutoBuffer& _body);
 void longlink_noop_resp_body(AutoBuffer& _body);
 
+uint32_t longlink_noop_interval();
+
 bool longlink_complexconnect_need_verify();
 bool is_push_data(uint32_t _cmdid, uint32_t _taskid);
 
diff --git a/mars/stn/src/longlink.cc b/mars/stn/src/longlink.cc
@@ -772,6 +772,10 @@ void LongLink::__RunReadWrite(SOCKET _sock, ErrCmdType& _errtype, int& _errcode,
 }
 
 void LongLink::__NotifySmartHeartbeatHeartReq(ConnectProfile& _profile, uint64_t _internal, uint64_t _actual_internal) {
+    if (longlink_noop_interval() > 0) {
+        return;
+    }
+    
     if (!smartheartbeat_) return;
     
 	NoopProfile noop_profile;
@@ -784,6 +788,10 @@ void LongLink::__NotifySmartHeartbeatHeartReq(ConnectProfile& _profile, uint64_t
 }
 
 void LongLink::__NotifySmartHeartbeatHeartResult(bool _succes, bool _fail_of_timeout, ConnectProfile& _profile) {
+    if (longlink_noop_interval() > 0) {
+        return;
+    }
+    
     if (!smartheartbeat_) return;
     
 	if (!_profile.noop_profiles.empty()) {
@@ -796,11 +804,19 @@ void LongLink::__NotifySmartHeartbeatHeartResult(bool _succes, bool _fail_of_tim
 }
 
 void LongLink::__NotifySmartHeartbeatJudgeMIUIStyle() {
+    if (longlink_noop_interval() > 0) {
+        return;
+    }
+    
     if (!smartheartbeat_) return;
 	smartheartbeat_->JudgeMIUIStyle();
 }
 
 void LongLink::__NotifySmartHeartbeatConnectStatus(TLongLinkStatus _status) {
+    if (longlink_noop_interval() > 0) {
+        return;
+    }
+    
     if (!smartheartbeat_) return;
 
     switch (_status) {
@@ -819,6 +835,11 @@ void LongLink::__NotifySmartHeartbeatConnectStatus(TLongLinkStatus _status) {
 }
 
 unsigned int LongLink::__GetNextHeartbeatInterval() {
+    
+    if (longlink_noop_interval() > 0) {
+        return longlink_noop_interval();
+    }
+    
     if (!smartheartbeat_) return MinHeartInterval;
     
     bool use_smartheart_beat  = false;
diff --git a/mars/stn/src/longlink_task_manager.cc b/mars/stn/src/longlink_task_manager.cc
@@ -502,6 +502,7 @@ void LongLinkTaskManager::__OnResponse(ErrCmdType _error_type, int _error_code,
     
     
     if (kEctOK != _error_type) {
+        xwarn2(TSF"task error, taskid:%_, cmdid:%_, error_type:%_, error_code:%_", _taskid, _cmdid, _error_type, _error_code);
         __BatchErrorRespHandle(_error_type, _error_code, kTaskFailHandleDefault, 0, _connect_profile);
         return;
     }
@@ -543,6 +544,7 @@ void LongLinkTaskManager::__OnResponse(ErrCmdType _error_type, int _error_code,
             break;
         case kTaskFailHandleTaskEnd:
         {
+            xwarn2(TSF"task decode error taskid:%_, cmdid:%_, handle_type:%_", it->task.taskid, it->task.cmdid, handle_type);
             __SingleRespHandle(it, kEctEnDecode, err_code, handle_type, _connect_profile);
         }
             break;
diff --git a/samples/Mac/PublicComponentV2/longlink_packer.cc b/samples/Mac/PublicComponentV2/longlink_packer.cc
@@ -126,6 +126,10 @@ uint32_t signal_keep_cmdid() {
 void longlink_noop_req_body(AutoBuffer& _body) {}
 void longlink_noop_resp_body(AutoBuffer& _body) {}
 
+uint32_t longlink_noop_interval() {
+	return 0;
+}
+
 bool longlink_complexconnect_need_verify() {  
     return false;
 }
diff --git a/samples/Mac/PublicComponentV2/longlink_packer.h b/samples/Mac/PublicComponentV2/longlink_packer.h
@@ -43,6 +43,8 @@ uint32_t signal_keep_cmdid();
 void longlink_noop_req_body(AutoBuffer& _body);
 void longlink_noop_resp_body(AutoBuffer& _body);
 
+uint32_t longlink_noop_interval();
+
 bool longlink_complexconnect_need_verify();
 bool is_push_data(uint32_t _cmdid, uint32_t _taskid);
 
diff --git a/samples/iOS/iOSDemo/PublicComponentV2/longlink_packer.cc b/samples/iOS/iOSDemo/PublicComponentV2/longlink_packer.cc
@@ -126,6 +126,10 @@ uint32_t signal_keep_cmdid() {
 void longlink_noop_req_body(AutoBuffer& _body) {}
 void longlink_noop_resp_body(AutoBuffer& _body) {}
 
+uint32_t longlink_noop_interval() {
+	return 0;
+}
+
 bool longlink_complexconnect_need_verify() {  
     return false;
 }
diff --git a/samples/iOS/iOSDemo/PublicComponentV2/longlink_packer.h b/samples/iOS/iOSDemo/PublicComponentV2/longlink_packer.h
@@ -43,6 +43,8 @@ uint32_t signal_keep_cmdid();
 void longlink_noop_req_body(AutoBuffer& _body);
 void longlink_noop_resp_body(AutoBuffer& _body);
 
+uint32_t longlink_noop_interval();
+
 bool longlink_complexconnect_need_verify();
 bool is_push_data(uint32_t _cmdid, uint32_t _taskid);
 

Original file line number	Diff line number	Diff line change
`@@ -502,6 +502,7 @@ void LongLinkTaskManager::__OnResponse(ErrCmdType _error_type, int _error_code,`
`502`	`502`
`503`	`503`
`504`	`504`	`if (kEctOK != _error_type) {`
	`505`	`+ xwarn2(TSF"task error, taskid:%_, cmdid:%_, error_type:%_, error_code:%_", _taskid, _cmdid, _error_type, _error_code);`
`505`	`506`	`__BatchErrorRespHandle(_error_type, _error_code, kTaskFailHandleDefault, 0, _connect_profile);`
`506`	`507`	`return;`
`507`	`508`	`}`
`@@ -543,6 +544,7 @@ void LongLinkTaskManager::__OnResponse(ErrCmdType _error_type, int _error_code,`
`543`	`544`	`break;`
`544`	`545`	`case kTaskFailHandleTaskEnd:`
`545`	`546`	`{`
	`547`	`+ xwarn2(TSF"task decode error taskid:%_, cmdid:%_, handle_type:%_", it->task.taskid, it->task.cmdid, handle_type);`
`546`	`548`	`__SingleRespHandle(it, kEctEnDecode, err_code, handle_type, _connect_profile);`
`547`	`549`	`}`
`548`	`550`	`break;`