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

condvar fixes

Browse Source
This commit is contained in:
Пелипенко Иван
2022-11-10 14:11:40 +03:00
parent 15a9d68a87
commit 4994d0bf66
3 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libs/main/core/piobject.cpp
View File

@@ -839,7 +839,7 @@ PIObject::Deleter::Deleter() {
PRIVATE->thread.setSlot([this](){
PIVector<PIObject*> oq;
PRIVATE->thread.lock();
PRIVATE->cond_var.wait(PRIVATE->thread.mutex());
if (PRIVATE->obj_queue.isEmpty()) PRIVATE->cond_var.wait(PRIVATE->thread.mutex());
oq.swap(PRIVATE->obj_queue);
PRIVATE->thread.unlock();
for (PIObject * o : oq) deleteObject(o);
@@ -851,9 +851,7 @@ PIObject::Deleter::Deleter() {
PIObject::Deleter::~Deleter() {
//piCout << "~Deleter ...";
PRIVATE->thread.stop();
PRIVATE->thread.mutex().lock();
PRIVATE->cond_var.notifyAll();
PRIVATE->thread.mutex().unlock();
PRIVATE->thread.waitForFinish();
for (PIObject * o : PRIVATE->obj_queue) deleteObject(o);
//piCout << "~Deleter ok";

2
libs/main/thread/pitimer.cpp
View File

@@ -278,9 +278,7 @@ bool _PITimerImp_Thread::startTimer(double interval_ms) {
bool _PITimerImp_Thread::stopTimer(bool wait) {
thread_.stop();
thread_.mutex().lock();
event.notifyAll();
thread_.mutex().unlock();
if (wait) return thread_.waitForFinish();
// if (wait)
// if (!thread_.waitForFinish(10))