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

Merge remote-tracking branch 'upstream/master' into v0.6-BugFixing_6

Browse source
This commit is contained in:
csoler 2021-01-21 18:15:08 +01:00
commit 95fc1a56c8
9 changed files with 61 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

6
libretroshare/src/gxs/rsgenexchange.cc
View file

@ -2519,7 +2519,7 @@ void RsGenExchange::processGroupUpdatePublish()
{
GroupUpdatePublish& gup = *vit;
const RsGxsGroupId& groupId = gup.grpItem->meta.mGroupId;
grpMeta.insert(std::make_pair(groupId, (RsGxsGrpMetaData*)(NULL)));
grpMeta.insert(std::make_pair(groupId, std::make_shared<RsGxsGrpMetaData>()));
}
if(grpMeta.empty())
@ -2985,7 +2985,7 @@ bool RsGenExchange::getGroupKeys(const RsGxsGroupId &grpId, RsTlvSecurityKeySet
RS_STACK_MUTEX(mGenMtx) ;
RsGxsGrpMetaTemporaryMap grpMeta;
grpMeta[grpId] = NULL;
grpMeta[grpId] = std::make_shared<RsGxsGrpMetaData>();
mDataStore->retrieveGxsGrpMetaData(grpMeta);
if(grpMeta.empty())
@ -3078,7 +3078,7 @@ void RsGenExchange::processRecvdMessages()
}
else
{
grpMetas.insert(std::make_pair(pend_it->second.mItem->grpId, (RsGxsGrpMetaData*)NULL));
grpMetas.insert(std::make_pair(pend_it->second.mItem->grpId, std::make_shared<RsGxsGrpMetaData>()));
++pend_it;
}
}

7
libretroshare/src/gxs/rsgxsnettunnel.cc
View file

@ -766,7 +766,12 @@ void RsGxsNetTunnelService::threadTick()
}
#endif
rstime::rs_usleep(1*1000*1000) ; // 1 sec
for(uint32_t i=0;i<2;++i)
{
if(shouldStop())
return;
rstime::rs_usleep(500*1000) ; // 1 sec
}
}
const Bias20Bytes& RsGxsNetTunnelService::locked_randomBias()

10
libretroshare/src/services/broadcastdiscoveryservice.cc
View file

@ -141,8 +141,6 @@ void BroadcastDiscoveryService::updatePublishedData()
void BroadcastDiscoveryService::threadTick()
{
auto nextRunAt = std::chrono::system_clock::now() + std::chrono::seconds(5);
if( mUdcParameters.can_discover() &&
!mRsPeers.isHiddenNode(mRsPeers.getOwnId()) )
{
@ -200,7 +198,13 @@ void BroadcastDiscoveryService::threadTick()
if( mUdcParameters.can_be_discovered() &&
!mRsPeers.isHiddenNode(mRsPeers.getOwnId()) ) updatePublishedData();
std::this_thread::sleep_until(nextRunAt);
// This avoids waiting 5 secs when the thread should actually terminate (when RS closes).
for(uint32_t i=0;i<10;++i)
{
if(shouldStop())
return;
rstime::rs_usleep(500*1000); // sleep for 0.5 sec.
}
}
RsBroadcastDiscoveryResult BroadcastDiscoveryService::createResult(

12
libretroshare/src/services/p3gxschannels.cc
View file

@ -93,13 +93,17 @@ p3GxsChannels::p3GxsChannels(
mLastDistantSearchNotificationTS = 0;
mCommentService = new p3GxsCommentService(this, RS_SERVICE_GXS_TYPE_CHANNELS);
RsTickEvent::schedule_in(CHANNEL_PROCESS, 0);
// This is not needed since it just loads all channel data ever 5 mins which takes a lot
// of useless CPU/memory.
//
// RsTickEvent::schedule_in(CHANNEL_PROCESS, 0);
//
// Test Data disabled in repo.
//RsTickEvent::schedule_in(CHANNEL_TESTEVENT_DUMMYDATA, DUMMYDATA_PERIOD);
//
// RsTickEvent::schedule_in(CHANNEL_TESTEVENT_DUMMYDATA, DUMMYDATA_PERIOD);
mGenToken = 0;
mGenCount = 0;
}

1
libretroshare/src/services/p3idservice.cc
View file

@ -643,6 +643,7 @@ void p3IdService::notifyChanges(std::vector<RsGxsNotify *> &changes)
case RsGxsNotify::TYPE_PROCESSED: break ; // Happens when the group is subscribed. This is triggered by RsGenExchange::subscribeToGroup, so better not
// call it again from here!!
case RsGxsNotify::TYPE_UPDATED:
case RsGxsNotify::TYPE_PUBLISHED:
{
auto ev = std::make_shared<RsGxsIdentityEvent>();