Patch Detail
Show a patch.
GET /api/patches/1166/?format=api
{ "id": 1166, "url": "https://patchwork.libcamera.org/api/patches/1166/?format=api", "web_url": "https://patchwork.libcamera.org/patch/1166/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/projects/1/?format=api", "name": "libcamera", "link_name": "libcamera", "list_id": "libcamera_core", "list_email": "libcamera-devel@lists.libcamera.org", "web_url": "", "scm_url": "", "webscm_url": "" }, "msgid": "<20190508151831.12274-2-niklas.soderlund@ragnatech.se>", "date": "2019-05-08T15:18:21", "name": "[libcamera-devel,v2,01/11] libcamera: Always check return value of MediaDevice::acquire()", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "009ca4a04aabc11b552558601a137498e94b0f5b", "submitter": { "id": 5, "url": "https://patchwork.libcamera.org/api/people/5/?format=api", "name": "Niklas Söderlund", "email": "niklas.soderlund@ragnatech.se" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/1166/mbox/", "series": [ { "id": 300, "url": "https://patchwork.libcamera.org/api/series/300/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=300", "date": "2019-05-08T15:18:20", "name": "libcamerea: Add support for exclusive access to cameras between processes", "version": 2, "mbox": "https://patchwork.libcamera.org/series/300/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/1166/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/1166/checks/", "tags": {}, "headers": { "Return-Path": "<niklas.soderlund@ragnatech.se>", "Received": [ "from bin-mail-out-05.binero.net (bin-mail-out-05.binero.net\n\t[195.74.38.228])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 4994560E52\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tWed, 8 May 2019 17:18:48 +0200 (CEST)", "from localhost.localdomain (unknown [79.138.136.66])\n\tby bin-vsp-out-01.atm.binero.net (Halon) with ESMTPA\n\tid 91ed3932-71a4-11e9-8fa2-005056917a89;\n\tWed, 08 May 2019 17:18:45 +0200 (CEST)" ], "X-Halon-ID": "91ed3932-71a4-11e9-8fa2-005056917a89", "Authorized-sender": "niklas@soderlund.pp.se", "From": "=?utf-8?q?Niklas_S=C3=B6derlund?= <niklas.soderlund@ragnatech.se>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Wed, 8 May 2019 17:18:21 +0200", "Message-Id": "<20190508151831.12274-2-niklas.soderlund@ragnatech.se>", "X-Mailer": "git-send-email 2.21.0", "In-Reply-To": "<20190508151831.12274-1-niklas.soderlund@ragnatech.se>", "References": "<20190508151831.12274-1-niklas.soderlund@ragnatech.se>", "MIME-Version": "1.0", "Content-Type": "text/plain; charset=UTF-8", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH v2 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": "<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": "Wed, 08 May 2019 15:18:48 -0000" }, "content": "In preparation for adding more responsibility to MediaDevice::acquire()\nmake sure all callers check and act accordingly to its return value.\n\nSigned-off-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>\nReviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\nReviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>\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(-)", "diff": "diff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp\nindex 0041662514e1d7ca..75e878afad4e67a9 100644\n--- a/src/libcamera/pipeline/ipu3/ipu3.cpp\n+++ b/src/libcamera/pipeline/ipu3/ipu3.cpp\n@@ -614,21 +614,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\ndiff --git a/src/libcamera/pipeline/uvcvideo.cpp b/src/libcamera/pipeline/uvcvideo.cpp\nindex 5d2f1c98fa36380c..e40b052f4d877d5d 100644\n--- a/src/libcamera/pipeline/uvcvideo.cpp\n+++ b/src/libcamera/pipeline/uvcvideo.cpp\n@@ -183,7 +183,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<UVCCameraData> data = utils::make_unique<UVCCameraData>(this);\n \ndiff --git a/src/libcamera/pipeline/vimc.cpp b/src/libcamera/pipeline/vimc.cpp\nindex cdf43770a9bfc40f..7b6ebd4cc0a27e25 100644\n--- a/src/libcamera/pipeline/vimc.cpp\n+++ b/src/libcamera/pipeline/vimc.cpp\n@@ -193,7 +193,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<VimcCameraData> data = utils::make_unique<VimcCameraData>(this);\n \ndiff --git a/test/media_device/media_device_link_test.cpp b/test/media_device/media_device_link_test.cpp\nindex 58a55cdfee634c0b..484d3691310f78a0 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+\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 \"\ndiff --git a/test/v4l2_device/v4l2_device_test.cpp b/test/v4l2_device/v4l2_device_test.cpp\nindex 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)\ndiff --git a/test/v4l2_subdevice/v4l2_subdevice_test.cpp b/test/v4l2_subdevice/v4l2_subdevice_test.cpp\nindex 72d5f72543d29378..4e16ab6cf3e5f874 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+\t\t << media_->deviceNode() << endl;\n+\t\treturn TestSkip;\n+\t}\n \n \tint ret = media_->open();\n \tif (ret) {\n", "prefixes": [ "libcamera-devel", "v2", "01/11" ] }