[{"id":2437,"web_url":"https://patchwork.libcamera.org/comment/2437/","msgid":"<20190817145710.GN16603@wyvern>","date":"2019-08-17T14:57:10","subject":"Re: [libcamera-devel] [PATCH 10/18] libcamera: camera_manager: Bind\n\tCameraManager 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:34 +0300, Laurent Pinchart wrote:\n> The CameraManager class uses the event dispatcher of the current thread.\n> This makes the CameraManager::eventDispatcher() and\n> CameraManager::setEventDispatcher() methods inconsistent, as they access\n> different event dispatcher instances depending on the calling thread.\n> \n> Fix this by inheriting from the Object class, which binds the\n> CameraManager to a thread, and use the event dispatcher of the bound\n> thread.\n> \n> Signed-off-by: Laurent Pinchart \n\nReviewed-by: Niklas Söderlund \n\n> ---\n> include/libcamera/camera_manager.h | 4 +++-\n> src/libcamera/camera_manager.cpp | 4 ++--\n> 2 files changed, 5 insertions(+), 3 deletions(-)\n> \n> diff --git a/include/libcamera/camera_manager.h b/include/libcamera/camera_manager.h\n> index 0e8881baba40..ff7d4c7c6745 100644\n> --- a/include/libcamera/camera_manager.h\n> +++ b/include/libcamera/camera_manager.h\n> @@ -11,6 +11,8 @@\n> #include \n> #include \n> \n> +#include \n> +\n> namespace libcamera {\n> \n> class Camera;\n> @@ -18,7 +20,7 @@ class DeviceEnumerator;\n> class EventDispatcher;\n> class PipelineHandler;\n> \n> -class CameraManager\n> +class CameraManager : public Object\n> {\n> public:\n> \tint start();\n> diff --git a/src/libcamera/camera_manager.cpp b/src/libcamera/camera_manager.cpp\n> index 2cf014233b05..4a880684c5cb 100644\n> --- a/src/libcamera/camera_manager.cpp\n> +++ b/src/libcamera/camera_manager.cpp\n> @@ -248,7 +248,7 @@ CameraManager *CameraManager::instance()\n> */\n> void CameraManager::setEventDispatcher(std::unique_ptr dispatcher)\n> {\n> -\tThread::current()->setEventDispatcher(std::move(dispatcher));\n> +\tthread()->setEventDispatcher(std::move(dispatcher));\n> }\n> \n> /**\n> @@ -264,7 +264,7 @@ void CameraManager::setEventDispatcher(std::unique_ptr dispatch\n> */\n> EventDispatcher *CameraManager::eventDispatcher()\n> {\n> -\treturn Thread::current()->eventDispatcher();\n> +\treturn thread()->eventDispatcher();\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 B4935600F9\n\tfor ;\n\tSat, 17 Aug 2019 16:57:12 +0200 (CEST)","by mail-ed1-x542.google.com with SMTP id p28so7531537edi.3\n\tfor ;\n\tSat, 17 Aug 2019 07:57:12 -0700 (PDT)","from localhost ([185.224.57.161]) by smtp.gmail.com with ESMTPSA id\n\tw24sm1689573edb.90.2019.08.17.07.57.11\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tSat, 17 Aug 2019 07:57:11 -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=5x/LBpS4dJzctEN5xjhmIb/sV6qN3ivhQLEZNyUXOfo=;\n\tb=Q6T9V3+LHsPy/rlkVU1joON23sdINESO0CUv8us8hpCQUqOxpSgIcV9amdIFXy2pm9\n\t1VgPHML+2X7tQLjAj5L6hAQ+yBS4mqGZ6lDtX+5MXKDHsDQs2AvcoLCaxpFDy4WyVxkX\n\teJK1dIbicj9kC47TjrBYQT44zfXWfAIRBtrWB/sAm3xeaphJ0fC9Di0/VeyzIHqmtqsX\n\tklfho65PqwPUpcibWxw7HSVQqcDJxF3Ib7CrgCtjY8axnW4JXsv4uRJEqAbyInScAKPg\n\tvlDCy1lFzK9UPQq8hdMmtrNP3gBck24znac9oAZIxOpePsCwLSyjQim6R32jp7hAtCQE\n\teSyg==","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=5x/LBpS4dJzctEN5xjhmIb/sV6qN3ivhQLEZNyUXOfo=;\n\tb=D9F0DUfCWclaJfLY/R7YPgGhPL5gnenV7kN/sX9OycYIMH1HbwXILrTbGDqnZKdDLN\n\tYYUPKRc0t3Y0D8ncChPYSgucl+YsxWPhtD90TIpfcKLI15pcCnwjI+vy6m7qOMRl8Mkj\n\t/pVF5GXt/nM+NhFSkiLJFFMYrJl4Xhp3HY2Kme3Hm23pIpl8iMQrJJr7pY2Lh7whNy2P\n\t+9nmN1COFoZCfdRkBsargMvAKuRshBo2cZ2kAjcKZtgdLhJzZkeKYT/VQZ7TWe0vvvRn\n\t7PoPVrSLqEFS5cyLZZWD2HAN9ThdOrxxsolveKTUt7g48yWwF+vs8r2WaHp3ZvNvEpPI\n\tvn1Q==","X-Gm-Message-State":"APjAAAUhk9/4K1YdAQ6q3Hq7MAom+XmBD9TAs7MIfFk+3e+xmdHMFXG5\n\tagAbxJa0CX0QlM7vJR5aFQD6Fw==","X-Google-Smtp-Source":"APXvYqyA/ViV5glV+y4Yiljy8RNNXlv/A6b+GtweoAuLrQas/3l8jG/jcdM2saET85gXfIk4PhyhHg==","X-Received":"by 2002:a17:906:7c4f:: with SMTP id\n\tg15mr13889802ejp.236.1566053832425; \n\tSat, 17 Aug 2019 07:57:12 -0700 (PDT)","Date":"Sat, 17 Aug 2019 16:57:10 +0200","From":"Niklas =?iso-8859-1?q?S=F6derlund?= ","To":"Laurent Pinchart ","Cc":"libcamera-devel@lists.libcamera.org","Message-ID":"<20190817145710.GN16603@wyvern>","References":"<20190812124642.24287-1-laurent.pinchart@ideasonboard.com>\n\t<20190812124642.24287-11-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-11-laurent.pinchart@ideasonboard.com>","User-Agent":"Mutt/1.12.1 (2019-06-15)","Subject":"Re: [libcamera-devel] [PATCH 10/18] libcamera: camera_manager: Bind\n\tCameraManager 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 14:57:12 -0000"}}]