From patchwork Mon Aug 12 12:46:37 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 1791 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 10E9461623 for ; Mon, 12 Aug 2019 14:46:54 +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 9893A124E for ; Mon, 12 Aug 2019 14:46:53 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1565614013; bh=VSXTWHfirqfgjeX+OumSYkxyH4jZlyyj00vsHloC1fE=; h=From:To:Subject:Date:In-Reply-To:References:From; b=rqKDMwoebnjrzJpwmOQ6b9+iGUpoYzYw8qTRMzw0B7dIVt+8uYV1zHpdzYBotV+tm A/7RPUzSv0Zt+ATwYoMqz5YSPyP5JaYCH3N4KnNxoU35GRYJLRZ6nEIyoXwSX0LNet Xsv3YSOI/bGaGfkmvknRHtpOBB7dyVBQfSOgpvoI= From: Laurent Pinchart To: libcamera-devel@lists.libcamera.org Date: Mon, 12 Aug 2019 15:46:37 +0300 Message-Id: <20190812124642.24287-14-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190812124642.24287-1-laurent.pinchart@ideasonboard.com> References: <20190812124642.24287-1-laurent.pinchart@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH 13/18] test: Add EventNotifier thread move 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: Mon, 12 Aug 2019 12:46:54 -0000 The test verifies correct behaviour of an enabled event notifier moved to a different thread. Signed-off-by: Laurent Pinchart --- src/libcamera/event_notifier.cpp | 2 +- test/event-thread.cpp | 112 +++++++++++++++++++++++++++++++ test/meson.build | 1 + 3 files changed, 114 insertions(+), 1 deletion(-) create mode 100644 test/event-thread.cpp diff --git a/src/libcamera/event_notifier.cpp b/src/libcamera/event_notifier.cpp index 515e6d1770a1..96be27601982 100644 --- a/src/libcamera/event_notifier.cpp +++ b/src/libcamera/event_notifier.cpp @@ -127,7 +127,7 @@ void EventNotifier::message(Message *msg) if (msg->type() == Message::ThreadMoveMessage) { if (enabled_) { setEnabled(false); - invokeMethod(this, &EventNotifier::setEnabled, true); + invokeMethod(&EventNotifier::setEnabled, true); } } diff --git a/test/event-thread.cpp b/test/event-thread.cpp new file mode 100644 index 000000000000..4a82d49b94f1 --- /dev/null +++ b/test/event-thread.cpp @@ -0,0 +1,112 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* + * Copyright (C) 2019, Google Inc. + * + * event-thread.cpp - Threaded event test + */ + +#include +#include +#include +#include + +#include +#include + +#include "test.h" +#include "thread.h" + +using namespace std; +using namespace libcamera; + +class EventHandler : public Object +{ +public: + EventHandler() + { + pipe(pipefd_); + + notifier_ = new EventNotifier(pipefd_[0], EventNotifier::Read); + notifier_->activated.connect(this, &EventHandler::readReady); + } + + ~EventHandler() + { + delete notifier_; + + close(pipefd_[0]); + close(pipefd_[1]); + } + + int notify() + { + std::string data("H2G2"); + ssize_t ret; + + memset(data_, 0, sizeof(data_)); + size_ = 0; + + ret = write(pipefd_[1], data.data(), data.size()); + if (ret < 0) { + cout << "Pipe write failed" << endl; + return TestFail; + } + + return TestPass; + } + + bool notified() const + { + return notified_; + } + + void moveToThread(Thread *thread) + { + Object::moveToThread(thread); + notifier_->moveToThread(thread); + } + +private: + void readReady(EventNotifier *notifier) + { + size_ = read(notifier->fd(), data_, sizeof(data_)); + notified_ = true; + } + + EventNotifier *notifier_; + + int pipefd_[2]; + + bool notified_; + char data_[16]; + ssize_t size_; +}; + +class EventThreadTest : public Test +{ +protected: + int run() + { + Thread thread; + thread.start(); + + EventHandler handler; + 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()) { + cout << "Thread event handling test failed" << endl; + return TestFail; + } + + return TestPass; + } +}; + +TEST_REGISTER(EventThreadTest) diff --git a/test/meson.build b/test/meson.build index c6601813db78..f695ffd7be44 100644 --- a/test/meson.build +++ b/test/meson.build @@ -23,6 +23,7 @@ public_tests = [ internal_tests = [ ['camera-sensor', 'camera-sensor.cpp'], + ['event-thread', 'event-thread.cpp'], ['message', 'message.cpp'], ['object', 'object.cpp'], ['object-invoke', 'object-invoke.cpp'],