Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-27 00:19:25 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed thread bug caused by deleting a thread before it is actually terminated

Browse Source
This commit is contained in:
csoler 2019-05-11 23:43:54 +02:00
parent 6a18e242bb
commit 7b2541e35c
No known key found for this signature in database
GPG Key ID: 7BCA522266C0804C
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libretroshare/src/gxstrans/p3gxstrans.cc
View File

@ -533,6 +533,14 @@ void p3GxsTrans::service_tick()
for(std::map<RsGxsId,MsgSizeCount>::const_iterator it(per_user_statistics.begin());it!=per_user_statistics.end();++it)
std::cerr << " " << it->first << ": " << it->second.count << " " << it->second.size << std::endl;
#endif
// Waiting here is very important because the thread may still be updating its semaphores after setting isDone() to true
// If we delete it during this operation it will corrupt the stack and cause unpredictable errors.
while(mCleanupThread->isRunning())
{
std::cerr << "Waiting for mCleanupThread to terminate..." << std::endl;
rstime::rs_usleep(500*1000);
}
delete mCleanupThread;
mCleanupThread=NULL ;

2
libretroshare/src/util/rsthreads.cc
View File

@ -66,8 +66,8 @@ void RsThread::go()
runloop();
mHasStoppedSemaphore.set(1);
mShouldStopSemaphore.set(0);
mHasStoppedSemaphore.set(1); // last value that we modify because this is interpreted as a signal that the object can be deleted.
}
void *RsThread::rsthread_init(void* p)
{

2
libretroshare/src/util/rsthreads.h
View File

@ -247,7 +247,7 @@ public:
void start(const std::string &threadName = "");
// Returns true of the thread is still running.
// Returns true if the thread is still running.
bool isRunning();