mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-02-03 11:00:14 -05:00
Merge pull request #399 from sehraf/pr-thread-names-2
add thread names for the remaning threads
This commit is contained in:
commit
65585658a5
@ -30,7 +30,7 @@ RsControlModule::RsControlModule(int argc, char **argv, StateTokenServer* sts, A
|
||||
this->argv = argv;
|
||||
// start worker thread
|
||||
if(full_control)
|
||||
start("RS ctrl module");
|
||||
start("resapi ctrl mod");
|
||||
else
|
||||
mRunState = RUNNING_OK_NO_FULL_CONTROL;
|
||||
|
||||
|
@ -188,18 +188,18 @@ void ftServer::StartupThreads()
|
||||
|
||||
/* self contained threads */
|
||||
/* startup ExtraList Thread */
|
||||
mFtExtra->start("RS ft extra lst");
|
||||
mFtExtra->start("ft extra lst");
|
||||
|
||||
/* startup Monitor Thread */
|
||||
/* startup the FileMonitor (after cache load) */
|
||||
/* start it up */
|
||||
mFiMon->start("RS ft monitor");
|
||||
mFiMon->start("ft monitor");
|
||||
|
||||
/* Controller thread */
|
||||
mFtController->start("RS ft ctrl");
|
||||
mFtController->start("ft ctrl");
|
||||
|
||||
/* Dataplex */
|
||||
mFtDataplex->start("RS ft dataplex");
|
||||
mFtDataplex->start("ft dataplex");
|
||||
}
|
||||
|
||||
void ftServer::StopThreads()
|
||||
|
@ -592,7 +592,7 @@ bool ftTransferModule::checkFile()
|
||||
// Note: using new is really important to avoid copy and write errors in the thread.
|
||||
//
|
||||
_hash_thread = new HashThread(mFileCreator) ;
|
||||
_hash_thread->start() ;
|
||||
_hash_thread->start("ft hash") ;
|
||||
#ifdef FT_DEBUG
|
||||
std::cerr << "ftTransferModule::checkFile(): launched hashing thread for file " << mHash << std::endl ;
|
||||
#endif
|
||||
|
@ -265,7 +265,7 @@ void RsGenExchange::tick()
|
||||
else
|
||||
{
|
||||
mIntegrityCheck = new RsGxsIntegrityCheck(mDataStore,mGixs);
|
||||
mIntegrityCheck->start();
|
||||
mIntegrityCheck->start("gxs integrity");
|
||||
mChecking = true;
|
||||
}
|
||||
}
|
||||
|
@ -130,7 +130,7 @@ AuthGPG::AuthGPG(const std::string& path_to_public_keyring,const std::string& pa
|
||||
{
|
||||
_force_sync_database = false ;
|
||||
mCount = 0;
|
||||
start();
|
||||
start("AuthGPG");
|
||||
}
|
||||
|
||||
/* This function is called when retroshare is first started
|
||||
|
@ -347,7 +347,8 @@ int pqiperson::handleNotifyEvent_locked(NetInterface *ni, int newState,
|
||||
activepqi = pqi;
|
||||
inConnectAttempt = false;
|
||||
|
||||
activepqi->start(); // STARTUP THREAD.
|
||||
// STARTUP THREAD
|
||||
activepqi->start("pqi " + PeerId().toStdString().substr(0, 11));
|
||||
|
||||
// reset all other children (clear up long UDP attempt)
|
||||
for(it = kids.begin(); it != kids.end(); ++it)
|
||||
|
@ -71,9 +71,9 @@ void RsServer::ConfigFinalSave()
|
||||
mConfigMgr->completeConfiguration();
|
||||
}
|
||||
|
||||
void RsServer::startServiceThread(RsTickingThread *t)
|
||||
void RsServer::startServiceThread(RsTickingThread *t, const std::string &threadName)
|
||||
{
|
||||
t->start() ;
|
||||
t->start(threadName) ;
|
||||
mRegisteredServiceThreads.push_back(t) ;
|
||||
}
|
||||
|
||||
|
@ -120,8 +120,8 @@ class RsServer: public RsControl, public RsTickingThread
|
||||
public:
|
||||
/* Config */
|
||||
|
||||
virtual void ConfigFinalSave( );
|
||||
virtual void startServiceThread(RsTickingThread *t) ;
|
||||
virtual void ConfigFinalSave( );
|
||||
virtual void startServiceThread(RsTickingThread *t, const std::string &threadName) ;
|
||||
|
||||
/************* Rs shut down function: in upnp 'port lease time' bug *****************/
|
||||
|
||||
|
@ -1768,27 +1768,27 @@ int RsServer::StartupRetroShare()
|
||||
//rsWire = mWire;
|
||||
|
||||
/*** start up GXS core runner ***/
|
||||
startServiceThread(mGxsIdService);
|
||||
startServiceThread(mGxsCircles);
|
||||
startServiceThread(mPosted);
|
||||
startServiceThread(mGxsIdService, "gxs id");
|
||||
startServiceThread(mGxsCircles, "gxs circle");
|
||||
startServiceThread(mPosted, "gxs posted");
|
||||
#if RS_USE_WIKI
|
||||
startServiceThread(mWiki);
|
||||
startServiceThread(mWiki, "gxs wiki");
|
||||
#endif
|
||||
startServiceThread(mGxsForums);
|
||||
startServiceThread(mGxsChannels);
|
||||
startServiceThread(mGxsForums, "gxs forums");
|
||||
startServiceThread(mGxsChannels, "gxs channels");
|
||||
|
||||
//createThread(*mPhoto);
|
||||
//createThread(*mWire);
|
||||
|
||||
// cores ready start up GXS net servers
|
||||
startServiceThread(gxsid_ns);
|
||||
startServiceThread(gxscircles_ns);
|
||||
startServiceThread(posted_ns);
|
||||
startServiceThread(gxsid_ns, "gxs id ns");
|
||||
startServiceThread(gxscircles_ns, "gxs circle ns");
|
||||
startServiceThread(posted_ns, "gxs posted ns");
|
||||
#if RS_USE_WIKI
|
||||
startServiceThread(wiki_ns);
|
||||
startServiceThread(wiki_ns, "gxs wiki ns");
|
||||
#endif
|
||||
startServiceThread(gxsforums_ns);
|
||||
startServiceThread(gxschannels_ns);
|
||||
startServiceThread(gxsforums_ns, "gxs forums ns");
|
||||
startServiceThread(gxschannels_ns, "gxs channels ns");
|
||||
|
||||
//createThread(*photo_ns);
|
||||
//createThread(*wire_ns);
|
||||
@ -1834,7 +1834,7 @@ int RsServer::StartupRetroShare()
|
||||
}
|
||||
|
||||
/* Startup this thread! */
|
||||
start() ;
|
||||
start("rs main") ;
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
@ -65,12 +65,12 @@ p3FeedReader::p3FeedReader(RsPluginHandler* pgHandler, RsGxsForums *forums)
|
||||
/* start download thread */
|
||||
p3FeedReaderThread *frt = new p3FeedReaderThread(this, p3FeedReaderThread::DOWNLOAD, "");
|
||||
mThreads.push_back(frt);
|
||||
frt->start();
|
||||
frt->start("fr download");
|
||||
|
||||
/* start process thread */
|
||||
frt = new p3FeedReaderThread(this, p3FeedReaderThread::PROCESS, "");
|
||||
mThreads.push_back(frt);
|
||||
frt->start();
|
||||
frt->start("fr process");
|
||||
}
|
||||
|
||||
/***************************************************************************/
|
||||
@ -698,11 +698,11 @@ bool p3FeedReader::addPreviewFeed(const FeedInfo &feedInfo, std::string &feedId)
|
||||
|
||||
/* start download thread for preview */
|
||||
mPreviewDownloadThread = new p3FeedReaderThread(this, p3FeedReaderThread::DOWNLOAD, feedId);
|
||||
mPreviewDownloadThread->start();
|
||||
mPreviewDownloadThread->start("fr preview dl");
|
||||
|
||||
/* start process thread for preview */
|
||||
mPreviewProcessThread = new p3FeedReaderThread(this, p3FeedReaderThread::PROCESS, feedId);
|
||||
mPreviewProcessThread->start();
|
||||
mPreviewProcessThread->start("fr preview proc");
|
||||
}
|
||||
|
||||
return true;
|
||||
|
@ -88,7 +88,7 @@ namespace resource_api {
|
||||
TerminalApiClient::TerminalApiClient(ApiServer *api):
|
||||
mApiServer(api)
|
||||
{
|
||||
start();
|
||||
start("resapi terminal");
|
||||
}
|
||||
|
||||
TerminalApiClient::~TerminalApiClient()
|
||||
|
Loading…
x
Reference in New Issue
Block a user