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

switched to more reasonnable timeout values in waitToken

Browse Source
This commit is contained in:
csoler 2020-03-01 13:45:07 +01:00
parent d96ce490d4
commit f8d07a3e92
No known key found for this signature in database
GPG Key ID: 7BCA522266C0804C
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libretroshare/src/retroshare/rsgxsifacehelper.h
View File

@ -294,8 +294,8 @@ protected:
*/ */
RsTokenService::GxsRequestStatus waitToken( RsTokenService::GxsRequestStatus waitToken(
uint32_t token, uint32_t token,
std::chrono::milliseconds maxWait = std::chrono::milliseconds(500), std::chrono::milliseconds maxWait = std::chrono::milliseconds(2000),
std::chrono::milliseconds checkEvery = std::chrono::milliseconds(2)) std::chrono::milliseconds checkEvery = std::chrono::milliseconds(20))
{ return mTokenService.waitToken(token, maxWait, checkEvery); } { return mTokenService.waitToken(token, maxWait, checkEvery); }
private: private:

8
libretroshare/src/services/p3idservice.cc
View File

@ -2958,8 +2958,10 @@ void p3IdService::requestIdsFromNet()
for(cit = mIdsNotPresent.begin(); cit != mIdsNotPresent.end();) for(cit = mIdsNotPresent.begin(); cit != mIdsNotPresent.end();)
{ {
#ifdef DEBUG_IDS
Dbg2() << __PRETTY_FUNCTION__ << " Processing missing key RsGxsId: " Dbg2() << __PRETTY_FUNCTION__ << " Processing missing key RsGxsId: "
<< cit->first << std::endl; << cit->first << std::endl;
#endif
const RsGxsId& gxsId = cit->first; const RsGxsId& gxsId = cit->first;
const std::list<RsPeerId>& peers = cit->second; const std::list<RsPeerId>& peers = cit->second;
@ -2978,9 +2980,11 @@ void p3IdService::requestIdsFromNet()
requests[peer].push_back(cit->first); requests[peer].push_back(cit->first);
request_can_proceed = true ; request_can_proceed = true ;
#ifdef DEBUG_IDS
Dbg2() << __PRETTY_FUNCTION__ << " Moving missing key RsGxsId:" Dbg2() << __PRETTY_FUNCTION__ << " Moving missing key RsGxsId:"
<< gxsId << " to peer: " << peer << " requests queue" << gxsId << " to peer: " << peer << " requests queue"
<< std::endl; << std::endl;
#endif
} }
} }
@ -3013,9 +3017,11 @@ void p3IdService::requestIdsFromNet()
for( std::list<RsGxsId>::const_iterator gxs_id_it = cit2->second.begin(); for( std::list<RsGxsId>::const_iterator gxs_id_it = cit2->second.begin();
gxs_id_it != cit2->second.end(); ++gxs_id_it ) gxs_id_it != cit2->second.end(); ++gxs_id_it )
{ {
#ifdef DEBUG_IDS
Dbg2() << __PRETTY_FUNCTION__ << " passing RsGxsId: " << *gxs_id_it Dbg2() << __PRETTY_FUNCTION__ << " passing RsGxsId: " << *gxs_id_it
<< " request for peer: " << peer << " request for peer: " << peer
<< " to RsNetworkExchangeService " << std::endl; << " to RsNetworkExchangeService " << std::endl;
#endif
grpIds.push_back(RsGxsGroupId(*gxs_id_it)); grpIds.push_back(RsGxsGroupId(*gxs_id_it));
} }
@ -3580,7 +3586,9 @@ RsGenExchange::ServiceCreate_Return p3IdService::service_CreateGroup(
} }
} }
#ifdef DEBUG_IDS
Dbg2() << __PRETTY_FUNCTION__ << " returns: " << createStatus << std::endl; Dbg2() << __PRETTY_FUNCTION__ << " returns: " << createStatus << std::endl;
#endif
return createStatus; return createStatus;
} }