{"id":1788,"url":"https://patchwork.libcamera.org/api/patches/1788/?format=json","web_url":"https://patchwork.libcamera.org/patch/1788/","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":"<20190812124642.24287-11-laurent.pinchart@ideasonboard.com>","date":"2019-08-12T12:46:34","name":"[libcamera-devel,10/18] libcamera: camera_manager: Bind CameraManager to threads","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"93704ebacf187efc317b14e27bcefa9f2acd4c82","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/?format=json","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/1788/mbox/","series":[{"id":455,"url":"https://patchwork.libcamera.org/api/series/455/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=455","date":"2019-08-12T12:46:24","name":"Object & Thread enhancements","version":1,"mbox":"https://patchwork.libcamera.org/series/455/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/1788/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/1788/checks/","tags":{},"headers":{"Return-Path":"","Received":["from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id B99D86162B\n\tfor ;\n\tMon, 12 Aug 2019 14:46:52 +0200 (CEST)","from pendragon.bb.dnainternet.fi\n\t(dfj612yhrgyx302h3jwwy-3.rev.dnainternet.fi\n\t[IPv6:2001:14ba:21f5:5b00:ce28:277f:58d7:3ca4])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 49578327\n\tfor ;\n\tMon, 12 Aug 2019 14:46:52 +0200 (CEST)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1565614012;\n\tbh=GJPQyM1vOKlrUvUVGpr/bK32laCc2K+ei1Mz7VaXxYk=;\n\th=From:To:Subject:Date:In-Reply-To:References:From;\n\tb=K9GGxKkv8UH/NAt0HRPNu5OCg/B9yRA4EmwNw9M6J7HGEsZOLcbbO7M3sD2NyVjot\n\tMyb4gFYrzJdNRo9xzMGCep3OgedFqpEy7ALnQFZw/Ar4YTzuuhe+ixHOCXNC+e+S/i\n\tbciQAkNM5J//FYiyBS4YwQoWe+t7eKj2VrdJALjg=","From":"Laurent Pinchart ","To":"libcamera-devel@lists.libcamera.org","Date":"Mon, 12 Aug 2019 15:46:34 +0300","Message-Id":"<20190812124642.24287-11-laurent.pinchart@ideasonboard.com>","X-Mailer":"git-send-email 2.21.0","In-Reply-To":"<20190812124642.24287-1-laurent.pinchart@ideasonboard.com>","References":"<20190812124642.24287-1-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[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":"Mon, 12 Aug 2019 12:46:53 -0000"},"content":"The CameraManager class uses the event dispatcher of the current thread.\nThis makes the CameraManager::eventDispatcher() and\nCameraManager::setEventDispatcher() methods inconsistent, as they access\ndifferent event dispatcher instances depending on the calling thread.\n\nFix this by inheriting from the Object class, which binds the\nCameraManager to a thread, and use the event dispatcher of the bound\nthread.\n\nSigned-off-by: Laurent Pinchart \n---\n include/libcamera/camera_manager.h | 4 +++-\n src/libcamera/camera_manager.cpp | 4 ++--\n 2 files changed, 5 insertions(+), 3 deletions(-)","diff":"diff --git a/include/libcamera/camera_manager.h b/include/libcamera/camera_manager.h\nindex 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();\ndiff --git a/src/libcamera/camera_manager.cpp b/src/libcamera/camera_manager.cpp\nindex 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","prefixes":["libcamera-devel","10/18"]}