[{"id":2439,"web_url":"https://patchwork.libcamera.org/comment/2439/","msgid":"<20190817150111.GP16603@wyvern>","date":"2019-08-17T15:01:11","subject":"Re: [libcamera-devel] [PATCH 12/18] libcamera: timer: Bind timers\n\tto threads","submitter":{"id":5,"url":"https://patchwork.libcamera.org/api/people/5/","name":"Niklas Söderlund","email":"niklas.soderlund@ragnatech.se"},"content":"Hi Laurent,\n\nThanks for your patch.\n\nOn 2019-08-12 15:46:36 +0300, Laurent Pinchart wrote:\n> The Timer instances are registered with the event dispatcher instance of\n> the CameraManager. This makes it impossible to use timers in other\n> threads.\n> \n> Fix this by inheriting from Object, which allows binding instances to a\n> thread, and register them with the event dispatcher for the thread they\n> are bound to.\n> \n> Signed-off-by: Laurent Pinchart \n\nReviewed-by: Niklas Söderlund \n\n> ---\n> include/libcamera/timer.h | 11 ++++++++++-\n> src/libcamera/timer.cpp | 28 ++++++++++++++++++++++++++--\n> 2 files changed, 36 insertions(+), 3 deletions(-)\n> \n> diff --git a/include/libcamera/timer.h b/include/libcamera/timer.h\n> index f082339b1fed..853808e07da8 100644\n> --- a/include/libcamera/timer.h\n> +++ b/include/libcamera/timer.h\n> @@ -9,11 +9,14 @@\n> \n> #include \n> \n> +#include \n> #include \n> \n> namespace libcamera {\n> \n> -class Timer\n> +class Message;\n> +\n> +class Timer : public Object\n> {\n> public:\n> \tTimer();\n> @@ -28,7 +31,13 @@ public:\n> \n> \tSignal timeout;\n> \n> +protected:\n> +\tvoid message(Message *msg) override;\n> +\n> private:\n> +\tvoid registerTimer();\n> +\tvoid unregisterTimer();\n> +\n> \tunsigned int interval_;\n> \tuint64_t deadline_;\n> };\n> diff --git a/src/libcamera/timer.cpp b/src/libcamera/timer.cpp\n> index 0dcb4e767be3..21c0a444cdce 100644\n> --- a/src/libcamera/timer.cpp\n> +++ b/src/libcamera/timer.cpp\n> @@ -13,6 +13,8 @@\n> #include \n> \n> #include \"log.h\"\n> +#include \"message.h\"\n> +#include \"thread.h\"\n> \n> /**\n> * \\file timer.h\n> @@ -66,7 +68,7 @@ void Timer::start(unsigned int msec)\n> \t\t<< \"Starting timer \" << this << \" with interval \"\n> \t\t<< msec << \": deadline \" << deadline_;\n> \n> -\tCameraManager::instance()->eventDispatcher()->registerTimer(this);\n> +\tregisterTimer();\n> }\n> \n> /**\n> @@ -79,11 +81,21 @@ void Timer::start(unsigned int msec)\n> */\n> void Timer::stop()\n> {\n> -\tCameraManager::instance()->eventDispatcher()->unregisterTimer(this);\n> +\tunregisterTimer();\n> \n> \tdeadline_ = 0;\n> }\n> \n> +void Timer::registerTimer()\n> +{\n> +\tthread()->eventDispatcher()->registerTimer(this);\n> +}\n> +\n> +void Timer::unregisterTimer()\n> +{\n> +\tthread()->eventDispatcher()->unregisterTimer(this);\n> +}\n> +\n> /**\n> * \\brief Check if the timer is running\n> * \\return True if the timer is running, false otherwise\n> @@ -112,4 +124,16 @@ bool Timer::isRunning() const\n> * The timer pointer is passed as a parameter.\n> */\n> \n> +void Timer::message(Message *msg)\n> +{\n> +\tif (msg->type() == Message::ThreadMoveMessage) {\n> +\t\tif (deadline_) {\n> +\t\t\tunregisterTimer();\n> +\t\t\tinvokeMethod(this, &Timer::registerTimer);\n> +\t\t}\n> +\t}\n> +\n> +\tObject::message(msg);\n> +}\n> +\n> } /* namespace libcamera */\n> -- \n> Regards,\n> \n> Laurent Pinchart\n> \n> _______________________________________________\n> libcamera-devel mailing list\n> libcamera-devel@lists.libcamera.org\n> https://lists.libcamera.org/listinfo/libcamera-devel","headers":{"Return-Path":"","Received":["from mail-ed1-x544.google.com (mail-ed1-x544.google.com\n\t[IPv6:2a00:1450:4864:20::544])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id F0A1C600F9\n\tfor ;\n\tSat, 17 Aug 2019 17:01:15 +0200 (CEST)","by mail-ed1-x544.google.com with SMTP id p28so7537020edi.3\n\tfor ;\n\tSat, 17 Aug 2019 08:01:15 -0700 (PDT)","from localhost ([185.224.57.161]) by smtp.gmail.com with ESMTPSA id\n\tx21sm1679797edb.0.2019.08.17.08.01.14\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tSat, 17 Aug 2019 08:01:15 -0700 (PDT)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=ragnatech-se.20150623.gappssmtp.com; s=20150623;\n\th=date:from:to:cc:subject:message-id:references:mime-version\n\t:content-disposition:content-transfer-encoding:in-reply-to\n\t:user-agent; bh=V8LMPEAAQ3ssi6/kO//q52oGbtNFM/LR8C+RKsW7rRA=;\n\tb=mDg3FhVJAIXlsYHkq9SgPf/G1MhNTJvnGqe9J76k3CBMtfOqEGkp6UfYXtYzkNvBbG\n\tjaom+PuJTMMh0uOzvAmtd8o3wtPm3FNlJaEKVGwDbTlRKEVQbkCAeHFY6UJJpIAlxzYv\n\tNDtUOYCu5NGZaWVXwqJqTcibLo0qgmdwOtBSHUQyC2fgO1WbnCt5iHS4RCoWi1MxhvoB\n\tmRg4anrB5yRKwSG0Pc7ELC92Y6l5MMvxI0w+X0hKR44W0GdplJ3CrYu7a0AnAHVcnqxY\n\taf7Wg9JusqIXN1o9ub38lLlycLFodnYpKi+Ca3HbAeX/py4laTJjJVRUEZ/KGv8aFJVM\n\tfZmQ==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:date:from:to:cc:subject:message-id:references\n\t:mime-version:content-disposition:content-transfer-encoding\n\t:in-reply-to:user-agent;\n\tbh=V8LMPEAAQ3ssi6/kO//q52oGbtNFM/LR8C+RKsW7rRA=;\n\tb=UanPB1emJWCjWkbvUaTpLrcx1fmCBGTfDskdke5c8fza2u/kaVfF+9mLpjGpY3NYgQ\n\tG5FhUAN6vJeXwa4u/2iETD9mWpg26RAzcWWj8oZLxQWUUOTtzB+ExSZ+y635YVLTFC9W\n\t9qVfb0niwNjrbmdD1Qfi5xRgO6CKgOpeZMpOqjhve8QCKjCrVfKVRkYW0aN/k7JdruAN\n\t/QddgUcE7XiLF2BeaYKoOCPbx0ezLFjsMBPq0+HrAZBd1yBzrz6La8+DpB5/iNVM1yLH\n\t/R8eSBPzYVbhykAE0raKc6FqsSLiANbnWPAnjovH+KSmT7qIroe3XgzsyZ1IEj5Tj1it\n\tfqxA==","X-Gm-Message-State":"APjAAAXpGGFJk3fil3LdmD48mM1UqJkfTrWNLBnimNs2dfbprKFWRg5G\n\tdyfyNGhUTgMT3VQoWKRoD57/E6I7O7Y=","X-Google-Smtp-Source":"APXvYqwZXUiQdZBt+nW0Z9WTiNd8s9uQUB2kasRwwZfDGGRHWWuWPDN38sTc0+NnHsWXypNf1p5leQ==","X-Received":"by 2002:aa7:c542:: with SMTP id\n\ts2mr16572579edr.164.1566054075687; \n\tSat, 17 Aug 2019 08:01:15 -0700 (PDT)","Date":"Sat, 17 Aug 2019 17:01:11 +0200","From":"Niklas =?iso-8859-1?q?S=F6derlund?= ","To":"Laurent Pinchart ","Cc":"libcamera-devel@lists.libcamera.org","Message-ID":"<20190817150111.GP16603@wyvern>","References":"<20190812124642.24287-1-laurent.pinchart@ideasonboard.com>\n\t<20190812124642.24287-13-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=iso-8859-1","Content-Disposition":"inline","Content-Transfer-Encoding":"8bit","In-Reply-To":"<20190812124642.24287-13-laurent.pinchart@ideasonboard.com>","User-Agent":"Mutt/1.12.1 (2019-06-15)","Subject":"Re: [libcamera-devel] [PATCH 12/18] libcamera: timer: Bind timers\n\tto threads","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.23","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","X-List-Received-Date":"Sat, 17 Aug 2019 15:01:16 -0000"}}]