{"id":3237,"url":"https://patchwork.libcamera.org/api/1.1/patches/3237/?format=json","web_url":"https://patchwork.libcamera.org/patch/3237/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/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":"<20200321180951.32685-2-laurent.pinchart@ideasonboard.com>","date":"2020-03-21T18:09:51","name":"[libcamera-devel,2/2] libcamera: device_enumerator: Convey device ownership through unique_ptr","commit_ref":"9ab024f7c27d9b6b3ab433502eab02d4a29a3da4","pull_url":null,"state":"accepted","archived":false,"hash":"c5d30dd4f57c39dcfed2c5c7012a9373b1a417e0","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/1.1/people/2/?format=json","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/3237/mbox/","series":[{"id":755,"url":"https://patchwork.libcamera.org/api/1.1/series/755/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=755","date":"2020-03-21T18:09:50","name":"[libcamera-devel,1/2] libcamera: device_enumerator_udev: Update pending list in addUdevDevice","version":1,"mbox":"https://patchwork.libcamera.org/series/755/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/3237/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/3237/checks/","tags":{},"headers":{"Return-Path":"","Received":["from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 8269760415\n\tfor ;\n\tSat, 21 Mar 2020 19:10:03 +0100 (CET)","from pendragon.bb.dnainternet.fi (81-175-216-236.bb.dnainternet.fi\n\t[81.175.216.236])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 26802B27\n\tfor ;\n\tSat, 21 Mar 2020 19:10:03 +0100 (CET)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1584814203;\n\tbh=hsv2m40wsibcz0l4Cb28SrHblXudb0lLo6R1sHZSJDA=;\n\th=From:To:Subject:Date:In-Reply-To:References:From;\n\tb=VAQuVzPAkBYoBabf9DaWIwHeWQr2dlmkrf42XAhpLzPR1DUzvGqF8iC4Jle7zf2yA\n\tufhslRZaaGYB3Xy5F1X2UKiP9gImPnzNalsEaQUxNEfjtHh6fcSmVXeVMUzjodylkZ\n\tyfIKMVK9u0qbIcMpnHht6VwDJwV6f03ZjEC0w/bY=","From":"Laurent Pinchart ","To":"libcamera-devel@lists.libcamera.org","Date":"Sat, 21 Mar 2020 20:09:51 +0200","Message-Id":"<20200321180951.32685-2-laurent.pinchart@ideasonboard.com>","X-Mailer":"git-send-email 2.24.1","In-Reply-To":"<20200321180951.32685-1-laurent.pinchart@ideasonboard.com>","References":"<20200321180951.32685-1-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH 2/2] libcamera: device_enumerator: Convey\n\tdevice ownership through unique_ptr","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","X-List-Received-Date":"Sat, 21 Mar 2020 18:10:03 -0000"},"content":"Replace usage of shared_ptr with unique_ptr to convey media device\nownership internally in the enumerators when creating the media device.\nOnce a media device has all its dependencies met, it is converted to a\nshared_ptr to keep the external API unchanged.\n\nSigned-off-by: Laurent Pinchart \n---\n src/libcamera/device_enumerator.cpp | 10 +++++-----\n src/libcamera/device_enumerator_sysfs.cpp | 8 ++++----\n src/libcamera/device_enumerator_udev.cpp | 8 ++++----\n src/libcamera/include/device_enumerator.h | 4 ++--\n src/libcamera/include/device_enumerator_sysfs.h | 2 +-\n src/libcamera/include/device_enumerator_udev.h | 8 ++++----\n 6 files changed, 20 insertions(+), 20 deletions(-)","diff":"diff --git a/src/libcamera/device_enumerator.cpp b/src/libcamera/device_enumerator.cpp\nindex 89ed67ebb115..dd17e3e32e6c 100644\n--- a/src/libcamera/device_enumerator.cpp\n+++ b/src/libcamera/device_enumerator.cpp\n@@ -208,9 +208,9 @@ DeviceEnumerator::~DeviceEnumerator()\n *\n * \\return Created media device instance on success, or nullptr otherwise\n */\n-std::shared_ptr DeviceEnumerator::createDevice(const std::string &deviceNode)\n+std::unique_ptr DeviceEnumerator::createDevice(const std::string &deviceNode)\n {\n-\tstd::shared_ptr media = std::make_shared(deviceNode);\n+\tstd::unique_ptr media = std::make_unique(deviceNode);\n \n \tint ret = media->populate();\n \tif (ret < 0) {\n@@ -236,12 +236,12 @@ std::shared_ptr DeviceEnumerator::createDevice(const std::string &d\n * This method shall be called after all members of the entities of the\n * media graph have been confirmed to be initialized.\n */\n-void DeviceEnumerator::addDevice(const std::shared_ptr &media)\n+void DeviceEnumerator::addDevice(std::unique_ptr &&media)\n {\n \tLOG(DeviceEnumerator, Debug)\n \t\t<< \"Added device \" << media->deviceNode() << \": \" << media->driver();\n \n-\tdevices_.push_back(media);\n+\tdevices_.push_back(std::move(media));\n }\n \n /**\n@@ -290,7 +290,7 @@ void DeviceEnumerator::removeDevice(const std::string &deviceNode)\n */\n std::shared_ptr DeviceEnumerator::search(const DeviceMatch &dm)\n {\n-\tfor (std::shared_ptr media : devices_) {\n+\tfor (std::shared_ptr &media : devices_) {\n \t\tif (media->busy())\n \t\t\tcontinue;\n \ndiff --git a/src/libcamera/device_enumerator_sysfs.cpp b/src/libcamera/device_enumerator_sysfs.cpp\nindex 197ca235879b..3446db59e9d4 100644\n--- a/src/libcamera/device_enumerator_sysfs.cpp\n+++ b/src/libcamera/device_enumerator_sysfs.cpp\n@@ -72,11 +72,11 @@ int DeviceEnumeratorSysfs::enumerate()\n \t\t\tcontinue;\n \t\t}\n \n-\t\tstd::shared_ptr media = createDevice(devnode);\n+\t\tstd::unique_ptr media = createDevice(devnode);\n \t\tif (!media)\n \t\t\tcontinue;\n \n-\t\tif (populateMediaDevice(media) < 0) {\n+\t\tif (populateMediaDevice(media.get()) < 0) {\n \t\t\tLOG(DeviceEnumerator, Warning)\n \t\t\t\t<< \"Failed to populate media device \"\n \t\t\t\t<< media->deviceNode()\n@@ -84,7 +84,7 @@ int DeviceEnumeratorSysfs::enumerate()\n \t\t\tcontinue;\n \t\t}\n \n-\t\taddDevice(media);\n+\t\taddDevice(std::move(media));\n \t}\n \n \tclosedir(dir);\n@@ -92,7 +92,7 @@ int DeviceEnumeratorSysfs::enumerate()\n \treturn 0;\n }\n \n-int DeviceEnumeratorSysfs::populateMediaDevice(const std::shared_ptr &media)\n+int DeviceEnumeratorSysfs::populateMediaDevice(MediaDevice *media)\n {\n \t/* Associate entities to device node paths. */\n \tfor (MediaEntity *entity : media->entities()) {\ndiff --git a/src/libcamera/device_enumerator_udev.cpp b/src/libcamera/device_enumerator_udev.cpp\nindex ea3f6b7c9ae0..9cbc7e47d2d9 100644\n--- a/src/libcamera/device_enumerator_udev.cpp\n+++ b/src/libcamera/device_enumerator_udev.cpp\n@@ -76,7 +76,7 @@ int DeviceEnumeratorUdev::addUdevDevice(struct udev_device *dev)\n \t\treturn -ENODEV;\n \n \tif (!strcmp(subsystem, \"media\")) {\n-\t\tstd::shared_ptr media =\n+\t\tstd::unique_ptr media =\n \t\t\tcreateDevice(udev_device_get_devnode(dev));\n \t\tif (!media)\n \t\t\treturn -ENODEV;\n@@ -96,7 +96,7 @@ int DeviceEnumeratorUdev::addUdevDevice(struct udev_device *dev)\n \t\t\t\t<< \"Defer media device \" << media->deviceNode()\n \t\t\t\t<< \" due to \" << ret << \" missing dependencies\";\n \n-\t\t\tpending_.emplace_back(media, deps);\n+\t\t\tpending_.emplace_back(std::move(media), std::move(deps));\n \t\t\tMediaDeviceDeps *mediaDeps = &pending_.back();\n \t\t\tfor (const auto &dep : mediaDeps->deps_)\n \t\t\t\tdevMap_[dep.first] = mediaDeps;\n@@ -104,7 +104,7 @@ int DeviceEnumeratorUdev::addUdevDevice(struct udev_device *dev)\n \t\t\treturn 0;\n \t\t}\n \n-\t\taddDevice(media);\n+\t\taddDevice(std::move(media));\n \t\treturn 0;\n \t}\n \n@@ -319,7 +319,7 @@ int DeviceEnumeratorUdev::addV4L2Device(dev_t devnum)\n \t\tLOG(DeviceEnumerator, Debug)\n \t\t\t<< \"All dependencies for media device \"\n \t\t\t<< deps->media_->deviceNode() << \" found\";\n-\t\taddDevice(deps->media_);\n+\t\taddDevice(std::move(deps->media_));\n \t\tpending_.remove(*deps);\n \t}\n \ndiff --git a/src/libcamera/include/device_enumerator.h b/src/libcamera/include/device_enumerator.h\nindex 770f42772270..433e357aebae 100644\n--- a/src/libcamera/include/device_enumerator.h\n+++ b/src/libcamera/include/device_enumerator.h\n@@ -44,8 +44,8 @@ public:\n \tstd::shared_ptr search(const DeviceMatch &dm);\n \n protected:\n-\tstd::shared_ptr createDevice(const std::string &deviceNode);\n-\tvoid addDevice(const std::shared_ptr &media);\n+\tstd::unique_ptr createDevice(const std::string &deviceNode);\n+\tvoid addDevice(std::unique_ptr &&media);\n \tvoid removeDevice(const std::string &deviceNode);\n \n private:\ndiff --git a/src/libcamera/include/device_enumerator_sysfs.h b/src/libcamera/include/device_enumerator_sysfs.h\nindex 9063f6a75e11..5a5c9b0f5a31 100644\n--- a/src/libcamera/include/device_enumerator_sysfs.h\n+++ b/src/libcamera/include/device_enumerator_sysfs.h\n@@ -23,7 +23,7 @@ public:\n \tint enumerate();\n \n private:\n-\tint populateMediaDevice(const std::shared_ptr &media);\n+\tint populateMediaDevice(MediaDevice *media);\n \tstd::string lookupDeviceNode(int major, int minor);\n };\n \ndiff --git a/src/libcamera/include/device_enumerator_udev.h b/src/libcamera/include/device_enumerator_udev.h\nindex efaefe5dc4a3..fdce4520f33a 100644\n--- a/src/libcamera/include/device_enumerator_udev.h\n+++ b/src/libcamera/include/device_enumerator_udev.h\n@@ -43,9 +43,9 @@ private:\n \tusing DependencyMap = std::map>;\n \n \tstruct MediaDeviceDeps {\n-\t\tMediaDeviceDeps(const std::shared_ptr &media,\n-\t\t\t\tconst DependencyMap &deps)\n-\t\t\t: media_(media), deps_(deps)\n+\t\tMediaDeviceDeps(std::unique_ptr &&media,\n+\t\t\t\tDependencyMap &&deps)\n+\t\t\t: media_(std::move(media)), deps_(std::move(deps))\n \t\t{\n \t\t}\n \n@@ -54,7 +54,7 @@ private:\n \t\t\treturn media_ == other.media_;\n \t\t}\n \n-\t\tstd::shared_ptr media_;\n+\t\tstd::unique_ptr media_;\n \t\tDependencyMap deps_;\n \t};\n \n","prefixes":["libcamera-devel","2/2"]}