From patchwork Mon Aug 12 12:46:38 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 1792 Return-Path: Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 7156F6195A 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 052AC133B 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=1565614014; bh=is3HMNAflaXmLUYuYampcgBRRq3YdRYnFz1/UWukpqo=; h=From:To:Subject:Date:In-Reply-To:References:From; b=Eq34mV9BPVCPMSlKNWIzE3tEZhH+wt1On5xJApB+z+1Z/VTFPvoXY6ruNd5WvyxKE i3c0jRV/ApgGkrdWVwK7PM00m6eoGc4Fw/D0nOtWho9YFvwDrrbCygJ8BR21fHBzjx wa50B79A9rWs5alA72icLA96L9p5fRCaCvpGiius= From: Laurent Pinchart To: libcamera-devel@lists.libcamera.org Date: Mon, 12 Aug 2019 15:46:38 +0300 Message-Id: <20190812124642.24287-15-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 14/18] test: Add Timer 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:55 -0000 The test verifies correct behaviour of a running timer moved to a different thread. Signed-off-by: Laurent Pinchart --- src/libcamera/timer.cpp | 2 +- test/meson.build | 1 + test/timer-thread.cpp | 78 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 80 insertions(+), 1 deletion(-) create mode 100644 test/timer-thread.cpp diff --git a/src/libcamera/timer.cpp b/src/libcamera/timer.cpp index 21c0a444cdce..f45061d4c6f6 100644 --- a/src/libcamera/timer.cpp +++ b/src/libcamera/timer.cpp @@ -129,7 +129,7 @@ void Timer::message(Message *msg) if (msg->type() == Message::ThreadMoveMessage) { if (deadline_) { unregisterTimer(); - invokeMethod(this, &Timer::registerTimer); + invokeMethod(&Timer::registerTimer); } } diff --git a/test/meson.build b/test/meson.build index f695ffd7be44..05265b7d4976 100644 --- a/test/meson.build +++ b/test/meson.build @@ -29,6 +29,7 @@ internal_tests = [ ['object-invoke', 'object-invoke.cpp'], ['signal-threads', 'signal-threads.cpp'], ['threads', 'threads.cpp'], + ['timer-thread', 'timer-thread.cpp'], ] foreach t : public_tests diff --git a/test/timer-thread.cpp b/test/timer-thread.cpp new file mode 100644 index 000000000000..b9373050068c --- /dev/null +++ b/test/timer-thread.cpp @@ -0,0 +1,78 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* + * Copyright (C) 2019, Google Inc. + * + * timer-thread.cpp - Threaded timer test + */ + +#include +#include + +#include + +#include "test.h" +#include "thread.h" + +using namespace std; +using namespace libcamera; + +class TimeoutHandler : public Object +{ +public: + TimeoutHandler() + : timeout_(false) + { + timer_.timeout.connect(this, &TimeoutHandler::timeoutHandler); + timer_.start(100); + } + + bool timeout() const + { + return timeout_; + } + + void moveToThread(Thread *thread) + { + Object::moveToThread(thread); + timer_.moveToThread(thread); + } + +private: + void timeoutHandler(Timer *timer) + { + timeout_ = true; + } + + Timer timer_; + bool timeout_; +}; + +class TimerThreadTest : public Test +{ +protected: + int run() + { + Thread thread; + thread.start(); + + TimeoutHandler timeout; + timeout.moveToThread(&thread); + + this_thread::sleep_for(chrono::milliseconds(100)); + + /* Must stop thread before destroying timeout. */ + thread.exit(0); + thread.wait(); + + if (!timeout.timeout()) { + cout << "Timer expiration test failed" << endl; + return TestFail; + } + + return TestPass; + } + +private: +}; + +TEST_REGISTER(TimerThreadTest)