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@816 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5

Browse Source
This commit is contained in:
Пелипенко Иван
2019-06-26 11:08:10 +00:00
parent 4e84f935d2
commit 19d4ab94b9
16 changed files with 61 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src_main/thread/pithread.cpp
View File

@@ -161,7 +161,6 @@ PRIVATE_DEFINITION_END(PIThread)
PIThread::PIThread(void * data, ThreadFunc func, bool startNow, int timer_delay): PIObject() {
PIINTROSPECTION_THREAD_NEW(this);
piMonitor.threads++;
tid_ = -1;
PRIVATE->thread = 0;
data_ = data;
@@ -175,7 +174,6 @@ PIThread::PIThread(void * data, ThreadFunc func, bool startNow, int timer_delay)
PIThread::PIThread(bool startNow, int timer_delay): PIObject() {
PIINTROSPECTION_THREAD_NEW(this);
piMonitor.threads++;
tid_ = -1;
PRIVATE->thread = 0;
ret_func = 0;
@@ -188,7 +186,6 @@ PIThread::PIThread(bool startNow, int timer_delay): PIObject() {
PIThread::~PIThread() {
PIINTROSPECTION_THREAD_DELETE(this);
piMonitor.threads--;
if (!running_ || PRIVATE->thread == 0) return;
#ifdef FREERTOS
//void * ret(0);

5
src_main/thread/pitimer.cpp
View File

@@ -458,7 +458,6 @@ bool _PITimerImp_Pool::stopTimer(bool wait) {
PITimer::PITimer(): PIObject() {
piMonitor.timers++;
#ifdef FREERTOS
imp_mode = PITimer::Thread;
#else
@@ -469,14 +468,12 @@ PITimer::PITimer(): PIObject() {
PITimer::PITimer(PITimer::TimerImplementation ti): PIObject() {
piMonitor.timers++;
imp_mode = ti;
initFirst();
}
PITimer::PITimer(TimerEvent slot, void * data, PITimer::TimerImplementation ti): PIObject() {
piMonitor.timers++;
imp_mode = ti;
initFirst();
data_t = data;
@@ -485,7 +482,6 @@ PITimer::PITimer(TimerEvent slot, void * data, PITimer::TimerImplementation ti):
//PITimer::PITimer(const PITimer & other): PIObject() {
// piMonitor.timers++;
// imp_mode = other.imp_mode;
// initFirst();
// data_t = other.data_t;
@@ -494,7 +490,6 @@ PITimer::PITimer(TimerEvent slot, void * data, PITimer::TimerImplementation ti):
PITimer::~PITimer() {
piMonitor.timers--;
destroy();
}