NekoCWD/libcamera
NekoCWD/libcamera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 7 Wiki Activity Actions

test: timer-thread: Destroy Object from correct thread context

Browse source 
The TimeoutHandler used in the test is destroyed from the main thread,
which is invalid for a thread-bound object bound to a different thread.
Fix it by destroying it with deleteLater().

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Milan Zamazal <mzamazal@redhat.com>
This commit is contained in:
Laurent Pinchart 2024-01-19 03:43:55 +02:00
parent 4f76beae86
commit fdcea5ad79
2 changed files with 21 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

14
test/timer-thread.cpp
View file

@ -50,7 +50,9 @@ protected:
int init()
{
thread_.start();
timeout_.moveToThread(&thread_);
timeout_ = new TimeoutHandler();
timeout_->moveToThread(&thread_);
return TestPass;
}
@ -63,7 +65,7 @@ protected:
*/
this_thread::sleep_for(chrono::milliseconds(200));
if (!timeout_.timeout()) {
if (!timeout_->timeout()) {
cout << "Timer expiration test failed" << endl;
return TestFail;
}
@ -73,13 +75,17 @@ protected:
void cleanup()
{
/* Must stop thread before destroying timeout. */
/*
* Object class instances must be destroyed from the thread
* they live in.
*/
timeout_->deleteLater();
thread_.exit(0);
thread_.wait();
}
private:
TimeoutHandler timeout_;
TimeoutHandler *timeout_;
Thread thread_;
};