Message ID | 20190812124642.24287-9-laurent.pinchart@ideasonboard.com |
---|---|
State | Superseded |
Headers | show |
Series |
|
Related | show |
Hi Laurent, Thanks for your work. On 2019-08-12 15:46:32 +0300, Laurent Pinchart wrote: > The test verifies correct behaviour of asynchronous method invocation > for Object instances. > > Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se> > --- > test/meson.build | 1 + > test/object-invoke.cpp | 137 +++++++++++++++++++++++++++++++++++++++++ > 2 files changed, 138 insertions(+) > create mode 100644 test/object-invoke.cpp > > diff --git a/test/meson.build b/test/meson.build > index b2f809e60986..7c9abc630230 100644 > --- a/test/meson.build > +++ b/test/meson.build > @@ -24,6 +24,7 @@ public_tests = [ > internal_tests = [ > ['camera-sensor', 'camera-sensor.cpp'], > ['message', 'message.cpp'], > + ['object-invoke', 'object-invoke.cpp'], > ['signal-threads', 'signal-threads.cpp'], > ['threads', 'threads.cpp'], > ] > diff --git a/test/object-invoke.cpp b/test/object-invoke.cpp > new file mode 100644 > index 000000000000..7221930f4380 > --- /dev/null > +++ b/test/object-invoke.cpp > @@ -0,0 +1,137 @@ > +/* SPDX-License-Identifier: GPL-2.0-or-later */ > +/* > + * Copyright (C) 2019, Google Inc. > + * > + * object-invoke.cpp - Cross-thread Object method invocation test > + */ > + > +#include <chrono> > +#include <iostream> > +#include <thread> > + > +#include <libcamera/camera_manager.h> > +#include <libcamera/event_dispatcher.h> > +#include <libcamera/object.h> > + > +#include "thread.h" > +#include "test.h" > + > +using namespace std; > +using namespace libcamera; > + > +class InvokedObject : public Object > +{ > +public: > + enum Status { > + NoCall, > + InvalidThread, > + CallReceived, > + }; > + > + InvokedObject() > + : status_(NoCall) > + { > + } > + > + Status status() const { return status_; } > + int value() const { return value_; } > + void reset() > + { > + status_ = NoCall; > + value_ = 0; > + } > + > + void method(int value) > + { > + if (Thread::current() != thread()) > + status_ = InvalidThread; > + else > + status_ = CallReceived; > + > + value_ = value; > + } > + > +private: > + Status status_; > + int value_; > +}; > + > +class ObjectInvokeTest : public Test > +{ > +protected: > + int run() > + { > + EventDispatcher *dispatcher = CameraManager::instance()->eventDispatcher(); > + InvokedObject object; > + > + /* > + * Test that method invocation in the same thread goes through > + * the event dispatcher. > + */ > + object.invokeMethod(&InvokedObject::method, 42); > + > + if (object.status() != InvokedObject::NoCall) { > + cerr << "Method not invoked asynchronously" << endl; > + return TestFail; > + } > + > + dispatcher->processEvents(); > + > + switch (object.status()) { > + case InvokedObject::NoCall: > + cout << "Method not invoked for main thread" << endl; > + return TestFail; > + case InvokedObject::InvalidThread: > + cout << "Method invoked in incorrect thread for main thread" << endl; > + return TestFail; > + default: > + break; > + } > + > + if (object.value() != 42) { > + cout << "Method invoked with incorrect value for main thread" << endl; > + return TestFail; > + } > + > + /* > + * Move the object to a thread and verify that the method is > + * delivered in the correct thread. > + */ > + object.reset(); > + object.moveToThread(&thread_); > + > + thread_.start(); > + > + object.invokeMethod(&InvokedObject::method, 42); > + this_thread::sleep_for(chrono::milliseconds(100)); > + > + switch (object.status()) { > + case InvokedObject::NoCall: > + cout << "Method not invoked for custom thread" << endl; > + return TestFail; > + case InvokedObject::InvalidThread: > + cout << "Method invoked in incorrect thread for custom thread" << endl; > + return TestFail; > + default: > + break; > + } > + > + if (object.value() != 42) { > + cout << "Method invoked with incorrect value for custom thread" << endl; > + return TestFail; > + } > + > + return TestPass; > + } > + > + void cleanup() > + { > + thread_.exit(0); > + thread_.wait(); > + } > + > +private: > + Thread thread_; > +}; > + > +TEST_REGISTER(ObjectInvokeTest) > -- > Regards, > > Laurent Pinchart > > _______________________________________________ > libcamera-devel mailing list > libcamera-devel@lists.libcamera.org > https://lists.libcamera.org/listinfo/libcamera-devel
diff --git a/test/meson.build b/test/meson.build index b2f809e60986..7c9abc630230 100644 --- a/test/meson.build +++ b/test/meson.build @@ -24,6 +24,7 @@ public_tests = [ internal_tests = [ ['camera-sensor', 'camera-sensor.cpp'], ['message', 'message.cpp'], + ['object-invoke', 'object-invoke.cpp'], ['signal-threads', 'signal-threads.cpp'], ['threads', 'threads.cpp'], ] diff --git a/test/object-invoke.cpp b/test/object-invoke.cpp new file mode 100644 index 000000000000..7221930f4380 --- /dev/null +++ b/test/object-invoke.cpp @@ -0,0 +1,137 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* + * Copyright (C) 2019, Google Inc. + * + * object-invoke.cpp - Cross-thread Object method invocation test + */ + +#include <chrono> +#include <iostream> +#include <thread> + +#include <libcamera/camera_manager.h> +#include <libcamera/event_dispatcher.h> +#include <libcamera/object.h> + +#include "thread.h" +#include "test.h" + +using namespace std; +using namespace libcamera; + +class InvokedObject : public Object +{ +public: + enum Status { + NoCall, + InvalidThread, + CallReceived, + }; + + InvokedObject() + : status_(NoCall) + { + } + + Status status() const { return status_; } + int value() const { return value_; } + void reset() + { + status_ = NoCall; + value_ = 0; + } + + void method(int value) + { + if (Thread::current() != thread()) + status_ = InvalidThread; + else + status_ = CallReceived; + + value_ = value; + } + +private: + Status status_; + int value_; +}; + +class ObjectInvokeTest : public Test +{ +protected: + int run() + { + EventDispatcher *dispatcher = CameraManager::instance()->eventDispatcher(); + InvokedObject object; + + /* + * Test that method invocation in the same thread goes through + * the event dispatcher. + */ + object.invokeMethod(&InvokedObject::method, 42); + + if (object.status() != InvokedObject::NoCall) { + cerr << "Method not invoked asynchronously" << endl; + return TestFail; + } + + dispatcher->processEvents(); + + switch (object.status()) { + case InvokedObject::NoCall: + cout << "Method not invoked for main thread" << endl; + return TestFail; + case InvokedObject::InvalidThread: + cout << "Method invoked in incorrect thread for main thread" << endl; + return TestFail; + default: + break; + } + + if (object.value() != 42) { + cout << "Method invoked with incorrect value for main thread" << endl; + return TestFail; + } + + /* + * Move the object to a thread and verify that the method is + * delivered in the correct thread. + */ + object.reset(); + object.moveToThread(&thread_); + + thread_.start(); + + object.invokeMethod(&InvokedObject::method, 42); + this_thread::sleep_for(chrono::milliseconds(100)); + + switch (object.status()) { + case InvokedObject::NoCall: + cout << "Method not invoked for custom thread" << endl; + return TestFail; + case InvokedObject::InvalidThread: + cout << "Method invoked in incorrect thread for custom thread" << endl; + return TestFail; + default: + break; + } + + if (object.value() != 42) { + cout << "Method invoked with incorrect value for custom thread" << endl; + return TestFail; + } + + return TestPass; + } + + void cleanup() + { + thread_.exit(0); + thread_.wait(); + } + +private: + Thread thread_; +}; + +TEST_REGISTER(ObjectInvokeTest)
The test verifies correct behaviour of asynchronous method invocation for Object instances. Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> --- test/meson.build | 1 + test/object-invoke.cpp | 137 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 138 insertions(+) create mode 100644 test/object-invoke.cpp