Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

improved/cleaned debug outputs in in rsgxsnetservice.cc. Performed optimization of transaction system: limited the size of message transactions and allowed a much larger transaction timeout to suppress the transaction cancelling epidemic that caused global bandwidth increase and lack of channel/forum propagation

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7724 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2014-12-02 20:06:56 +00:00
parent 6588eafb99
commit a5bf3b6f3f
4 changed files with 869 additions and 646 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1498
libretroshare/src/gxs/rsgxsnetservice.cc
View File

File diff suppressed because it is too large Load Diff

5
libretroshare/src/gxs/rsgxsnetservice.h
View File

@ -438,8 +438,6 @@ private:
// for an active transaction // for an active transaction
uint32_t mTransactionTimeOut; uint32_t mTransactionTimeOut;
std::map<RsGxsGroupId,std::list<RsPeerId> > mPendingPublishKeyRecipients ;
RsPeerId mOwnId; RsPeerId mOwnId;
RsNxsNetMgr* mNetMgr; RsNxsNetMgr* mNetMgr;
@ -460,8 +458,9 @@ private:
// need to be verfied // need to be verfied
std::vector<AuthorPending*> mPendingResp; std::vector<AuthorPending*> mPendingResp;
std::vector<GrpCircleVetting*> mPendingCircleVets; std::vector<GrpCircleVetting*> mPendingCircleVets;
std::map<RsGxsGroupId,std::list<RsPeerId> > mPendingPublishKeyRecipients ;
std::map<RsPeerId, std::list<RsGxsGroupId> > mExplicitRequest; std::map<RsPeerId, std::list<RsGxsGroupId> > mExplicitRequest;
std::map<RsPeerId, std::set<RsGxsGroupId> > mPartialMsgUpdates ;
// nxs sync optimisation // nxs sync optimisation
// can pull dynamically the latest timestamp for each message // can pull dynamically the latest timestamp for each message

4
libretroshare/src/serialiser/rsgxsupdateitems.h
View File

@ -79,8 +79,8 @@ public:
{ clear();} { clear();}
virtual ~RsGxsMsgUpdateItem() {} virtual ~RsGxsMsgUpdateItem() {}
virtual void clear(); virtual void clear();
virtual std::ostream &print(std::ostream &out, uint16_t indent); virtual std::ostream &print(std::ostream &out, uint16_t indent);
RsPeerId peerId; RsPeerId peerId;
std::map<RsGxsGroupId, uint32_t> msgUpdateTS; std::map<RsGxsGroupId, uint32_t> msgUpdateTS;

8
libretroshare/src/serialiser/rsnxsitems.cc
View File

@ -27,10 +27,10 @@ const uint16_t RsNxsTransac::FLAG_END_FAIL_FULL = 0x0040;
/** transaction type **/ /** transaction type **/
const uint16_t RsNxsTransac::FLAG_TYPE_GRP_LIST_RESP = 0x0100; const uint16_t RsNxsTransac::FLAG_TYPE_GRP_LIST_RESP = 0x0100;
const uint16_t RsNxsTransac::FLAG_TYPE_MSG_LIST_RESP = 0x0200; const uint16_t RsNxsTransac::FLAG_TYPE_MSG_LIST_RESP = 0x0200;
const uint16_t RsNxsTransac::FLAG_TYPE_GRP_LIST_REQ = 0x0400; const uint16_t RsNxsTransac::FLAG_TYPE_GRP_LIST_REQ = 0x0400;
const uint16_t RsNxsTransac::FLAG_TYPE_MSG_LIST_REQ = 0x0800; const uint16_t RsNxsTransac::FLAG_TYPE_MSG_LIST_REQ = 0x0800;
const uint16_t RsNxsTransac::FLAG_TYPE_GRPS = 0x1000; const uint16_t RsNxsTransac::FLAG_TYPE_GRPS = 0x1000;
const uint16_t RsNxsTransac::FLAG_TYPE_MSGS = 0x2000; const uint16_t RsNxsTransac::FLAG_TYPE_MSGS = 0x2000;
uint32_t RsNxsSerialiser::size(RsItem *item) { uint32_t RsNxsSerialiser::size(RsItem *item) {