Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 7d78144

Browse files
garryyangarryyan
committed
add is_push_data
1 parent bae24bc commit 7d78144

File tree

9 files changed

+90
-28
lines changed

9 files changed

+90
-28
lines changed

‎mars/libraries/mars_android_sdk/jni/longlink_packer.cc

Lines changed: 23 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -105,15 +105,31 @@ int longlink_unpack(const AutoBuffer& _packed, uint32_t& _cmdid, uint32_t& _seq,
105105
return ret;
106106
}
107107

108-
/**
109-
* nooping param
110-
*/
108+
111109
#define NOOP_CMDID 6
112110
#define SIGNALKEEP_CMDID 243
113-
uint32_t longlink_noop_cmdid() {return NOOP_CMDID;}
114-
uint32_t longlink_noop_resp_cmdid() {return NOOP_CMDID;}
115-
uint32_t signal_keep_cmdid() {return SIGNALKEEP_CMDID;}
111+
#define PUSH_DATA_TASKID 0
112+
113+
uint32_t longlink_noop_cmdid() {
114+
return NOOP_CMDID;
115+
}
116+
117+
118+
uint32_t longlink_noop_resp_cmdid() {
119+
return NOOP_CMDID;
120+
}
121+
122+
uint32_t signal_keep_cmdid() {
123+
return SIGNALKEEP_CMDID;
124+
}
125+
116126
void longlink_noop_req_body(AutoBuffer& _body) {}
117127
void longlink_noop_resp_body(AutoBuffer& _body) {}
118128

119-
bool longlink_complexconnect_need_verify() { return false; }
129+
bool longlink_complexconnect_need_verify() {
130+
return false;
131+
}
132+
133+
bool is_push_data(uint32_t _cmdid, uint32_t _taskid) {
134+
return PUSH_DATA_TASKID == _taskid;
135+
}

‎mars/libraries/mars_android_sdk/jni/longlink_packer.cc.rewriteme

Lines changed: 23 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -105,15 +105,31 @@ int longlink_unpack(const AutoBuffer& _packed, uint32_t& _cmdid, uint32_t& _seq,
105105
return ret;
106106
}
107107

108-
/**
109-
* nooping param
110-
*/
108+
111109
#define NOOP_CMDID 6
112110
#define SIGNALKEEP_CMDID 243
113-
uint32_t longlink_noop_cmdid() {return NOOP_CMDID;}
114-
uint32_t longlink_noop_resp_cmdid() {return NOOP_CMDID;}
115-
uint32_t signal_keep_cmdid() {return SIGNALKEEP_CMDID;}
111+
#define PUSH_DATA_TASKID 0
112+
113+
uint32_t longlink_noop_cmdid() {
114+
return NOOP_CMDID;
115+
}
116+
117+
118+
uint32_t longlink_noop_resp_cmdid() {
119+
return NOOP_CMDID;
120+
}
121+
122+
uint32_t signal_keep_cmdid() {
123+
return SIGNALKEEP_CMDID;
124+
}
125+
116126
void longlink_noop_req_body(AutoBuffer& _body) {}
117127
void longlink_noop_resp_body(AutoBuffer& _body) {}
118128

119-
bool longlink_complexconnect_need_verify() { return false; }
129+
bool longlink_complexconnect_need_verify() {
130+
return false;
131+
}
132+
133+
bool is_push_data(uint32_t _cmdid, uint32_t _taskid) {
134+
return PUSH_DATA_TASKID == _taskid;
135+
}

‎mars/libraries/mars_android_sdk/jni/longlink_packer.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,5 +44,6 @@ void longlink_noop_req_body(AutoBuffer& _body);
4444
void longlink_noop_resp_body(AutoBuffer& _body);
4545

4646
bool longlink_complexconnect_need_verify();
47+
bool is_push_data(uint32_t _cmdid, uint32_t _taskid);
4748

4849
#endif // STN_SRC_LONGLINKPACKER_H_

‎mars/stn/proto/longlink_packer.cc

Lines changed: 23 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -105,15 +105,31 @@ int longlink_unpack(const AutoBuffer& _packed, uint32_t& _cmdid, uint32_t& _seq,
105105
return ret;
106106
}
107107

108-
/**
109-
* nooping param
110-
*/
108+
111109
#define NOOP_CMDID 6
112110
#define SIGNALKEEP_CMDID 243
113-
uint32_t longlink_noop_cmdid() {return NOOP_CMDID;}
114-
uint32_t longlink_noop_resp_cmdid() {return NOOP_CMDID;}
115-
uint32_t signal_keep_cmdid() {return SIGNALKEEP_CMDID;}
111+
#define PUSH_DATA_TASKID 0
112+
113+
uint32_t longlink_noop_cmdid() {
114+
return NOOP_CMDID;
115+
}
116+
117+
118+
uint32_t longlink_noop_resp_cmdid() {
119+
return NOOP_CMDID;
120+
}
121+
122+
uint32_t signal_keep_cmdid() {
123+
return SIGNALKEEP_CMDID;
124+
}
125+
116126
void longlink_noop_req_body(AutoBuffer& _body) {}
117127
void longlink_noop_resp_body(AutoBuffer& _body) {}
118128

119-
bool longlink_complexconnect_need_verify() { return false; }
129+
bool longlink_complexconnect_need_verify() {
130+
return false;
131+
}
132+
133+
bool is_push_data(uint32_t _cmdid, uint32_t _taskid) {
134+
return PUSH_DATA_TASKID == _taskid;
135+
}

