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

fixed threading issue in NxsTestHub. NxsTesthub has to wait for its own thread to shut down on test end.

Browse source
This commit is contained in:
electron128 2015-12-20 14:31:26 +01:00
parent 63c6629e57
commit a8b2bc776e
2 changed files with 10 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -104,24 +104,6 @@ bool rs_nxs_test::NxsTestHub::testsPassed()
return mTestScenario->checkTestPassed();
}
void rs_nxs_test::NxsTestHub::runloop()
{
double timeDelta = .2;
while(!shouldStop())
{
#ifndef WINDOWS_SYS
usleep((int) (timeDelta * 1000000));
#else
Sleep((int) (timeDelta * 1000));
#endif
tick();
}
}
void rs_nxs_test::NxsTestHub::StartTest()
{
// get all services up and running
@ -138,7 +120,7 @@ void rs_nxs_test::NxsTestHub::StartTest()
void rs_nxs_test::NxsTestHub::EndTest()
{
// then stop this thread
ask_for_stop();
join();
// stop services
PeerNxsMap::iterator mit = mPeerNxsMap.begin();
@ -217,7 +199,7 @@ void rs_nxs_test::NxsTestHub::CleanUpTest()
mTestScenario->cleanTestScenario();
}
void rs_nxs_test::NxsTestHub::tick()
void rs_nxs_test::NxsTestHub::data_tick()
{
// for each nxs instance pull out all items from each and then move to destination peer
@ -248,6 +230,8 @@ void rs_nxs_test::NxsTestHub::tick()
}
double timeDelta = .2;
usleep(timeDelta * 1000000);
}