{"id":2107,"url":"https://patchwork.libcamera.org/api/1.1/patches/2107/?format=json","web_url":"https://patchwork.libcamera.org/patch/2107/","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-3-laurent.pinchart@ideasonboard.com>","date":"2019-10-06T05:32:19","name":"[libcamera-devel,2/9] libcamera: timer: Don't reset deadline after time out","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"7f630b0f07fb2cafd2a4cad8dc0df85717ba83cb","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/2107/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/2107/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/2107/checks/","tags":{},"headers":{"Return-Path":"","Received":["from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 2F6476196C\n\tfor ;\n\tSun, 6 Oct 2019 07:32:36 +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 3C96873E\n\tfor ;\n\tSun, 6 Oct 2019 07:32:35 +0200 (CEST)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1570339955;\n\tbh=j1pj0IqYbtPk/mpshRjLG/+gpVQWXI+q/1SuPr2TdyE=;\n\th=From:To:Subject:Date:In-Reply-To:References:From;\n\tb=VYp9PMFladsZQWUcPyi2fQ3akmFbp6+By79aNSM9RhmRzQrwKPgOzhGDjFz9yivG0\n\tFDP56OncQJ4VtKD4H2CzoNTz5Heo/1oNe1ieGo244o9fRBv6YDMVI2kvNkoyw8nIAt\n\txBYJLKF96uzYVCCEAYINp8wzl4fdy149y+vYtVMc=","From":"Laurent Pinchart ","To":"libcamera-devel@lists.libcamera.org","Date":"Sun, 6 Oct 2019 08:32:19 +0300","Message-Id":"<20191006053226.8976-3-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 2/9] libcamera: timer: Don't reset\n\tdeadline after time out","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:36 -0000"},"content":"Users of the Timer class may benefit from retrieving the timer deadline\nafter it times out. This is currently not possible as the deadline is\nreset to 0 when the timer times out or is stopped. Fix this by not\nresetting the deadline, and adding a new running_ field to the Timer\nclass to implement isRunning().\n\nSigned-off-by: Laurent Pinchart \n---\n include/libcamera/timer.h | 1 +\n src/libcamera/timer.cpp | 8 ++++----\n 2 files changed, 5 insertions(+), 4 deletions(-)","diff":"diff --git a/include/libcamera/timer.h b/include/libcamera/timer.h\nindex 09f426a59993..3540efb41b6f 100644\n--- a/include/libcamera/timer.h\n+++ b/include/libcamera/timer.h\n@@ -39,6 +39,7 @@ private:\n \tvoid registerTimer();\n \tvoid unregisterTimer();\n \n+\tbool running_;\n \tstd::chrono::steady_clock::time_point deadline_;\n };\n \ndiff --git a/src/libcamera/timer.cpp b/src/libcamera/timer.cpp\nindex 34410bab0fb0..8c74e1015e43 100644\n--- a/src/libcamera/timer.cpp\n+++ b/src/libcamera/timer.cpp\n@@ -43,7 +43,7 @@ LOG_DEFINE_CATEGORY(Timer)\n * \\param[in] parent The parent Object\n */\n Timer::Timer(Object *parent)\n-\t: Object(parent)\n+\t: Object(parent), running_(false)\n {\n }\n \n@@ -89,17 +89,17 @@ void Timer::start(std::chrono::milliseconds duration)\n void Timer::stop()\n {\n \tunregisterTimer();\n-\n-\tdeadline_ = utils::time_point();\n }\n \n void Timer::registerTimer()\n {\n \tthread()->eventDispatcher()->registerTimer(this);\n+\trunning_ = true;\n }\n \n void Timer::unregisterTimer()\n {\n+\trunning_ = false;\n \tthread()->eventDispatcher()->unregisterTimer(this);\n }\n \n@@ -109,7 +109,7 @@ void Timer::unregisterTimer()\n */\n bool Timer::isRunning() const\n {\n-\treturn deadline_ != utils::time_point();\n+\treturn running_;\n }\n \n /**\n","prefixes":["libcamera-devel","2/9"]}