Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-05-12 02:55:18 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

created 2 subclasses of RsThread, one for ticking services, and one for single shot jobs. Now all threads use the same base code.

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8288 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2015-05-22 20:54:38 +00:00
parent f2d4a237ca
commit e9b9dce9f5
28 changed files with 317 additions and 335 deletions
Download patch file Download diff file Expand all files Collapse all files

5
libretroshare/src/ft/ftcontroller.h
View file

@ -113,7 +113,7 @@ class ftPendingRequest
};
class ftController: public CacheTransfer, public RsThread, public pqiServiceMonitor, public p3Config
class ftController: public CacheTransfer, public RsTickingThread, public pqiServiceMonitor, public p3Config
{
public:
@ -126,7 +126,7 @@ class ftController: public CacheTransfer, public RsThread, public pqiServiceMoni
bool activate();
bool isActiveAndNoPending();
virtual void run();
virtual void data_tick();
/***************************************************************/
/********************** Controller Access **********************/
@ -243,6 +243,7 @@ class ftController: public CacheTransfer, public RsThread, public pqiServiceMoni
p3ServiceControl *mServiceCtrl;
uint32_t mFtServiceId;
uint32_t cnt ;
RsMutex ctrlMutex;
std::map<RsFileHash, ftFileControl*> mCompleted;