[{"id":1443,"web_url":"https://patchwork.libcamera.org/comment/1443/","msgid":"<20190418101524.GA761@pendragon.ideasonboard.com>","date":"2019-04-18T10:15:24","subject":"Re: [libcamera-devel] [RFC 01/11] libcamera: Always check return\n\tvalue of MediaDevice::acquire()","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Niklas,\n\nThank you for the patch.\n\nOn Sun, Apr 14, 2019 at 03:34:56AM +0200, Niklas Söderlund wrote:\n> In preparation of adding more responsibility to MediaDevice::acquire()\n> make sure all callers checks and acts properly to its return value.\n> \n> Signed-off-by: Niklas Söderlund \n> ---\n> src/libcamera/pipeline/ipu3/ipu3.cpp | 10 ++++------\n> src/libcamera/pipeline/uvcvideo.cpp | 3 ++-\n> src/libcamera/pipeline/vimc.cpp | 3 ++-\n> test/media_device/media_device_link_test.cpp | 6 +++++-\n> test/v4l2_device/v4l2_device_test.cpp | 3 ++-\n> test/v4l2_subdevice/v4l2_subdevice_test.cpp | 6 +++++-\n> 6 files changed, 20 insertions(+), 11 deletions(-)\n> \n> diff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp\n> index ca09da753b908448..d8de6b3c36314fc0 100644\n> --- a/src/libcamera/pipeline/ipu3/ipu3.cpp\n> +++ b/src/libcamera/pipeline/ipu3/ipu3.cpp\n> @@ -451,21 +451,19 @@ bool PipelineHandlerIPU3::match(DeviceEnumerator *enumerator)\n> \timgu_dm.add(\"ipu3-imgu 1 viewfinder\");\n> \timgu_dm.add(\"ipu3-imgu 1 3a stat\");\n> \n> -\t/*\n> -\t * It is safe to acquire both media devices at this point as\n> -\t * DeviceEnumerator::search() skips the busy ones for us.\n> -\t */\n> \tcio2MediaDev_ = enumerator->search(cio2_dm);\n> \tif (!cio2MediaDev_)\n> \t\treturn false;\n> \n> -\tcio2MediaDev_->acquire();\n> +\tif (!cio2MediaDev_->acquire())\n> +\t\treturn false;\n> \n> \timguMediaDev_ = enumerator->search(imgu_dm);\n> \tif (!imguMediaDev_)\n> \t\treturn false;\n> \n> -\timguMediaDev_->acquire();\n> +\tif (!imguMediaDev_->acquire())\n> +\t\treturn false;\n> \n> \t/*\n> \t * Disable all links that are enabled by default on CIO2, as camera\n> diff --git a/src/libcamera/pipeline/uvcvideo.cpp b/src/libcamera/pipeline/uvcvideo.cpp\n> index cd472cfadd86b7ba..5214bfd3097b8217 100644\n> --- a/src/libcamera/pipeline/uvcvideo.cpp\n> +++ b/src/libcamera/pipeline/uvcvideo.cpp\n> @@ -184,7 +184,8 @@ bool PipelineHandlerUVC::match(DeviceEnumerator *enumerator)\n> \tif (!media_)\n> \t\treturn false;\n> \n> -\tmedia_->acquire();\n> +\tif (!media_->acquire())\n> +\t\treturn false;\n> \n> \tstd::unique_ptr data = utils::make_unique(this);\n> \n> diff --git a/src/libcamera/pipeline/vimc.cpp b/src/libcamera/pipeline/vimc.cpp\n> index c8bbe2a19847ba1e..e5e78ccedd59ae66 100644\n> --- a/src/libcamera/pipeline/vimc.cpp\n> +++ b/src/libcamera/pipeline/vimc.cpp\n> @@ -194,7 +194,8 @@ bool PipelineHandlerVimc::match(DeviceEnumerator *enumerator)\n> \tif (!media_)\n> \t\treturn false;\n> \n> -\tmedia_->acquire();\n> +\tif (!media_->acquire())\n> +\t\treturn false;\n> \n> \tstd::unique_ptr data = utils::make_unique(this);\n> \n> diff --git a/test/media_device/media_device_link_test.cpp b/test/media_device/media_device_link_test.cpp\n> index 58a55cdfee634c0b..4b8de3bee722e912 100644\n> --- a/test/media_device/media_device_link_test.cpp\n> +++ b/test/media_device/media_device_link_test.cpp\n> @@ -51,7 +51,11 @@ class MediaDeviceLinkTest : public Test\n> \t\t\treturn TestSkip;\n> \t\t}\n> \n> -\t\tdev_->acquire();\n> +\t\tif (!dev_->acquire()) {\n> +\t\t\tcerr << \"Unable to acquire media device: \"\n\nI'd drop the colon ':'.\n\n> +\t\t\t << dev_->deviceNode() << endl;\n> +\t\t\treturn TestSkip;\n> +\t\t}\n> \n> \t\tif (dev_->open()) {\n> \t\t\tcerr << \"Failed to open media device at \"\n> diff --git a/test/v4l2_device/v4l2_device_test.cpp b/test/v4l2_device/v4l2_device_test.cpp\n> index 4225291bbb6e23f0..90e5f7a3ee0c0f2f 100644\n> --- a/test/v4l2_device/v4l2_device_test.cpp\n> +++ b/test/v4l2_device/v4l2_device_test.cpp\n> @@ -46,7 +46,8 @@ int V4L2DeviceTest::init()\n> \tif (!media_)\n> \t\treturn TestSkip;\n> \n> -\tmedia_->acquire();\n> +\tif (!media_->acquire())\n> +\t\treturn TestSkip;\n> \n> \tMediaEntity *entity = media_->getEntityByName(\"vivid-000-vid-cap\");\n> \tif (!entity)\n> diff --git a/test/v4l2_subdevice/v4l2_subdevice_test.cpp b/test/v4l2_subdevice/v4l2_subdevice_test.cpp\n> index 06582969eb45f658..21335efbad4d5668 100644\n> --- a/test/v4l2_subdevice/v4l2_subdevice_test.cpp\n> +++ b/test/v4l2_subdevice/v4l2_subdevice_test.cpp\n> @@ -45,7 +45,11 @@ int V4L2SubdeviceTest::init()\n> \t\treturn TestSkip;\n> \t}\n> \n> -\tmedia_->acquire();\n> +\tif (!media_->acquire()) {\n> +\t\tcerr << \"Unable to acquire media device: \"\n\nSame here.\n\nReviewed-by: Laurent Pinchart \n\n> +\t\t << media_->deviceNode() << endl;\n> +\t\treturn TestSkip;\n> +\t}\n> \n> \tint ret = media_->open();\n> \tif (ret) {","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 E730A60DB4\n\tfor ;\n\tThu, 18 Apr 2019 12:15:33 +0200 (CEST)","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 17BEF333;\n\tThu, 18 Apr 2019 12:15:33 +0200 (CEST)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1555582533;\n\tbh=qXki392GtBD9zP8UvE6wxj+RJBc3coL+S3pR2W33UH8=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=P7j881ZtUL4i+hQc2VcA5sSrYR2gMMcXCKWDU+EMewGir/aBffq/QLnRO7CkL5Ban\n\txEmpyAYBfsoj+TdzXRH/ejmBDxKpq9gAbCsX3pre690YmEKzbM478lF5q1hKcqxWEF\n\tI94QRUZvRL4/aIqGmJqWUSPWOlQskUh3Xk9BhIKQ=","Date":"Thu, 18 Apr 2019 13:15:24 +0300","From":"Laurent Pinchart ","To":"Niklas =?utf-8?q?S=C3=B6derlund?= ","Cc":"libcamera-devel@lists.libcamera.org","Message-ID":"<20190418101524.GA761@pendragon.ideasonboard.com>","References":"<20190414013506.10515-1-niklas.soderlund@ragnatech.se>\n\t<20190414013506.10515-2-niklas.soderlund@ragnatech.se>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","Content-Transfer-Encoding":"8bit","In-Reply-To":"<20190414013506.10515-2-niklas.soderlund@ragnatech.se>","User-Agent":"Mutt/1.10.1 (2018-07-13)","Subject":"Re: [libcamera-devel] [RFC 01/11] libcamera: Always check return\n\tvalue of MediaDevice::acquire()","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":"Thu, 18 Apr 2019 10:15:34 -0000"}}]