Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-08-03 20:04:20 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

removed aliasing in storeMessages/storeGroups, removed several memory leaks in unittests, improved auto-delete structures in rsgxsutil, added deletion for members of RsGenExchange, removed shared pointers from unittests (they cause a memory leak and are only used in unittests)

Browse source
This commit is contained in:
csoler 2017-07-25 00:07:53 +02:00
parent ef24459c5e
commit 461ccf3b84
21 changed files with 281 additions and 275 deletions
Download patch file Download diff file Expand all files Collapse all files

24
tests/unittests/libretroshare/gxs/nxs_test/nxsmsgsync_test.cc
View file

@ -17,6 +17,20 @@
using namespace rs_nxs_test;
rs_nxs_test::NxsMsgSync::~NxsMsgSync()
{
for(std::map<RsPeerId,RsNxsNetMgr*>::const_iterator it(mNxsNetMgrs.begin());it!=mNxsNetMgrs.end();++it)
delete it->second ;
for(DataMap::const_iterator it(mDataServices.begin());it!=mDataServices.end();++it)
delete it->second ;
delete mRep ;
delete mCircles;
delete mPgpUtils;
}
rs_nxs_test::NxsMsgSync::NxsMsgSync()
: mPgpUtils(NULL), mServType(0) {
int numPeers = 2;
@ -79,8 +93,8 @@ rs_nxs_test::NxsMsgSync::NxsMsgSync()
// first store grp
RsGeneralDataService* ds = mit->second;
RsNxsGrp* grp_clone = grp->clone();
RsGeneralDataService::GrpStoreMap gsp;
gsp.insert(std::make_pair(grp_clone, grp_clone->metaData));
RsNxsGrpDataTemporaryList gsp;
gsp.push_back(grp_clone);
ds->storeGroup(gsp);
RsGxsGroupId grpId = grp->grpId;
@ -95,10 +109,12 @@ rs_nxs_test::NxsMsgSync::NxsMsgSync()
msg->grpId = grp->grpId;
RsGxsMsgMetaData* msgMeta = new RsGxsMsgMetaData();
init_item(msgMeta);
msg->metaData = msgMeta;
msgMeta->mGroupId = grp->grpId;
msgMeta->mMsgId = msg->msgId;
RsGeneralDataService::MsgStoreMap msm;
msm.insert(std::make_pair(msg , msgMeta));
RsNxsMsgDataTemporaryList msm;
msm.push_back(msg);
RsGxsMessageId msgId = msg->msgId;
ds->storeMessage(msm);