mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-05-19 06:20:44 -04:00
created 2 subclasses of RsThread, one for ticking services, and one for single shot jobs. Now all threads use the same base code.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8288 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
parent
f2d4a237ca
commit
e9b9dce9f5
28 changed files with 317 additions and 335 deletions
|
@ -71,7 +71,7 @@ void RsServer::ConfigFinalSave()
|
|||
mConfigMgr->completeConfiguration();
|
||||
}
|
||||
|
||||
void RsServer::startServiceThread(RsThread *t)
|
||||
void RsServer::startServiceThread(RsTickingThread *t)
|
||||
{
|
||||
t->start() ;
|
||||
mRegisteredServiceThreads.push_back(t) ;
|
||||
|
@ -87,13 +87,13 @@ void RsServer::rsGlobalShutDown()
|
|||
|
||||
mNetMgr->shutdown(); /* Handles UPnP */
|
||||
|
||||
join();
|
||||
fullstop() ;
|
||||
|
||||
// kill all registered service threads
|
||||
// kill all registered service threads
|
||||
|
||||
for(std::list<RsThread*>::iterator it= mRegisteredServiceThreads.begin();it!=mRegisteredServiceThreads.end();++it)
|
||||
for(std::list<RsTickingThread*>::iterator it= mRegisteredServiceThreads.begin();it!=mRegisteredServiceThreads.end();++it)
|
||||
{
|
||||
(*it)->join() ;
|
||||
(*it)->fullstop() ;
|
||||
}
|
||||
// #ifdef RS_ENABLE_GXS
|
||||
// // We should automate this.
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue