{"id":2110,"url":"https://patchwork.libcamera.org/api/1.1/patches/2110/?format=json","web_url":"https://patchwork.libcamera.org/patch/2110/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20191006053226.8976-6-laurent.pinchart@ideasonboard.com>","date":"2019-10-06T05:32:22","name":"[libcamera-devel,5/9] libcamera: timer: Allow restarting a timer before expiration","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"3c0282b5a35bb5c9f2cc7e9b78fe691bec9a4b26","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/1.1/people/2/?format=json","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/2110/mbox/","series":[{"id":522,"url":"https://patchwork.libcamera.org/api/1.1/series/522/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=522","date":"2019-10-06T05:32:17","name":"Timer fixes and enhancements","version":1,"mbox":"https://patchwork.libcamera.org/series/522/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/2110/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/2110/checks/","tags":{},"headers":{"Return-Path":"","Received":["from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 86E4061966\n\tfor ;\n\tSun, 6 Oct 2019 07:32:38 +0200 (CEST)","from pendragon.ideasonboard.com\n\t(modemcable151.96-160-184.mc.videotron.ca [184.160.96.151])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id E81AADD\n\tfor ;\n\tSun, 6 Oct 2019 07:32:37 +0200 (CEST)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1570339958;\n\tbh=ImhNCsB9BuFvCR5zNPTeOikzRwJgDOrb5WEyZPJzm6I=;\n\th=From:To:Subject:Date:In-Reply-To:References:From;\n\tb=Tb5UdfAqnNjSC7YpuQWncKKYRy3GkO7/kqDKO/35f4jL710crM6ClPgdBFSCKuVPI\n\thyKla0ii/J5sCZDYG5IUA5GWJyo7+TGUJ0MKtQz/pqyv0lmkw9psVihBxqFnXD7Ike\n\tJbui9k0aDJDx75AXmB0DmUZ3D+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","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH 5/9] libcamera: timer: Allow restarting a\n\ttimer before expiration","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","X-List-Received-Date":"Sun, 06 Oct 2019 05:32:38 -0000"},"content":"The Timer API allows restarting a timer before expiration. This isn't\ncorrectly implemented, fix it.\n\nSigned-off-by: Laurent Pinchart \n---\n src/libcamera/timer.cpp | 6 ++++++\n 1 file changed, 6 insertions(+)","diff":"diff --git a/src/libcamera/timer.cpp b/src/libcamera/timer.cpp\nindex 8c74e1015e43..5d4e52713e6e 100644\n--- a/src/libcamera/timer.cpp\n+++ b/src/libcamera/timer.cpp\n@@ -75,6 +75,9 @@ void Timer::start(std::chrono::milliseconds duration)\n \t\t<< duration.count() << \": deadline \"\n \t\t<< utils::time_point_to_string(deadline_);\n \n+\tif (isRunning())\n+\t\tunregisterTimer();\n+\n \tregisterTimer();\n }\n \n@@ -88,6 +91,9 @@ void Timer::start(std::chrono::milliseconds duration)\n */\n void Timer::stop()\n {\n+\tif (!isRunning())\n+\t\treturn;\n+\n \tunregisterTimer();\n }\n \n","prefixes":["libcamera-devel","5/9"]}