Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-02-24 00:40:11 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

attempt to fix token queue growth in circles

Browse Source
This commit is contained in:
csoler 2021-01-23 22:54:29 +01:00
parent 4be2ed548c
commit 53f0c396e7
2 changed files with 59 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

95
libretroshare/src/gxs/rsgenexchange.cc
View File

@ -67,6 +67,7 @@ static const uint32_t INTEGRITY_CHECK_PERIOD = 60*31; // 31 minutes
/*
* #define GEN_EXCH_DEBUG 1
*/
#define GEN_EXCH_DEBUG 1
// Data flow in RsGenExchange
//
@ -409,6 +410,7 @@ bool RsGenExchange::acknowledgeTokenMsg(const uint32_t& token,
// no dump token as client has ackowledged its completion
mDataAccess->disposeOfPublicToken(token);
mMsgNotify.erase(mit);
#ifdef GEN_EXCH_DEBUG
std::cerr << " found grpId=" << msgId.first <<", msgId=" << msgId.second << std::endl;
@ -441,6 +443,7 @@ bool RsGenExchange::acknowledgeTokenGrp(const uint32_t& token, RsGxsGroupId& grp
// no dump token as client has ackowledged its completion
mDataAccess->disposeOfPublicToken(token);
mGrpNotify.erase(mit);
#ifdef GEN_EXCH_DEBUG
std::cerr << " found grpId=" << grpId << std::endl;
@ -2158,7 +2161,8 @@ void RsGenExchange::processMsgMetaChanges()
{
RS_STACK_MUTEX(mGenMtx);
mMsgNotify.insert(std::make_pair(token, m.msgId));
//mMsgNotify.insert(std::make_pair(token, m.msgId));// (csoler) Is that needed??
mDataAccess->disposeOfPublicToken(token);
}
}
@ -2210,7 +2214,8 @@ void RsGenExchange::processGrpMetaChanges()
{
RS_STACK_MUTEX(mGenMtx);
mGrpNotify.insert(std::make_pair(token, g.grpId));
mDataAccess->disposeOfPublicToken(token);
//mGrpNotify.insert(std::make_pair(token, g.grpId)); // (csoler) I'm not sure that is even useful
}
}
@ -2594,8 +2599,7 @@ void RsGenExchange::processGroupDelete()
typedef std::pair<bool, RsGxsGroupId> GrpNote;
std::map<uint32_t, GrpNote> toNotify;
std::vector<GroupDeletePublish>::iterator vit = mGroupDeletePublish.begin();
for(; vit != mGroupDeletePublish.end(); ++vit)
for( auto vit = mGroupDeletePublish.begin();vit != mGroupDeletePublish.end(); ++vit)
{
std::vector<RsGxsGroupId> gprIds;
gprIds.push_back(vit->mGroupId);
@ -2603,18 +2607,16 @@ void RsGenExchange::processGroupDelete()
toNotify.insert(std::make_pair( vit->mToken, GrpNote(true, vit->mGroupId)));
}
std::list<RsGxsGroupId> grpDeleted;
std::map<uint32_t, GrpNote>::iterator mit = toNotify.begin();
for(; mit != toNotify.end(); ++mit)
for(auto mit=toNotify.begin(); mit != toNotify.end(); ++mit)
{
GrpNote& note = mit->second;
RsTokenService::GxsRequestStatus status =
note.first ? RsTokenService::COMPLETE
: RsTokenService::FAILED;
mGrpNotify.insert(std::make_pair(mit->first, note.second));
mDataAccess->updatePublicRequestStatus(mit->first, status);
mDataAccess->disposeOfPublicToken(mit->first);
if(note.first)
grpDeleted.push_back(note.second);
@ -2632,39 +2634,52 @@ void RsGenExchange::processGroupDelete()
void RsGenExchange::processMessageDelete()
{
RS_STACK_MUTEX(mGenMtx) ;
#ifdef TODO
typedef std::pair<bool, RsGxsGroupId> GrpNote;
std::map<uint32_t, GrpNote> toNotify;
struct MsgNote {
MsgNote(bool s,const GxsMsgReq& mid) : state(s),msgIds(mid){}
bool state;
GxsMsgReq msgIds;
};
std::map<uint32_t, MsgNote> toNotify;
for( auto vit = mMsgDeletePublish.begin(); vit != mMsgDeletePublish.end(); ++vit)
{
uint32_t token = (*vit).mToken;
bool res = mDataStore->removeMsgs( (*vit).mMsgs );
#ifdef GEN_EXCH_DEBUG
for(auto mit: (*vit).mMsgs)
{
std::cerr << "Attempt to delete messages: token=" << token << std::endl;
for(const auto& msg:mit.second)
std::cerr << " grpId=" << mit.first << ", msgId=" << msg << std::endl;
std::cerr << " Result: " << res << std::endl;
}
#endif
toNotify.insert(std::make_pair(token, MsgNote(res,(*vit).mMsgs)));
}
for( std::vector<MsgDeletePublish>::iterator vit = mMsgDeletePublish.begin(); vit != mMsgDeletePublish.end(); ++vit)
{
#ifdef TODO
uint32_t token = (*vit).mToken;
const RsGxsGroupId& groupId = gdp.grpItem->meta.mGroupId;
toNotify.insert(std::make_pair( token, GrpNote(true, groupId)));
#endif
mDataStore->removeMsgs( (*vit).mMsgs );
}
std::list<GxsMsgReq> msgDeleted;
// std::list<RsGxsGroupId> grpDeleted;
// std::map<uint32_t, GrpNote>::iterator mit = toNotify.begin();
// for(; mit != toNotify.end(); ++mit)
// {
// GrpNote& note = mit->second;
// uint8_t status = note.first ? RsTokenService::GXS_REQUEST_V2_STATUS_COMPLETE
// : RsTokenService::GXS_REQUEST_V2_STATUS_FAILED;
//
// mGrpNotify.insert(std::make_pair(mit->first, note.second));
// mDataAccess->updatePublicRequestStatus(mit->first, status);
//
// if(note.first)
// grpDeleted.push_back(note.second);
// }
for(auto mit = toNotify.begin(); mit != toNotify.end(); ++mit)
{
MsgNote& note = mit->second;
RsTokenService::GxsRequestStatus status =
note.state ? RsTokenService::COMPLETE
: RsTokenService::FAILED;
for(uint32_t i=0;i<mMsgDeletePublish.size();++i)
for(auto it(mMsgDeletePublish[i].mMsgs.begin());it!=mMsgDeletePublish[i].mMsgs.end();++it)
mNotifications.push_back(new RsGxsGroupChange(RsGxsNotify::TYPE_MESSAGE_DELETED,it->first, false));
mDataAccess->updatePublicRequestStatus(mit->first, status);
mDataAccess->disposeOfPublicToken(mit->first);
if(note.state)
msgDeleted.push_back(note.msgIds);
}
for(const auto& msgreq:msgDeleted)
for(const auto& msgit:msgreq)
for(const auto& msg:msgit.second)
mNotifications.push_back(new RsGxsMsgChange(RsGxsNotify::TYPE_MESSAGE_DELETED,msgit.first,msg, false));
mMsgDeletePublish.clear();
}
@ -2958,7 +2973,11 @@ void RsGenExchange::publishGrps()
uint32_t RsGenExchange::generatePublicToken()
{
return mDataAccess->generatePublicToken();
uint32_t token = mDataAccess->generatePublicToken();
#ifdef GEN_EXCH_DEBUG
std::cerr << "New token generated: " << token << " in RsGenExchange::generatePublicToken()" << std::endl;
#endif
return token;
}
bool RsGenExchange::updatePublicRequestStatus(

2
libretroshare/src/gxs/rsgxsdataaccess.cc
View File

@ -1801,6 +1801,8 @@ uint32_t RsGxsDataAccess::generatePublicToken()
mPublicToken[token] = PENDING ;
#ifdef DATA_DEBUG
GXSDATADEBUG << "Service " << std::hex << mDataStore->serviceType() << std::dec << ": Adding new public token " << token << " in PENDING state. Completed tokens: " << mCompletedRequests.size() << " Size of mPublicToken: " << mPublicToken.size() << std::endl;
if(mDataStore->serviceType() == 0x218 && token==19)
print_stacktrace();
#endif
}