From patchwork Sat Aug 17 15:20:55 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 1827 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 344A3600F9 for ; Sat, 17 Aug 2019 17:21:16 +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 CFDD998C 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=1566055276; bh=4c3IpK8GOvPcQ//PAYBvGPXhGFHrEfs2HidHXuGpxNE=; h=From:To:Subject:Date:In-Reply-To:References:From; b=iyeLhHiMef+YmjhiYpoPMsH21y/MjzgU8tSDMGWbOfihFNDpQjAQAX9fT46jZhsWq PCcOwniKRWuqDZqjyE1lm9bl2QyDl+Ar3iNyvahJdLwPYpyjHc3SrbUI0/Gr5D1Vkb 5FGWHMrjX6coz6f76aVqIRiX4noFzWohzItIq5EA= From: Laurent Pinchart To: libcamera-devel@lists.libcamera.org Date: Sat, 17 Aug 2019 18:20:55 +0300 Message-Id: <20190817152104.10834-10-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 09/18] test: Add Object class thread affinity 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 thread affinity and thread move notifications. Signed-off-by: Laurent Pinchart Reviewed-by: Jacopo Mondi Reviewed-by: Niklas Söderlund --- test/meson.build | 1 + test/object.cpp | 88 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 89 insertions(+) create mode 100644 test/object.cpp diff --git a/test/meson.build b/test/meson.build index 7c9abc630230..c6601813db78 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', 'object.cpp'], ['object-invoke', 'object-invoke.cpp'], ['signal-threads', 'signal-threads.cpp'], ['threads', 'threads.cpp'], diff --git a/test/object.cpp b/test/object.cpp new file mode 100644 index 000000000000..3f1f700d1b39 --- /dev/null +++ b/test/object.cpp @@ -0,0 +1,88 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* + * Copyright (C) 2019, Google Inc. + * + * object.cpp - Object tests + */ + +#include + +#include + +#include "message.h" +#include "thread.h" + +#include "test.h" + +using namespace std; +using namespace libcamera; + +class InstrumentedObject : public Object +{ +public: + enum Status { + NoMessage, + MessageReceived, + }; + + InstrumentedObject() + : status_(NoMessage) + { + } + + Status status() const { return status_; } + void reset() { status_ = NoMessage; } + +protected: + void message(Message *msg) override + { + if (msg->type() == Message::ThreadMoveMessage) + status_ = MessageReceived; + + Object::message(msg); + } + +private: + Status status_; +}; + +class ObjectTest : public Test +{ +protected: + int init() + { + a_ = new InstrumentedObject(); + return TestPass; + } + + int run() + { + /* Verify that moving an object to a different thread succeeds. */ + a_->moveToThread(&thread_); + + if (a_->thread() != &thread_ || a_->thread() == Thread::current()) { + cout << "Failed to move object to thread" << endl; + return TestFail; + } + + /* Verify that objects receive a ThreadMoveMessage when moved. */ + if (a_->status() != InstrumentedObject::MessageReceived) { + cout << "Moving object didn't deliver ThreadMoveMessage" << endl; + return TestFail; + } + + return TestPass; + } + + void cleanup() + { + delete a_; + } + +private: + InstrumentedObject *a_; + + Thread thread_; +}; + +TEST_REGISTER(ObjectTest)