[{"id":2438,"web_url":"https://patchwork.libcamera.org/comment/2438/","msgid":"<20190817150002.GO16603@wyvern>","date":"2019-08-17T15:00:02","subject":"Re: [libcamera-devel] [PATCH 11/18] libcamera: event_notifier: Bind\n\tevent notifiers to 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 work.\n\nOn 2019-08-12 15:46:35 +0300, Laurent Pinchart wrote:\n> The EventNotifier instances are registered with the event dispatcher\n> instance of the CameraManager. This makes it impossible to use event\n> notifiers in other 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/event_notifier.h | 8 +++++++-\n> src/libcamera/event_notifier.cpp | 17 ++++++++++++++++-\n> 2 files changed, 23 insertions(+), 2 deletions(-)\n> \n> diff --git a/include/libcamera/event_notifier.h b/include/libcamera/event_notifier.h\n> index 1e9b6da1340c..f80945c743dc 100644\n> --- a/include/libcamera/event_notifier.h\n> +++ b/include/libcamera/event_notifier.h\n> @@ -7,11 +7,14 @@\n> #ifndef __LIBCAMERA_EVENT_NOTIFIER_H__\n> #define __LIBCAMERA_EVENT_NOTIFIER_H__\n> \n> +#include \n> #include \n> \n> namespace libcamera {\n> \n> -class EventNotifier\n> +class Message;\n> +\n> +class EventNotifier : public Object\n> {\n> public:\n> \tenum Type {\n> @@ -31,6 +34,9 @@ public:\n> \n> \tSignal activated;\n> \n> +protected:\n> +\tvoid message(Message *msg) override;\n> +\n> private:\n> \tint fd_;\n> \tType type_;\n> diff --git a/src/libcamera/event_notifier.cpp b/src/libcamera/event_notifier.cpp\n> index b32c7ed2d315..515e6d1770a1 100644\n> --- a/src/libcamera/event_notifier.cpp\n> +++ b/src/libcamera/event_notifier.cpp\n> @@ -10,6 +10,9 @@\n> #include \n> #include \n> \n> +#include \"message.h\"\n> +#include \"thread.h\"\n> +\n> /**\n> * \\file event_notifier.h\n> * \\brief File descriptor event notifier\n> @@ -103,7 +106,7 @@ void EventNotifier::setEnabled(bool enable)\n> \n> \tenabled_ = enable;\n> \n> -\tEventDispatcher *dispatcher = CameraManager::instance()->eventDispatcher();\n> +\tEventDispatcher *dispatcher = thread()->eventDispatcher();\n> \tif (enable)\n> \t\tdispatcher->registerEventNotifier(this);\n> \telse\n> @@ -119,4 +122,16 @@ void EventNotifier::setEnabled(bool enable)\n> * parameter.\n> */\n> \n> +void EventNotifier::message(Message *msg)\n> +{\n> +\tif (msg->type() == Message::ThreadMoveMessage) {\n> +\t\tif (enabled_) {\n> +\t\t\tsetEnabled(false);\n> +\t\t\tinvokeMethod(this, &EventNotifier::setEnabled, true);\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-x542.google.com (mail-ed1-x542.google.com\n\t[IPv6:2a00:1450:4864:20::542])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 798E3600F9\n\tfor ;\n\tSat, 17 Aug 2019 17:00:05 +0200 (CEST)","by mail-ed1-x542.google.com with SMTP id x19so7506936eda.12\n\tfor ;\n\tSat, 17 Aug 2019 08:00:05 -0700 (PDT)","from localhost ([185.224.57.161]) by smtp.gmail.com with ESMTPSA id\n\tx42sm1678067ede.24.2019.08.17.08.00.03\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tSat, 17 Aug 2019 08:00:04 -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=j1wVv1pCLrQMMZqHc6aLDkbayPy64dYlP1geC9fC+fk=;\n\tb=pL8q1qs50lZOMZRD+43utUh5U0ZTlJhLEfb8WUsNf/g4wyFHG4bEZW5cH9YO32Dntu\n\tw/gQ5TLDj6AI4StgM2e4W9uLBU/9RDH3Pd+Xc2EW4LBTuYRiCKJS+a8t86Evwa7Ie2x8\n\t+3gZplbN9VkaawnOosGj/g322R8Uz9g0TblpWuIv9fjRmjmRd74/oHmo5gyI/O8i63r6\n\tqIU+yI68neXUgXFVbFCxk8Mjlm9hu/B3k++FYcDYDjx4u0BhITPjJOHSGX7ZwSToZCdI\n\tydCMTUyN2JioBV+xWCz/aArvK4DyhRQWwH4Hd9AodoI3N07wcgfP+TTybmtYrmhTM10i\n\tSbtw==","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=j1wVv1pCLrQMMZqHc6aLDkbayPy64dYlP1geC9fC+fk=;\n\tb=Gvd9NNbH/0tIulrxtUQxt75pTgiRZ8JKX0h8OCDekTTMOUe4Nwhbpw1NvX0Urt8PXo\n\tM37IrHcX1bPlQVHHENm/NyKq4oRCcddwiG+eTvE0Op5dj9lC1g40K7cmC0eGEc8JDr3v\n\tgD5tYts8BjBWW22jvYknIKpuDTJfZKSjOBhc3eJCYv2SZK96NhxE7HK9j4c/pY/oFxSs\n\tE2MSF58vjphJN9yg++LnYn9ohxej61SoDYcVzcKRMAeivvyD3Z6LElpH9xJfPkR16OxJ\n\tKGt5P8upElkQG856TtNyzqUADvu0xscjNZjKkcug9HxBx/phcKhwMiXotyQdzNxMQvso\n\taUlQ==","X-Gm-Message-State":"APjAAAVOzsbN9uSo0iFa0i3YDbA+xRBPE+EBt4Gt7AtKQcuuca0m1g2p\n\tVkI/5pdwqPomgSQNd1e9hIiUQj69/yc=","X-Google-Smtp-Source":"APXvYqzfT9zI0JyGxMEB1MXQk6zH+2vxQl75UjmsjCPfyV6abZ/o1J3b3aCIneUqPPdWR5SKn70aEQ==","X-Received":"by 2002:a17:906:ccc1:: with SMTP id\n\tot1mr14014005ejb.156.1566054005018; \n\tSat, 17 Aug 2019 08:00:05 -0700 (PDT)","Date":"Sat, 17 Aug 2019 17:00:02 +0200","From":"Niklas =?iso-8859-1?q?S=F6derlund?= ","To":"Laurent Pinchart ","Cc":"libcamera-devel@lists.libcamera.org","Message-ID":"<20190817150002.GO16603@wyvern>","References":"<20190812124642.24287-1-laurent.pinchart@ideasonboard.com>\n\t<20190812124642.24287-12-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-12-laurent.pinchart@ideasonboard.com>","User-Agent":"Mutt/1.12.1 (2019-06-15)","Subject":"Re: [libcamera-devel] [PATCH 11/18] libcamera: event_notifier: Bind\n\tevent notifiers to 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:00:05 -0000"}}]