‎mars/stn/proto/longlink_packer.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,5 +44,6 @@ void longlink_noop_req_body(AutoBuffer& _body);
4444
void longlink_noop_resp_body(AutoBuffer& _body);
4545

4646
bool longlink_complexconnect_need_verify();
47+
bool is_push_data(uint32_t _cmdid, uint32_t _taskid);
4748

4849
#endif // STN_SRC_LONGLINKPACKER_H_

‎mars/stn/src/longlink_task_manager.cc

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
#endif
3636
#include "mars/stn/config.h"
3737
#include "mars/stn/task_profile.h"
38+
#include "mars/stn/proto/longlink_packer.h"
3839

3940
#include "dynamic_timeout.h"
4041
#include "net_channel_factory.h"
@@ -505,10 +506,14 @@ void LongLinkTaskManager::__OnResponse(ErrCmdType _error_type, int _error_code,
505506
return;
506507
}
507508

509+
if (is_push_data(_cmdid, _taskid)) {
510+
return;
511+
}
512+
508513
std::list<TaskProfile>::iterator it = __Locate(_taskid);
509514

510515
if (lst_cmd_.end() == it) {
511-
xwarn2_if(Task::kInvalidTaskID != _taskid, TSF"task no found task:%0, cmdid:%1, ect:%2, errcode:%3",
516+
xwarn2(TSF"task no found task:%0, cmdid:%1, ect:%2, errcode:%3",
512517
_taskid, _cmdid, _error_type, _error_code);
513518
return;
514519
}

‎mars/stn/src/net_core.cc

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
#include "mars/baseevent/baseprjevent.h"
3636
#include "mars/stn/config.h"
3737
#include "mars/stn/task_profile.h"
38+
#include "mars/stn/proto/longlink_packer.h"
3839

3940
#include "net_source.h"
4041
#include "net_check_logic.h"
@@ -528,9 +529,9 @@ void NetCore::__OnShortLinkResponse(int _status_code) {
528529
#ifdef USE_LONG_LINK
529530

530531
void NetCore::__OnPush(uint32_t _cmdid, uint32_t _taskid, const AutoBuffer& _buf) {
531-
xinfo2_if(0 == _taskid, TSF"task push seq:%_, cmdid:%_, len:%_", _taskid, _cmdid, _buf.Length());
532-
533-
if (_taskid == Task::kInvalidTaskID) {
532+
533+
if (is_push_data(_cmdid, _taskid)) {
534+
xinfo2(TSF"task push seq:%_, cmdid:%_, len:%_", _taskid, _cmdid, _buf.Length());
534535
push_preprocess_signal_(_cmdid, _buf);
535536
OnPush(_cmdid, _buf);
536537
}

‎samples/Mac/PublicComponentV2/longlink_packer.h

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
#define STN_SRC_LONGLINK_PACKER_H_
2323

2424
#include <stdlib.h>
25-
#include <stdint.h>
2625

2726
#define LONGLINK_UNPACK_CONTINUE (-2)
2827
#define LONGLINK_UNPACK_FALSE (-1)
@@ -40,7 +39,11 @@ int longlink_unpack(const AutoBuffer& _packed, uint32_t& _cmdid, uint32_t& _seq
4039
//heartbeat signal to keep longlink network alive
4140
uint32_t longlink_noop_cmdid();
4241
uint32_t longlink_noop_resp_cmdid();
42+
uint32_t signal_keep_cmdid();
4343
void longlink_noop_req_body(AutoBuffer& _body);
4444
void longlink_noop_resp_body(AutoBuffer& _body);
4545

46+
bool longlink_complexconnect_need_verify();
47+
bool is_push_data(uint32_t _cmdid, uint32_t _taskid);
48+
4649
#endif // STN_SRC_LONGLINKPACKER_H_

‎samples/iOS/iOSDemo/PublicComponentV2/longlink_packer.h

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,13 @@
1515
* longlink_packer.cpp
1616
*
1717
* Created on: 2012-7-18
18-
* Author: yerungui, caoshaokun
18+
* Author: yerungui
1919
*/
2020

2121
#ifndef STN_SRC_LONGLINK_PACKER_H_
2222
#define STN_SRC_LONGLINK_PACKER_H_
2323

2424
#include <stdlib.h>
25-
#include <stdint.h>
2625

2726
#define LONGLINK_UNPACK_CONTINUE (-2)
2827
#define LONGLINK_UNPACK_FALSE (-1)
@@ -40,7 +39,11 @@ int longlink_unpack(const AutoBuffer& _packed, uint32_t& _cmdid, uint32_t& _seq
4039
//heartbeat signal to keep longlink network alive
4140
uint32_t longlink_noop_cmdid();
4241
uint32_t longlink_noop_resp_cmdid();
42+
uint32_t signal_keep_cmdid();
4343
void longlink_noop_req_body(AutoBuffer& _body);
4444
void longlink_noop_resp_body(AutoBuffer& _body);
4545

46+
bool longlink_complexconnect_need_verify();
47+
bool is_push_data(uint32_t _cmdid, uint32_t _taskid);
48+
4649
#endif // STN_SRC_LONGLINKPACKER_H_

0 commit comments

Comments
 (0)