[{"id":4195,"web_url":"https://patchwork.libcamera.org/comment/4195/","msgid":"<20200323120211.GD571071@oden.dyn.berto.se>","date":"2020-03-23T12:02:11","subject":"Re: [libcamera-devel] [PATCH 2/2] libcamera: device_enumerator:\n\tConvey device ownership through unique_ptr","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 2020-03-21 20:09:51 +0200, Laurent Pinchart wrote:\n> Replace usage of shared_ptr with unique_ptr to convey media device\n> ownership internally in the enumerators when creating the media device.\n> Once a media device has all its dependencies met, it is converted to a\n> shared_ptr to keep the external API unchanged.\n> \n> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n\nReviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>\n\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(-)\n> \n> diff --git a/src/libcamera/device_enumerator.cpp b/src/libcamera/device_enumerator.cpp\n> index 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<MediaDevice> DeviceEnumerator::createDevice(const std::string &deviceNode)\n> +std::unique_ptr<MediaDevice> DeviceEnumerator::createDevice(const std::string &deviceNode)\n>  {\n> -\tstd::shared_ptr<MediaDevice> media = std::make_shared<MediaDevice>(deviceNode);\n> +\tstd::unique_ptr<MediaDevice> media = std::make_unique<MediaDevice>(deviceNode);\n>  \n>  \tint ret = media->populate();\n>  \tif (ret < 0) {\n> @@ -236,12 +236,12 @@ std::shared_ptr<MediaDevice> 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<MediaDevice> &media)\n> +void DeviceEnumerator::addDevice(std::unique_ptr<MediaDevice> &&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<MediaDevice> DeviceEnumerator::search(const DeviceMatch &dm)\n>  {\n> -\tfor (std::shared_ptr<MediaDevice> media : devices_) {\n> +\tfor (std::shared_ptr<MediaDevice> &media : devices_) {\n>  \t\tif (media->busy())\n>  \t\t\tcontinue;\n>  \n> diff --git a/src/libcamera/device_enumerator_sysfs.cpp b/src/libcamera/device_enumerator_sysfs.cpp\n> index 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<MediaDevice> media = createDevice(devnode);\n> +\t\tstd::unique_ptr<MediaDevice> 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<MediaDevice> &media)\n> +int DeviceEnumeratorSysfs::populateMediaDevice(MediaDevice *media)\n>  {\n>  \t/* Associate entities to device node paths. */\n>  \tfor (MediaEntity *entity : media->entities()) {\n> diff --git a/src/libcamera/device_enumerator_udev.cpp b/src/libcamera/device_enumerator_udev.cpp\n> index 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<MediaDevice> media =\n> +\t\tstd::unique_ptr<MediaDevice> 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>  \n> diff --git a/src/libcamera/include/device_enumerator.h b/src/libcamera/include/device_enumerator.h\n> index 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<MediaDevice> search(const DeviceMatch &dm);\n>  \n>  protected:\n> -\tstd::shared_ptr<MediaDevice> createDevice(const std::string &deviceNode);\n> -\tvoid addDevice(const std::shared_ptr<MediaDevice> &media);\n> +\tstd::unique_ptr<MediaDevice> createDevice(const std::string &deviceNode);\n> +\tvoid addDevice(std::unique_ptr<MediaDevice> &&media);\n>  \tvoid removeDevice(const std::string &deviceNode);\n>  \n>  private:\n> diff --git a/src/libcamera/include/device_enumerator_sysfs.h b/src/libcamera/include/device_enumerator_sysfs.h\n> index 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<MediaDevice> &media);\n> +\tint populateMediaDevice(MediaDevice *media);\n>  \tstd::string lookupDeviceNode(int major, int minor);\n>  };\n>  \n> diff --git a/src/libcamera/include/device_enumerator_udev.h b/src/libcamera/include/device_enumerator_udev.h\n> index 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<dev_t, std::list<MediaEntity *>>;\n>  \n>  \tstruct MediaDeviceDeps {\n> -\t\tMediaDeviceDeps(const std::shared_ptr<MediaDevice> &media,\n> -\t\t\t\tconst DependencyMap &deps)\n> -\t\t\t: media_(media), deps_(deps)\n> +\t\tMediaDeviceDeps(std::unique_ptr<MediaDevice> &&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<MediaDevice> media_;\n> +\t\tstd::unique_ptr<MediaDevice> media_;\n>  \t\tDependencyMap deps_;\n>  \t};\n>  \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":"<niklas.soderlund@ragnatech.se>","Received":["from mail-lf1-x141.google.com (mail-lf1-x141.google.com\n\t[IPv6:2a00:1450:4864:20::141])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id C309560413\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tMon, 23 Mar 2020 13:02:15 +0100 (CET)","by mail-lf1-x141.google.com with SMTP id s1so9982124lfd.3\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tMon, 23 Mar 2020 05:02:15 -0700 (PDT)","from localhost (h-200-138.A463.priv.bahnhof.se. [176.10.200.138])\n\tby smtp.gmail.com with ESMTPSA id\n\tt1sm8233509lji.98.2020.03.23.05.02.12\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tMon, 23 Mar 2020 05:02:13 -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\tbh=n2Ap+abDxM7dKsrVpRfv0mDsw4LDpVshYhACGOmx/Ck=;\n\tb=d/HruIHN8vNP/f/jzNGyhRiVb/PATs3LcIARyX0Ptla1nvIe400g1kW+saFTBQ6zsO\n\tZIDtpfwvcOa4ZT8p1MHtYfvc6JgAaHWJJfzGdLzmogrn3YuwpFFMDmUUxYHTdXylQBpb\n\t3WZwpkGQDis4rP3t4P4K5jSbaNm/hEK87xgVamaZcFzlShpKfwBjjZZpt7wibHMPNYFH\n\to7JYCejakyBtudhX8M8GRt2wqaa05eJ4XLOdfXcUjKiIXobkNTcf7llFpZ53bU0dyzB5\n\t6GVfYT7xpTOzNV++bRmxwA9A9d5oYnfxqrpM9aEDrR9eWGt62PW/j99U15yKMBGpsW4K\n\tT6hA==","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;\n\tbh=n2Ap+abDxM7dKsrVpRfv0mDsw4LDpVshYhACGOmx/Ck=;\n\tb=NzNgQnp2LvJ69BR1kAlPanuB87avbOpfciiVqvef7Ew5wWctgegD0HuSggeeIOAX1x\n\tCshR9Kz65JGBsPWye6Y90EEPBPapwy6Icc60Y2x0zbZfFoNSvVTWkM2Fu5UZ7/3G8EDB\n\t7uM8FPcbVCQXJ1DAg6FZZrRBPIEkbSwYgWlCMFly+GRA3KVoFn24eBHA/Hw3hdzOsua+\n\tRs+GP1AeD9XCSzkMCeOZpttDVsSDY26Iiwd19ZTM4wq0GEZDQq50ETvaIJ5m32Ziu9Lx\n\tCbNoZWRZrDXeIY9+WNUmjwQM5XAc0Oj1xsNa7hwn9yfEwcTwuC+am8ovjonjEV/Wa0ci\n\t0e2Q==","X-Gm-Message-State":"ANhLgQ0z6dd5LfWPsihf1BFr3qjDHPutkks/bky+VxQVNiUbpgfziZJL\n\tWv3vBz8jJLbybOK6Kb1JGKAuxS0xfBo=","X-Google-Smtp-Source":"ADFU+vtRBmFuZyslGvl+kWCKjZiVtLCYYxXbz74NMAgljVQZ4Fl2tcseWBan2gmLYX4OdlFIqkr3LQ==","X-Received":"by 2002:a19:ec08:: with SMTP id b8mr12905772lfa.34.1584964934989;\n\tMon, 23 Mar 2020 05:02:14 -0700 (PDT)","Date":"Mon, 23 Mar 2020 13:02:11 +0100","From":"Niklas =?iso-8859-1?q?S=F6derlund?= <niklas.soderlund@ragnatech.se>","To":"Laurent Pinchart <laurent.pinchart@ideasonboard.com>","Cc":"libcamera-devel@lists.libcamera.org","Message-ID":"<20200323120211.GD571071@oden.dyn.berto.se>","References":"<20200321180951.32685-1-laurent.pinchart@ideasonboard.com>\n\t<20200321180951.32685-2-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":"<20200321180951.32685-2-laurent.pinchart@ideasonboard.com>","Subject":"Re: [libcamera-devel] [PATCH 2/2] libcamera: device_enumerator:\n\tConvey device ownership through unique_ptr","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"<libcamera-devel.lists.libcamera.org>","List-Unsubscribe":"<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>","List-Archive":"<https://lists.libcamera.org/pipermail/libcamera-devel/>","List-Post":"<mailto:libcamera-devel@lists.libcamera.org>","List-Help":"<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>","List-Subscribe":"<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>","X-List-Received-Date":"Mon, 23 Mar 2020 12:02:15 -0000"}},{"id":4201,"web_url":"https://patchwork.libcamera.org/comment/4201/","msgid":"<2d7729b9-7665-6ada-57f8-75db521e45fa@ideasonboard.com>","date":"2020-03-23T14:08:52","subject":"Re: [libcamera-devel] [PATCH 2/2] libcamera: device_enumerator:\n\tConvey device ownership through unique_ptr","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"content":"Hi Laurent,\n\nOn 21/03/2020 18:09, Laurent Pinchart wrote:\n> Replace usage of shared_ptr with unique_ptr to convey media device\n> ownership internally in the enumerators when creating the media device.\n> Once a media device has all its dependencies met, it is converted to a\n> shared_ptr to keep the external API unchanged.\n\n\nLooks ok, my only worry is that it could become easy to 'forget' to move\nwhen needed? Or will unique_ptr fail/be loud when we need to move and\ndon't ?\n\nAnyway,\n\nReviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>\n\n> \n> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\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(-)\n> \n> diff --git a/src/libcamera/device_enumerator.cpp b/src/libcamera/device_enumerator.cpp\n> index 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<MediaDevice> DeviceEnumerator::createDevice(const std::string &deviceNode)\n> +std::unique_ptr<MediaDevice> DeviceEnumerator::createDevice(const std::string &deviceNode)\n>  {\n> -\tstd::shared_ptr<MediaDevice> media = std::make_shared<MediaDevice>(deviceNode);\n> +\tstd::unique_ptr<MediaDevice> media = std::make_unique<MediaDevice>(deviceNode);\n>  \n>  \tint ret = media->populate();\n>  \tif (ret < 0) {\n> @@ -236,12 +236,12 @@ std::shared_ptr<MediaDevice> 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<MediaDevice> &media)\n> +void DeviceEnumerator::addDevice(std::unique_ptr<MediaDevice> &&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<MediaDevice> DeviceEnumerator::search(const DeviceMatch &dm)\n>  {\n> -\tfor (std::shared_ptr<MediaDevice> media : devices_) {\n> +\tfor (std::shared_ptr<MediaDevice> &media : devices_) {\n>  \t\tif (media->busy())\n>  \t\t\tcontinue;\n>  \n> diff --git a/src/libcamera/device_enumerator_sysfs.cpp b/src/libcamera/device_enumerator_sysfs.cpp\n> index 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<MediaDevice> media = createDevice(devnode);\n> +\t\tstd::unique_ptr<MediaDevice> 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<MediaDevice> &media)\n> +int DeviceEnumeratorSysfs::populateMediaDevice(MediaDevice *media)\n>  {\n>  \t/* Associate entities to device node paths. */\n>  \tfor (MediaEntity *entity : media->entities()) {\n> diff --git a/src/libcamera/device_enumerator_udev.cpp b/src/libcamera/device_enumerator_udev.cpp\n> index 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<MediaDevice> media =\n> +\t\tstd::unique_ptr<MediaDevice> 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>  \n> diff --git a/src/libcamera/include/device_enumerator.h b/src/libcamera/include/device_enumerator.h\n> index 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<MediaDevice> search(const DeviceMatch &dm);\n>  \n>  protected:\n> -\tstd::shared_ptr<MediaDevice> createDevice(const std::string &deviceNode);\n> -\tvoid addDevice(const std::shared_ptr<MediaDevice> &media);\n> +\tstd::unique_ptr<MediaDevice> createDevice(const std::string &deviceNode);\n> +\tvoid addDevice(std::unique_ptr<MediaDevice> &&media);\n>  \tvoid removeDevice(const std::string &deviceNode);\n>  \n>  private:\n> diff --git a/src/libcamera/include/device_enumerator_sysfs.h b/src/libcamera/include/device_enumerator_sysfs.h\n> index 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<MediaDevice> &media);\n> +\tint populateMediaDevice(MediaDevice *media);\n>  \tstd::string lookupDeviceNode(int major, int minor);\n>  };\n>  \n> diff --git a/src/libcamera/include/device_enumerator_udev.h b/src/libcamera/include/device_enumerator_udev.h\n> index 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<dev_t, std::list<MediaEntity *>>;\n>  \n>  \tstruct MediaDeviceDeps {\n> -\t\tMediaDeviceDeps(const std::shared_ptr<MediaDevice> &media,\n> -\t\t\t\tconst DependencyMap &deps)\n> -\t\t\t: media_(media), deps_(deps)\n> +\t\tMediaDeviceDeps(std::unique_ptr<MediaDevice> &&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<MediaDevice> media_;\n> +\t\tstd::unique_ptr<MediaDevice> media_;\n>  \t\tDependencyMap deps_;\n>  \t};\n>  \n>","headers":{"Return-Path":"<kieran.bingham@ideasonboard.com>","Received":["from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 02DB46041A\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tMon, 23 Mar 2020 15:08:55 +0100 (CET)","from [192.168.0.20]\n\t(cpc89242-aztw30-2-0-cust488.18-1.cable.virginm.net [86.31.129.233])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 75312308;\n\tMon, 23 Mar 2020 15:08:55 +0100 (CET)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1584972535;\n\tbh=Hw9EwAd/zbbb8kU4jnqSIWOKMEApSCSptmqwInWUSmQ=;\n\th=Reply-To:Subject:To:References:From:Date:In-Reply-To:From;\n\tb=RBTxIEfY3ri+fRfGuMs9Kxjk+04PtlUoX+reDIH32N2cgiJWXT910U7Jwmjd/Fa0A\n\t5eGt6dtGU8YK9vte2kyTkF/r6P1pbMJcMPDGRTB07TOPtU2oyY79Ldxm0bUSmW9Mqm\n\t+4B3NkLxYRzfJoPHJgcO3jy5qAlIkm5JD4QuC18Y=","Reply-To":"kieran.bingham@ideasonboard.com","To":"Laurent Pinchart <laurent.pinchart@ideasonboard.com>,\n\tlibcamera-devel@lists.libcamera.org","References":"<20200321180951.32685-1-laurent.pinchart@ideasonboard.com>\n\t<20200321180951.32685-2-laurent.pinchart@ideasonboard.com>","From":"Kieran Bingham <kieran.bingham@ideasonboard.com>","Openpgp":"preference=signencrypt","Autocrypt":"addr=kieran.bingham@ideasonboard.com; keydata=\n\t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\n\tWZw01QYHU/GUV/zHJSFk","Organization":"Ideas on Board","Message-ID":"<2d7729b9-7665-6ada-57f8-75db521e45fa@ideasonboard.com>","Date":"Mon, 23 Mar 2020 14:08:52 +0000","User-Agent":"Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101\n\tThunderbird/60.9.1","MIME-Version":"1.0","In-Reply-To":"<20200321180951.32685-2-laurent.pinchart@ideasonboard.com>","Content-Type":"text/plain; charset=utf-8","Content-Language":"en-GB","Content-Transfer-Encoding":"7bit","Subject":"Re: [libcamera-devel] [PATCH 2/2] libcamera: device_enumerator:\n\tConvey device ownership through unique_ptr","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"<libcamera-devel.lists.libcamera.org>","List-Unsubscribe":"<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>","List-Archive":"<https://lists.libcamera.org/pipermail/libcamera-devel/>","List-Post":"<mailto:libcamera-devel@lists.libcamera.org>","List-Help":"<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>","List-Subscribe":"<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>","X-List-Received-Date":"Mon, 23 Mar 2020 14:08:56 -0000"}},{"id":4203,"web_url":"https://patchwork.libcamera.org/comment/4203/","msgid":"<20200323143014.GJ4768@pendragon.ideasonboard.com>","date":"2020-03-23T14:30:14","subject":"Re: [libcamera-devel] [PATCH 2/2] libcamera: device_enumerator:\n\tConvey device ownership through unique_ptr","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Kieran,\n\nOn Mon, Mar 23, 2020 at 02:08:52PM +0000, Kieran Bingham wrote:\n> On 21/03/2020 18:09, Laurent Pinchart wrote:\n> > Replace usage of shared_ptr with unique_ptr to convey media device\n> > ownership internally in the enumerators when creating the media device.\n> > Once a media device has all its dependencies met, it is converted to a\n> > shared_ptr to keep the external API unchanged.\n> \n> Looks ok, my only worry is that it could become easy to 'forget' to move\n> when needed? Or will unique_ptr fail/be loud when we need to move and\n> don't ?\n\nThe compiler will be loud, brace yourself :-)\n\n> Anyway,\n> \n> Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>\n> \n> > \n> > Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\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(-)\n> > \n> > diff --git a/src/libcamera/device_enumerator.cpp b/src/libcamera/device_enumerator.cpp\n> > index 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<MediaDevice> DeviceEnumerator::createDevice(const std::string &deviceNode)\n> > +std::unique_ptr<MediaDevice> DeviceEnumerator::createDevice(const std::string &deviceNode)\n> >  {\n> > -\tstd::shared_ptr<MediaDevice> media = std::make_shared<MediaDevice>(deviceNode);\n> > +\tstd::unique_ptr<MediaDevice> media = std::make_unique<MediaDevice>(deviceNode);\n> >  \n> >  \tint ret = media->populate();\n> >  \tif (ret < 0) {\n> > @@ -236,12 +236,12 @@ std::shared_ptr<MediaDevice> 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<MediaDevice> &media)\n> > +void DeviceEnumerator::addDevice(std::unique_ptr<MediaDevice> &&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<MediaDevice> DeviceEnumerator::search(const DeviceMatch &dm)\n> >  {\n> > -\tfor (std::shared_ptr<MediaDevice> media : devices_) {\n> > +\tfor (std::shared_ptr<MediaDevice> &media : devices_) {\n> >  \t\tif (media->busy())\n> >  \t\t\tcontinue;\n> >  \n> > diff --git a/src/libcamera/device_enumerator_sysfs.cpp b/src/libcamera/device_enumerator_sysfs.cpp\n> > index 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<MediaDevice> media = createDevice(devnode);\n> > +\t\tstd::unique_ptr<MediaDevice> 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<MediaDevice> &media)\n> > +int DeviceEnumeratorSysfs::populateMediaDevice(MediaDevice *media)\n> >  {\n> >  \t/* Associate entities to device node paths. */\n> >  \tfor (MediaEntity *entity : media->entities()) {\n> > diff --git a/src/libcamera/device_enumerator_udev.cpp b/src/libcamera/device_enumerator_udev.cpp\n> > index 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<MediaDevice> media =\n> > +\t\tstd::unique_ptr<MediaDevice> 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> >  \n> > diff --git a/src/libcamera/include/device_enumerator.h b/src/libcamera/include/device_enumerator.h\n> > index 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<MediaDevice> search(const DeviceMatch &dm);\n> >  \n> >  protected:\n> > -\tstd::shared_ptr<MediaDevice> createDevice(const std::string &deviceNode);\n> > -\tvoid addDevice(const std::shared_ptr<MediaDevice> &media);\n> > +\tstd::unique_ptr<MediaDevice> createDevice(const std::string &deviceNode);\n> > +\tvoid addDevice(std::unique_ptr<MediaDevice> &&media);\n> >  \tvoid removeDevice(const std::string &deviceNode);\n> >  \n> >  private:\n> > diff --git a/src/libcamera/include/device_enumerator_sysfs.h b/src/libcamera/include/device_enumerator_sysfs.h\n> > index 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<MediaDevice> &media);\n> > +\tint populateMediaDevice(MediaDevice *media);\n> >  \tstd::string lookupDeviceNode(int major, int minor);\n> >  };\n> >  \n> > diff --git a/src/libcamera/include/device_enumerator_udev.h b/src/libcamera/include/device_enumerator_udev.h\n> > index 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<dev_t, std::list<MediaEntity *>>;\n> >  \n> >  \tstruct MediaDeviceDeps {\n> > -\t\tMediaDeviceDeps(const std::shared_ptr<MediaDevice> &media,\n> > -\t\t\t\tconst DependencyMap &deps)\n> > -\t\t\t: media_(media), deps_(deps)\n> > +\t\tMediaDeviceDeps(std::unique_ptr<MediaDevice> &&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<MediaDevice> media_;\n> > +\t\tstd::unique_ptr<MediaDevice> media_;\n> >  \t\tDependencyMap deps_;\n> >  \t};\n> >","headers":{"Return-Path":"<laurent.pinchart@ideasonboard.com>","Received":["from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 5A4816041A\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tMon, 23 Mar 2020 15:30:24 +0100 (CET)","from pendragon.ideasonboard.com (81-175-216-236.bb.dnainternet.fi\n\t[81.175.216.236])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id C4C76308;\n\tMon, 23 Mar 2020 15:30:23 +0100 (CET)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1584973824;\n\tbh=4KhJ0b1K+FqQmAfpTM7lnGUOgJXPT5e0N5IcHUo6eFc=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=PRl6Gi1mb8hBNm0bDgGBYw56Hu48eq1wt+Z32EP16JxMu6/hEQ+s9gwn8MfQ/i58D\n\toG9hdbQpYmNb7em8BPG6fN1voQb+EU8pifrWLqhzyszJVNKIgF65j0Kf8L2o4bNlJs\n\tpR5+3b1GPOJg8PL1s8wpC+b1iOExrAXJUd++fGj8=","Date":"Mon, 23 Mar 2020 16:30:14 +0200","From":"Laurent Pinchart <laurent.pinchart@ideasonboard.com>","To":"Kieran Bingham <kieran.bingham@ideasonboard.com>","Cc":"libcamera-devel@lists.libcamera.org","Message-ID":"<20200323143014.GJ4768@pendragon.ideasonboard.com>","References":"<20200321180951.32685-1-laurent.pinchart@ideasonboard.com>\n\t<20200321180951.32685-2-laurent.pinchart@ideasonboard.com>\n\t<2d7729b9-7665-6ada-57f8-75db521e45fa@ideasonboard.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","In-Reply-To":"<2d7729b9-7665-6ada-57f8-75db521e45fa@ideasonboard.com>","User-Agent":"Mutt/1.10.1 (2018-07-13)","Subject":"Re: [libcamera-devel] [PATCH 2/2] libcamera: device_enumerator:\n\tConvey device ownership through unique_ptr","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"<libcamera-devel.lists.libcamera.org>","List-Unsubscribe":"<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>","List-Archive":"<https://lists.libcamera.org/pipermail/libcamera-devel/>","List-Post":"<mailto:libcamera-devel@lists.libcamera.org>","List-Help":"<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>","List-Subscribe":"<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>","X-List-Received-Date":"Mon, 23 Mar 2020 14:30:24 -0000"}}]