SHS/pip
4
3
Fork 0
Code Issues 67 Pull Requests 1 Actions Releases Wiki Activity

git-svn-id: svn://db.shs.com.ru/pip@546 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5

Browse Source
This commit is contained in:
Пелипенко Иван
2017-09-14 10:38:26 +00:00
parent 6d1852c535
commit aac78354c5
2 changed files with 27 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src_main/thread/pitimer.cpp
View File

@@ -61,14 +61,14 @@ _PITimerBase::_PITimerBase() {
void _PITimerBase::setInterval(double i) {
interval_ = i;
if (isRunning()) {
stop();
stop(true);
start();
}
}
bool _PITimerBase::start(double interval_ms) {
if (isRunning()) stop();
if (isRunning()) stop(true);
deferred_ = false;
setInterval(interval_ms);
running_ = startTimer(interval_ms);
@@ -77,7 +77,7 @@ bool _PITimerBase::start(double interval_ms) {
void _PITimerBase::startDeferred(double interval_ms, PIDateTime start_datetime) {
if (isRunning()) stop();
if (isRunning()) stop(true);
deferred_ = true;
deferred_mode = true;
deferred_datetime = start_datetime;
@@ -87,7 +87,7 @@ void _PITimerBase::startDeferred(double interval_ms, PIDateTime start_datetime)
void _PITimerBase::startDeferred(double interval_ms, double delay_ms) {
if (isRunning()) stop();
if (isRunning()) stop(true);
deferred_ = true;
deferred_mode = false;
deferred_delay = delay_ms;
@@ -96,9 +96,9 @@ void _PITimerBase::startDeferred(double interval_ms, double delay_ms) {
}
bool _PITimerBase::stop() {
bool _PITimerBase::stop(bool wait) {
if (!isRunning()) return true;
running_ = !stopTimer();
running_ = !stopTimer(wait);
return !running_;
}
@@ -115,7 +115,7 @@ protected:
int wait_dt, wait_dd, wait_tick;
private:
virtual bool startTimer(double interval_ms);
virtual bool stopTimer();
virtual bool stopTimer(bool wait);
static void threadFuncS(void * d) {((_PITimerImp_Thread*)d)->threadFunc();}
void adjustTimes();
@@ -133,7 +133,7 @@ public:
protected:
private:
virtual bool startTimer(double interval_ms);
virtual bool stopTimer();
virtual bool stopTimer(bool wait);
int ti;
_PITimerImp_RT_Private_ * priv;
@@ -144,7 +144,7 @@ private:
class _PITimerImp_Pool: public _PITimerImp_Thread {
public:
_PITimerImp_Pool();
virtual ~_PITimerImp_Pool() {stop();}
virtual ~_PITimerImp_Pool() {stop(true);}
private:
class Pool: public PIThread {
public:
@@ -157,7 +157,7 @@ private:
PIVector<_PITimerImp_Pool * > timers, to_remove;
};
virtual bool startTimer(double interval_ms);
virtual bool stopTimer();
virtual bool stopTimer(bool wait);
};
@@ -173,7 +173,7 @@ _PITimerImp_Thread::_PITimerImp_Thread() {
_PITimerImp_Thread::~_PITimerImp_Thread() {
stop();
stop(true);
}
@@ -202,11 +202,12 @@ bool _PITimerImp_Thread::startTimer(double interval_ms) {
}
bool _PITimerImp_Thread::stopTimer() {
bool _PITimerImp_Thread::stopTimer(bool wait) {
thread_.stop();
if (!thread_.waitForFinish(10))
if (thread_.isRunning())
thread_.terminate();
if (wait)
if (!thread_.waitForFinish(10))
if (thread_.isRunning())
thread_.terminate();
return true;
}
@@ -311,7 +312,7 @@ _PITimerImp_RT::_PITimerImp_RT() {
_PITimerImp_RT::~_PITimerImp_RT() {
stop();
stop(true);
delete priv;
}
@@ -344,7 +345,7 @@ bool _PITimerImp_RT::startTimer(double interval_ms) {
}
bool _PITimerImp_RT::stopTimer() {
bool _PITimerImp_RT::stopTimer(bool wait) {
if (ti < 0) return true;
timer_delete(priv->tt);
ti = -1;
@@ -425,7 +426,7 @@ bool _PITimerImp_Pool::startTimer(double interval_ms) {
}
bool _PITimerImp_Pool::stopTimer() {
bool _PITimerImp_Pool::stopTimer(bool wait) {
Pool::instance()->remove(this);
return true;
}