{"id":15124,"url":"https://patchwork.libcamera.org/api/patches/15124/?format=json","web_url":"https://patchwork.libcamera.org/patch/15124/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/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":"<20211210205239.354901-2-jacopo@jmondi.org>","date":"2021-12-10T20:52:29","name":"[libcamera-devel,v5,01/11] libcamera: Print Timer identifier","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"d59c7761bf93106c6e81fd9540b537d9901fdf97","submitter":{"id":3,"url":"https://patchwork.libcamera.org/api/people/3/?format=json","name":"Jacopo Mondi","email":"jacopo@jmondi.org"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/15124/mbox/","series":[{"id":2837,"url":"https://patchwork.libcamera.org/api/series/2837/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=2837","date":"2021-12-10T20:52:28","name":"libcamera: Add fence","version":5,"mbox":"https://patchwork.libcamera.org/series/2837/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/15124/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/15124/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id 67BFCBF415\n\tfor ;\n\tFri, 10 Dec 2021 20:51:55 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 817BE60868;\n\tFri, 10 Dec 2021 21:51:53 +0100 (CET)","from relay11.mail.gandi.net (relay11.mail.gandi.net\n\t[217.70.178.231])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id C83D760868\n\tfor ;\n\tFri, 10 Dec 2021 21:51:51 +0100 (CET)","(Authenticated sender: jacopo@jmondi.org)\n\tby relay11.mail.gandi.net (Postfix) with ESMTPSA id 2D9D4100007;\n\tFri, 10 Dec 2021 20:51:51 +0000 (UTC)"],"From":"Jacopo Mondi ","To":"libcamera-devel@lists.libcamera.org","Date":"Fri, 10 Dec 2021 21:52:29 +0100","Message-Id":"<20211210205239.354901-2-jacopo@jmondi.org>","X-Mailer":"git-send-email 2.33.1","In-Reply-To":"<20211210205239.354901-1-jacopo@jmondi.org>","References":"<20211210205239.354901-1-jacopo@jmondi.org>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v5 01/11] libcamera: Print Timer identifier","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","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"The Timer debug output does not report to which timer a condition refers\nto. Fix that by printing the Timer address.\n\nSigned-off-by: Jacopo Mondi \nReviewed-by: Laurent Pinchart \n---\n src/libcamera/base/event_dispatcher_poll.cpp | 3 ++-\n src/libcamera/base/timer.cpp | 4 ++--\n 2 files changed, 4 insertions(+), 3 deletions(-)","diff":"diff --git a/src/libcamera/base/event_dispatcher_poll.cpp b/src/libcamera/base/event_dispatcher_poll.cpp\nindex 8ee22d5adcc4..7238a3165da8 100644\n--- a/src/libcamera/base/event_dispatcher_poll.cpp\n+++ b/src/libcamera/base/event_dispatcher_poll.cpp\n@@ -214,7 +214,8 @@ int EventDispatcherPoll::poll(std::vector *pollfds)\n \t\t\ttimeout = { 0, 0 };\n \n \t\tLOG(Event, Debug)\n-\t\t\t<< \"timeout \" << timeout.tv_sec << \".\"\n+\t\t\t<< \"next timer \" << nextTimer << \" expires in \"\n+\t\t\t<< timeout.tv_sec << \".\"\n \t\t\t<< std::setfill('0') << std::setw(9)\n \t\t\t<< timeout.tv_nsec;\n \t}\ndiff --git a/src/libcamera/base/timer.cpp b/src/libcamera/base/timer.cpp\nindex 9c54352d46bd..187336e3a1a4 100644\n--- a/src/libcamera/base/timer.cpp\n+++ b/src/libcamera/base/timer.cpp\n@@ -96,7 +96,7 @@ void Timer::start(std::chrono::milliseconds duration)\n void Timer::start(std::chrono::steady_clock::time_point deadline)\n {\n \tif (Thread::current() != thread()) {\n-\t\tLOG(Timer, Error) << \"Timer can't be started from another thread\";\n+\t\tLOG(Timer, Error) << \"Timer \" << this << \" << can't be started from another thread\";\n \t\treturn;\n \t}\n \n@@ -128,7 +128,7 @@ void Timer::stop()\n \t\treturn;\n \n \tif (Thread::current() != thread()) {\n-\t\tLOG(Timer, Error) << \"Timer can't be stopped from another thread\";\n+\t\tLOG(Timer, Error) << \"Timer \" << this << \" can't be stopped from another thread\";\n \t\treturn;\n \t}\n \n","prefixes":["libcamera-devel","v5","01/11"]}