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

removed useless reload of channel data. Fixed default implicit conversion from pointer to shared_ptr

Browse source
This commit is contained in:
csoler 2021-01-19 19:38:38 +01:00
parent ddc0a8c1ec
commit e56add841a
2 changed files with 11 additions and 7 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; GroupUpdatePublish& gup = *vit;
const RsGxsGroupId& groupId = gup.grpItem->meta.mGroupId; 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()) if(grpMeta.empty())
@ -2985,7 +2985,7 @@ bool RsGenExchange::getGroupKeys(const RsGxsGroupId &grpId, RsTlvSecurityKeySet
RS_STACK_MUTEX(mGenMtx) ; RS_STACK_MUTEX(mGenMtx) ;
RsGxsGrpMetaTemporaryMap grpMeta; RsGxsGrpMetaTemporaryMap grpMeta;
grpMeta[grpId] = NULL; grpMeta[grpId] = std::make_shared<RsGxsGrpMetaData>();
mDataStore->retrieveGxsGrpMetaData(grpMeta); mDataStore->retrieveGxsGrpMetaData(grpMeta);
if(grpMeta.empty()) if(grpMeta.empty())
@ -3078,7 +3078,7 @@ void RsGenExchange::processRecvdMessages()
} }
else 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; ++pend_it;
} }
} }

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

@ -93,13 +93,17 @@ p3GxsChannels::p3GxsChannels(
mLastDistantSearchNotificationTS = 0; mLastDistantSearchNotificationTS = 0;
mCommentService = new p3GxsCommentService(this, RS_SERVICE_GXS_TYPE_CHANNELS); 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. // Test Data disabled in repo.
//RsTickEvent::schedule_in(CHANNEL_TESTEVENT_DUMMYDATA, DUMMYDATA_PERIOD); //
// RsTickEvent::schedule_in(CHANNEL_TESTEVENT_DUMMYDATA, DUMMYDATA_PERIOD);
mGenToken = 0; mGenToken = 0;
mGenCount = 0; mGenCount = 0;
} }