{"id":167,"url":"https://patchwork.libcamera.org/api/patches/167/?format=json","web_url":"https://patchwork.libcamera.org/patch/167/","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":"<20190107231151.23291-5-laurent.pinchart@ideasonboard.com>","date":"2019-01-07T23:11:44","name":"[libcamera-devel,v2,04/11] libcamera: camera_manager: Make the class a singleton","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"ed8049205e7b0a1b7827f2e15bfed37fb3051bdc","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/167/mbox/","series":[{"id":56,"url":"https://patchwork.libcamera.org/api/series/56/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=56","date":"2019-01-07T23:11:40","name":"libcamera: Add event notification and timers","version":2,"mbox":"https://patchwork.libcamera.org/series/56/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/167/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/167/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 D2A1B60B31\n\tfor ;\n\tTue, 8 Jan 2019 00:10:48 +0100 (CET)","from avalon.bb.dnainternet.fi\n\t(dfj612ybrt5fhg77mgycy-3.rev.dnainternet.fi\n\t[IPv6:2001:14ba:21f5:5b00:2e86:4862:ef6a:2804])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 707A8E4E\n\tfor ;\n\tTue, 8 Jan 2019 00:10:48 +0100 (CET)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1546902648;\n\tbh=UJI6UaC1EAZPRNdZguGohhk0zzUbkT6HuCDJAn3gmjM=;\n\th=From:To:Subject:Date:In-Reply-To:References:From;\n\tb=l8YXNdCfEDginB8ahFaBQ6kQExpj3/sKlrKqCrwj+1K46iJp6ByonRzTG2reQMca9\n\tyOkpzVACUvYCoaBy8sEJjZxkALGLEw/pauhbyXrHIoHZqV3qCHoVhpDA5i6agQkDq3\n\tltlFuYVHmf2OWWdxdWDTOnUuZh5sBVuqkU1hzZHk=","From":"Laurent Pinchart ","To":"libcamera-devel@lists.libcamera.org","Date":"Tue, 8 Jan 2019 01:11:44 +0200","Message-Id":"<20190107231151.23291-5-laurent.pinchart@ideasonboard.com>","X-Mailer":"git-send-email 2.19.2","In-Reply-To":"<20190107231151.23291-1-laurent.pinchart@ideasonboard.com>","References":"<20190107231151.23291-1-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=UTF-8","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v2 04/11] libcamera: camera_manager: Make\n\tthe class a singleton","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, 07 Jan 2019 23:10:49 -0000"},"content":"There can only be a single camera manager instance in the application.\nCreating it as a singleton helps avoiding mistakes. It also allows the\ncamera manager to be used as a storage of global data, such as the\nfuture event dispatcher.\n\nSigned-off-by: Laurent Pinchart \nReviewed-by: Niklas Söderlund \nReviewed-by: Jacopo Mondi \n---\nChanges since v1:\n\n- Delete copy constructor and assignment operator\n- Fix documentation style issue\n---\n include/libcamera/camera_manager.h | 8 ++++++--\n src/libcamera/camera_manager.cpp | 15 +++++++++++++++\n test/list.cpp | 7 +------\n 3 files changed, 22 insertions(+), 8 deletions(-)","diff":"diff --git a/include/libcamera/camera_manager.h b/include/libcamera/camera_manager.h\nindex 2768a5bd2384..e14da0f893b3 100644\n--- a/include/libcamera/camera_manager.h\n+++ b/include/libcamera/camera_manager.h\n@@ -19,15 +19,19 @@ class PipelineHandler;\n class CameraManager\n {\n public:\n-\tCameraManager();\n-\n \tint start();\n \tvoid stop();\n \n \tstd::vector list() const;\n \tCamera *get(const std::string &name);\n \n+\tstatic CameraManager *instance();\n+\n private:\n+\tCameraManager();\n+\tCameraManager(const CameraManager &) = delete;\n+\tvoid operator=(const CameraManager &) = delete;\n+\n \tDeviceEnumerator *enumerator_;\n \tstd::vector pipes_;\n };\ndiff --git a/src/libcamera/camera_manager.cpp b/src/libcamera/camera_manager.cpp\nindex 50a805fc665c..1a9d2f38e3b9 100644\n--- a/src/libcamera/camera_manager.cpp\n+++ b/src/libcamera/camera_manager.cpp\n@@ -161,4 +161,19 @@ Camera *CameraManager::get(const std::string &name)\n \treturn nullptr;\n }\n \n+/**\n+ * \\brief Retrieve the camera manager instance\n+ *\n+ * The CameraManager is a singleton and can't be constructed manually. This\n+ * function shall instead be used to retrieve the single global instance of the\n+ * manager.\n+ *\n+ * \\return The camera manager instance\n+ */\n+CameraManager *CameraManager::instance()\n+{\n+\tstatic CameraManager manager;\n+\treturn &manager;\n+}\n+\n } /* namespace libcamera */\ndiff --git a/test/list.cpp b/test/list.cpp\nindex 39b8a41d1fef..e2026c99c5b8 100644\n--- a/test/list.cpp\n+++ b/test/list.cpp\n@@ -19,10 +19,7 @@ class ListTest : public Test\n protected:\n \tint init()\n \t{\n-\t\tcm = new CameraManager();\n-\t\tif (!cm)\n-\t\t\treturn -ENOMEM;\n-\n+\t\tcm = CameraManager::instance();\n \t\tcm->start();\n \n \t\treturn 0;\n@@ -43,8 +40,6 @@ protected:\n \tvoid cleanup()\n \t{\n \t\tcm->stop();\n-\n-\t\tdelete cm;\n \t}\n \n private:\n","prefixes":["libcamera-devel","v2","04/11"]}