[{"id":11751,"web_url":"https://patchwork.libcamera.org/comment/11751/","msgid":"<20200731142240.GF6218@pendragon.ideasonboard.com>","date":"2020-07-31T14:22:40","subject":"Re: [libcamera-devel] [PATCH v3 1/3] libcamera: thread: Support\n\tselective message dispatch to thread","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Umang,\n\nThank you for the patch.\n\nOn Fri, Jul 31, 2020 at 01:39:53PM +0000, Umang Jain wrote:\n> Extend the current dispatchMessages() to support dispatching of\n> selective messsages according to the Message::Type passed in\n> the function argument. dispatchMessages() can now be called\n> explicitly to force deliver selected type's message to the\n> thread for processing (typically when event loop is not\n> running).\n> \n> Signed-off-by: Umang Jain <email@uajain.com>\n\nReviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n\n> ---\n>  include/libcamera/internal/thread.h |  3 ++-\n>  src/libcamera/thread.cpp            | 30 ++++++++++++++++++++---------\n>  2 files changed, 23 insertions(+), 10 deletions(-)\n> \n> diff --git a/include/libcamera/internal/thread.h b/include/libcamera/internal/thread.h\n> index 7b59e58..f6367a8 100644\n> --- a/include/libcamera/internal/thread.h\n> +++ b/include/libcamera/internal/thread.h\n> @@ -14,6 +14,7 @@\n>  \n>  #include <libcamera/signal.h>\n>  \n> +#include \"libcamera/internal/message.h\"\n>  #include \"libcamera/internal/utils.h\"\n>  \n>  namespace libcamera {\n> @@ -47,7 +48,7 @@ public:\n>  \tEventDispatcher *eventDispatcher();\n>  \tvoid setEventDispatcher(std::unique_ptr<EventDispatcher> dispatcher);\n>  \n> -\tvoid dispatchMessages();\n> +\tvoid dispatchMessages(Message::Type type = Message::Type::None);\n>  \n>  protected:\n>  \tint exec();\n> diff --git a/src/libcamera/thread.cpp b/src/libcamera/thread.cpp\n> index d1750d7..7e318d9 100644\n> --- a/src/libcamera/thread.cpp\n> +++ b/src/libcamera/thread.cpp\n> @@ -552,25 +552,37 @@ void Thread::removeMessages(Object *receiver)\n>  }\n>  \n>  /**\n> - * \\brief Dispatch all posted messages for this thread\n> + * \\brief Dispatch posted messages for this thread\n> + * \\param[in] type The message type\n> + *\n> + * This function immediately dispatches all the messages previously posted for\n> + * this thread with postMessage() that match the message \\a type. If the \\a type\n> + * is Message::Type::None, all messages are dispatched.\n>   */\n> -void Thread::dispatchMessages()\n> +void Thread::dispatchMessages(Message::Type type)\n>  {\n>  \tMutexLocker locker(data_->messages_.mutex_);\n>  \n> -\twhile (!data_->messages_.list_.empty()) {\n> -\t\tstd::unique_ptr<Message> msg = std::move(data_->messages_.list_.front());\n> -\t\tdata_->messages_.list_.pop_front();\n> -\t\tif (!msg)\n> +\tstd::list<std::unique_ptr<Message>> &messages = data_->messages_.list_;\n> +\n> +\tfor (auto iter = messages.begin(); iter != messages.end(); ) {\n> +\t\tstd::unique_ptr<Message> &msg = *iter;\n> +\n> +\t\tif (!msg || (type != Message::Type::None && msg->type() != type)) {\n> +\t\t\t++iter;\n>  \t\t\tcontinue;\n> +\t\t}\n>  \n> -\t\tObject *receiver = msg->receiver_;\n> -\t\tASSERT(data_ == receiver->thread()->data_);\n> +\t\tstd::unique_ptr<Message> message = std::move(msg);\n> +\t\titer = data_->messages_.list_.erase(iter);\n>  \n> +\t\tObject *receiver = message->receiver_;\n> +\t\tASSERT(data_ == receiver->thread()->data_);\n>  \t\treceiver->pendingMessages_--;\n>  \n>  \t\tlocker.unlock();\n> -\t\treceiver->message(msg.get());\n> +\t\treceiver->message(message.get());\n> +\t\tmessage.reset();\n>  \t\tlocker.lock();\n>  \t}\n>  }","headers":{"Return-Path":"<libcamera-devel-bounces@lists.libcamera.org>","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 DCD14BD878\n\tfor <parsemail@patchwork.libcamera.org>;\n\tFri, 31 Jul 2020 14:22:51 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 5411461DE1;\n\tFri, 31 Jul 2020 16:22:51 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 90CC060398\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri, 31 Jul 2020 16:22:50 +0200 (CEST)","from pendragon.ideasonboard.com (81-175-216-236.bb.dnainternet.fi\n\t[81.175.216.236])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id F3D4F53C;\n\tFri, 31 Jul 2020 16:22:49 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"LI38iVUo\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1596205370;\n\tbh=cilRAJSa7TlRo0P8RtcZ2iWLHFkcROjZfmgE6n23m2Q=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=LI38iVUomVNVZ5hFTP1ya4xbm7rnnazHs01gUffsZWU1vNfHJtj4Dc1OdYhuaLcIP\n\t2OsRDKGau/3vYcSoMIL96LYMIDgOCQEWVc6/9L2AFN5qTlS0mQY7um1APTibqPx9sr\n\t6W8XZt+EfObMJe8kTe3ToEx0FU4dBpIIzDMIlZAw=","Date":"Fri, 31 Jul 2020 17:22:40 +0300","From":"Laurent Pinchart <laurent.pinchart@ideasonboard.com>","To":"Umang Jain <email@uajain.com>","Message-ID":"<20200731142240.GF6218@pendragon.ideasonboard.com>","References":"<20200731133947.84258-1-email@uajain.com>\n\t<20200731133947.84258-2-email@uajain.com>","MIME-Version":"1.0","Content-Disposition":"inline","In-Reply-To":"<20200731133947.84258-2-email@uajain.com>","Subject":"Re: [libcamera-devel] [PATCH v3 1/3] libcamera: thread: Support\n\tselective message dispatch to thread","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"<libcamera-devel.lists.libcamera.org>","List-Unsubscribe":"<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>","List-Archive":"<https://lists.libcamera.org/pipermail/libcamera-devel/>","List-Post":"<mailto:libcamera-devel@lists.libcamera.org>","List-Help":"<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>","List-Subscribe":"<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>","Cc":"libcamera-devel@lists.libcamera.org","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>"}}]