From patchwork Sun Oct 6 05:32:24 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 2112 Return-Path: Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id D1FB961565 for ; Sun, 6 Oct 2019 07:32:39 +0200 (CEST) Received: from pendragon.ideasonboard.com (modemcable151.96-160-184.mc.videotron.ca [184.160.96.151]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 467A073E for ; Sun, 6 Oct 2019 07:32:39 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1570339959; bh=n0oxRCU3o0jCj1C0jnXAE4by/bnEtj/Wxf0C+S2Ptg0=; h=From:To:Subject:Date:In-Reply-To:References:From; b=jn7WA6NG8yYyObSqXOBzwt03IgSNyQMGwkXfyGN9hN6oBk6Ad2O1qrluQZXRJC6uo zPDx+tr3DAvFxp6LdfCox5FwWTPg8Mb6kw6WUr5l0dzodaAYLBlVRMUZewxEst04B4 +IdQmLmLvbTp9rLr691UjF8ue7sg6+fkjUObu5OU= From: Laurent Pinchart To: libcamera-devel@lists.libcamera.org Date: Sun, 6 Oct 2019 08:32:24 +0300 Message-Id: <20191006053226.8976-8-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20191006053226.8976-1-laurent.pinchart@ideasonboard.com> References: <20191006053226.8976-1-laurent.pinchart@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH 7/9] test: timer-thread: Test starting a timer from another thread X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Oct 2019 05:32:40 -0000 Timers can't be started from another thread. Ensure that attempting to do so fails. Signed-off-by: Laurent Pinchart --- test/timer-thread.cpp | 58 ++++++++++++++++++++++++++++++++++--------- 1 file changed, 46 insertions(+), 12 deletions(-) diff --git a/test/timer-thread.cpp b/test/timer-thread.cpp index 5c1b4ac4a401..32853b4e80ef 100644 --- a/test/timer-thread.cpp +++ b/test/timer-thread.cpp @@ -8,6 +8,7 @@ #include #include +#include #include #include "test.h" @@ -26,6 +27,12 @@ public: timer_.start(100); } + void restart() + { + timeout_ = false; + timer_.start(100); + } + bool timeout() const { return timeout_; @@ -44,29 +51,56 @@ private: class TimerThreadTest : public Test { protected: + int init() + { + thread_.start(); + timeout_.moveToThread(&thread_); + + return TestPass; + } + int run() { - Thread thread; - thread.start(); + /* + * Test that the timer expires and emits the timeout signal in + * the thread it belongs to. + */ + this_thread::sleep_for(chrono::milliseconds(200)); - 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()) { + if (!timeout_.timeout()) { cout << "Timer expiration test failed" << endl; return TestFail; } + /* + * Test that starting the timer from another thread fails. We + * need to interrupt the event dispatcher to make sure we don't + * succeed simply because the event dispatcher hasn't noticed + * the timer restart. + */ + timeout_.restart(); + thread_.eventDispatcher()->interrupt(); + + this_thread::sleep_for(chrono::milliseconds(200)); + + if (timeout_.timeout()) { + cout << "Timer restart test failed" << endl; + return TestFail; + } + return TestPass; } + void cleanup() + { + /* Must stop thread before destroying timeout. */ + thread_.exit(0); + thread_.wait(); + } + private: + TimeoutHandler timeout_; + Thread thread_; }; TEST_REGISTER(TimerThreadTest)