From patchwork Sun Oct 6 05:32:22 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 2110 Return-Path: Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 86E4061966 for ; Sun, 6 Oct 2019 07:32:38 +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 E81AADD for ; Sun, 6 Oct 2019 07:32:37 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1570339958; bh=ImhNCsB9BuFvCR5zNPTeOikzRwJgDOrb5WEyZPJzm6I=; h=From:To:Subject:Date:In-Reply-To:References:From; b=Tb5UdfAqnNjSC7YpuQWncKKYRy3GkO7/kqDKO/35f4jL710crM6ClPgdBFSCKuVPI hyKla0ii/J5sCZDYG5IUA5GWJyo7+TGUJ0MKtQz/pqyv0lmkw9psVihBxqFnXD7Ike Jbui9k0aDJDx75AXmB0DmUZ3D+HqSdibKPXShvuU= From: Laurent Pinchart To: libcamera-devel@lists.libcamera.org Date: Sun, 6 Oct 2019 08:32:22 +0300 Message-Id: <20191006053226.8976-6-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 5/9] libcamera: timer: Allow restarting a timer before expiration 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:38 -0000 The Timer API allows restarting a timer before expiration. This isn't correctly implemented, fix it. Signed-off-by: Laurent Pinchart --- src/libcamera/timer.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/libcamera/timer.cpp b/src/libcamera/timer.cpp index 8c74e1015e43..5d4e52713e6e 100644 --- a/src/libcamera/timer.cpp +++ b/src/libcamera/timer.cpp @@ -75,6 +75,9 @@ void Timer::start(std::chrono::milliseconds duration) << duration.count() << ": deadline " << utils::time_point_to_string(deadline_); + if (isRunning()) + unregisterTimer(); + registerTimer(); } @@ -88,6 +91,9 @@ void Timer::start(std::chrono::milliseconds duration) */ void Timer::stop() { + if (!isRunning()) + return; + unregisterTimer(); }