From e56add841a37501921a6d38afd17c3611d1fd541 Mon Sep 17 00:00:00 2001 From: csoler Date: Tue, 19 Jan 2021 19:38:38 +0100 Subject: [PATCH] removed useless reload of channel data. Fixed default implicit conversion from pointer to shared_ptr --- libretroshare/src/gxs/rsgenexchange.cc | 6 +++--- libretroshare/src/services/p3gxschannels.cc | 12 ++++++++---- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/libretroshare/src/gxs/rsgenexchange.cc b/libretroshare/src/gxs/rsgenexchange.cc index d133355d7..7b1c328cf 100644 --- a/libretroshare/src/gxs/rsgenexchange.cc +++ b/libretroshare/src/gxs/rsgenexchange.cc @@ -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())); } 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(); 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())); ++pend_it; } } diff --git a/libretroshare/src/services/p3gxschannels.cc b/libretroshare/src/services/p3gxschannels.cc index a69ddc8f6..0422b9212 100644 --- a/libretroshare/src/services/p3gxschannels.cc +++ b/libretroshare/src/services/p3gxschannels.cc @@ -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; - }