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:
csoler 2015-05-22 20:54:38 +00:00
parent f2d4a237ca
commit e9b9dce9f5
28 changed files with 317 additions and 335 deletions

View file

@ -37,7 +37,7 @@ enum FeedFormat { FORMAT_RSS, FORMAT_RDF, FORMAT_ATOM };
*********/
p3FeedReaderThread::p3FeedReaderThread(p3FeedReader *feedReader, Type type, const std::string &feedId) :
RsThread(), mFeedReader(feedReader), mType(type), mFeedId(feedId)
RsTickingThread(), mFeedReader(feedReader), mType(type), mFeedId(feedId)
{
}
@ -49,9 +49,8 @@ p3FeedReaderThread::~p3FeedReaderThread()
/****************************** Thread *************************************/
/***************************************************************************/
void p3FeedReaderThread::run()
void p3FeedReaderThread::data_tick()
{
while (isRunning()) {
#ifdef WIN32
Sleep(1000);
#else
@ -148,7 +147,6 @@ void p3FeedReaderThread::run()
}
break;
}
}
}
/***************************************************************************/

View file

@ -33,7 +33,7 @@ class RsFeedReaderMsg;
class HTMLWrapper;
class RsFeedReaderXPath;
class p3FeedReaderThread : public RsThread
class p3FeedReaderThread : public RsTickingThread
{
public:
enum Type
@ -56,7 +56,7 @@ public:
static RsFeedReaderErrorState processTransformation(const RsFeedReaderFeed &feed, RsFeedReaderMsg *msg, std::string &errorString);
private:
virtual void run();
virtual void data_tick();
RsFeedReaderErrorState download(const RsFeedReaderFeed &feed, std::string &content, std::string &icon, std::string &errorString);
RsFeedReaderErrorState process(const RsFeedReaderFeed &feed, std::list<RsFeedReaderMsg*> &entries, std::string &errorString);