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

test: object-invoke: Delete InvokeObject after thread termination

Browse source 
The InvokeObject instance is created on the stack in the run() method,
and is thus destroyed before the thread the object is bound to
terminates. This creates a race condition as the object message handler
could be running when the object is deleted. Fix this by moving the
InvokeObject to a member field.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>
Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
This commit is contained in:
Laurent Pinchart 2019-11-27 07:32:53 +02:00
parent e54e9ebff4
commit 803e592cf6
1 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

24
test/object-invoke.cpp
View file

@ -60,23 +60,22 @@ protected:
int run()
{
EventDispatcher *dispatcher = Thread::current()->eventDispatcher();
InvokedObject object;
/*
* Test that queued method invocation in the same thread goes
* through the event dispatcher.
*/
object.invokeMethod(&InvokedObject::method,
ConnectionTypeQueued, 42);
object_.invokeMethod(&InvokedObject::method,
ConnectionTypeQueued, 42);
if (object.status() != InvokedObject::NoCall) {
if (object_.status() != InvokedObject::NoCall) {
cerr << "Method not invoked asynchronously" << endl;
return TestFail;
}
dispatcher->processEvents();
switch (object.status()) {
switch (object_.status()) {
case InvokedObject::NoCall:
cout << "Method not invoked for main thread" << endl;
return TestFail;
@ -87,7 +86,7 @@ protected:
break;
}
if (object.value() != 42) {
if (object_.value() != 42) {
cout << "Method invoked with incorrect value for main thread" << endl;
return TestFail;
}
@ -96,15 +95,15 @@ protected:
* Move the object to a thread and verify that auto method
* invocation is delivered in the correct thread.
*/
object.reset();
object.moveToThread(&thread_);
object_.reset();
object_.moveToThread(&thread_);
thread_.start();
object.invokeMethod(&InvokedObject::method,
ConnectionTypeBlocking, 42);
object_.invokeMethod(&InvokedObject::method,
ConnectionTypeBlocking, 42);
switch (object.status()) {
switch (object_.status()) {
case InvokedObject::NoCall:
cout << "Method not invoked for custom thread" << endl;
return TestFail;
@ -115,7 +114,7 @@ protected:
break;
}
if (object.value() != 42) {
if (object_.value() != 42) {
cout << "Method invoked with incorrect value for custom thread" << endl;
return TestFail;
}
@ -131,6 +130,7 @@ protected:
private:
Thread thread_;
InvokedObject object_;
};
TEST_REGISTER(ObjectInvokeTest)