From patchwork Sat Aug 17 15:20:54 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 1826 Return-Path: Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id DD1AB61932 for ; Sat, 17 Aug 2019 17:21:15 +0200 (CEST) Received: from pendragon.bb.dnainternet.fi (dfj612yhrgyx302h3jwwy-3.rev.dnainternet.fi [IPv6:2001:14ba:21f5:5b00:ce28:277f:58d7:3ca4]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 778B7556 for ; Sat, 17 Aug 2019 17:21:15 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1566055275; bh=5I5e4OvS/sL/8yEUrXmn1WlovVKSeJ58DKzXdqlmXXc=; h=From:To:Subject:Date:In-Reply-To:References:From; b=csJD5mMuohY1Gm9LQRsCH9/QU2bV8ObPCcsfWzSJsZ6X7+7xfgyKpbXn9vWEFvGU9 n1AuYG2KLqesd01xLXST3y/WURGpp28SOKKsYNBm5DVYMqA50OoQVuGerq/3Q37eIs EukqFevBfKTLJDIooG1yv+xjYFpmAN2t/EisAKjM= From: Laurent Pinchart To: libcamera-devel@lists.libcamera.org Date: Sat, 17 Aug 2019 18:20:54 +0300 Message-Id: <20190817152104.10834-9-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190817152104.10834-1-laurent.pinchart@ideasonboard.com> References: <20190817152104.10834-1-laurent.pinchart@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v2 08/18] test: Add Object::invokeMethod() test X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 17 Aug 2019 15:21:17 -0000 The test verifies correct behaviour of asynchronous method invocation for Object instances. Signed-off-by: Laurent Pinchart Reviewed-by: Jacopo Mondi Reviewed-by: Niklas Söderlund --- 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 +#include +#include + +#include +#include +#include + +#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)