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

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

Browse source 
The EventHandler 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 f422624d9c
commit 1f5d485bfb
1 changed files with 27 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

37
test/event-thread.cpp
View file

@ -85,10 +85,17 @@ private:
class EventThreadTest : public Test
{
protected:
int init()
{
thread_.start();
handler_ = new EventHandler();
return TestPass;
}
int run()
{
Thread thread;
thread.start();
/*
* Fire the event notifier and then move the notifier to a
@ -98,23 +105,33 @@ protected:
* different thread will correctly process already pending
* events in the new thread.
*/
EventHandler handler;
handler.notify();
handler.moveToThread(&thread);
handler_->notify();
handler_->moveToThread(&thread_);
this_thread::sleep_for(chrono::milliseconds(100));
/* Must stop thread before destroying the handler. */
thread.exit(0);
thread.wait();
if (!handler.notified()) {
if (!handler_->notified()) {
cout << "Thread event handling test failed" << endl;
return TestFail;
}
return TestPass;
}
void cleanup()
{
/*
* Object class instances must be destroyed from the thread
* they live in.
*/
handler_->deleteLater();
thread_.exit(0);
thread_.wait();
}
private:
EventHandler *handler_;
Thread thread_;
};
TEST_REGISTER(EventThreadTest)