{"id":1186,"url":"https://patchwork.libcamera.org/api/patches/1186/?format=json","web_url":"https://patchwork.libcamera.org/patch/1186/","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":"<20190511091907.10050-2-niklas.soderlund@ragnatech.se>","date":"2019-05-11T09:18:57","name":"[libcamera-devel,v3,01/11] libcamera: Always check return value of MediaDevice::acquire()","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"ee66d54f3f347ae31a4c78ac1bc5398e32eff3f7","submitter":{"id":5,"url":"https://patchwork.libcamera.org/api/people/5/?format=json","name":"Niklas Söderlund","email":"niklas.soderlund@ragnatech.se"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/1186/mbox/","series":[{"id":303,"url":"https://patchwork.libcamera.org/api/series/303/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=303","date":"2019-05-11T09:18:56","name":"libcamerea: Add support for exclusive access to cameras between processes","version":3,"mbox":"https://patchwork.libcamera.org/series/303/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/1186/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/1186/checks/","tags":{},"headers":{"Return-Path":"","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 04B5560E4E\n\tfor ;\n\tSat, 11 May 2019 11:19:42 +0200 (CEST)","from localhost.localdomain (unknown [185.224.57.161])\n\tby bin-vsp-out-02.atm.binero.net (Halon) with ESMTPA\n\tid e837c430-73cd-11e9-8e2f-005056917f90;\n\tSat, 11 May 2019 11:19:41 +0200 (CEST)"],"X-Halon-ID":"e837c430-73cd-11e9-8e2f-005056917f90","Authorized-sender":"niklas@soderlund.pp.se","From":"=?utf-8?q?Niklas_S=C3=B6derlund?= ","To":"libcamera-devel@lists.libcamera.org","Date":"Sat, 11 May 2019 11:18:57 +0200","Message-Id":"<20190511091907.10050-2-niklas.soderlund@ragnatech.se>","X-Mailer":"git-send-email 2.21.0","In-Reply-To":"<20190511091907.10050-1-niklas.soderlund@ragnatech.se>","References":"<20190511091907.10050-1-niklas.soderlund@ragnatech.se>","MIME-Version":"1.0","Content-Type":"text/plain; charset=UTF-8","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v3 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":"Sat, 11 May 2019 09:19:43 -0000"},"content":"In preparation for adding more responsibility to MediaDevice::acquire()\nremove unneeded calls to acquire() and release(), and make sure all\nneeded calls to acquire() are checked and acted on.\n\nSigned-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 | 4 ----\n test/v4l2_subdevice/v4l2_subdevice_test.cpp | 7 -------\n 6 files changed, 13 insertions(+), 20 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 data = utils::make_unique(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 data = utils::make_unique(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..833038d56ea4631d 100644\n--- a/test/v4l2_device/v4l2_device_test.cpp\n+++ b/test/v4l2_device/v4l2_device_test.cpp\n@@ -46,8 +46,6 @@ int V4L2DeviceTest::init()\n \tif (!media_)\n \t\treturn TestSkip;\n \n-\tmedia_->acquire();\n-\n \tMediaEntity *entity = media_->getEntityByName(\"vivid-000-vid-cap\");\n \tif (!entity)\n \t\treturn TestSkip;\n@@ -61,8 +59,6 @@ int V4L2DeviceTest::init()\n \n void V4L2DeviceTest::cleanup()\n {\n-\tmedia_->release();\n-\n \tcapture_->streamOff();\n \tcapture_->releaseBuffers();\n \tcapture_->close();\ndiff --git a/test/v4l2_subdevice/v4l2_subdevice_test.cpp b/test/v4l2_subdevice/v4l2_subdevice_test.cpp\nindex 72d5f72543d29378..5810ef3c962fab8e 100644\n--- a/test/v4l2_subdevice/v4l2_subdevice_test.cpp\n+++ b/test/v4l2_subdevice/v4l2_subdevice_test.cpp\n@@ -45,20 +45,16 @@ int V4L2SubdeviceTest::init()\n \t\treturn TestSkip;\n \t}\n \n-\tmedia_->acquire();\n-\n \tint ret = media_->open();\n \tif (ret) {\n \t\tcerr << \"Unable to open media device: \" << media_->deviceNode()\n \t\t << \": \" << strerror(ret) << endl;\n-\t\tmedia_->release();\n \t\treturn TestSkip;\n \t}\n \n \tMediaEntity *videoEntity = media_->getEntityByName(\"Scaler\");\n \tif (!videoEntity) {\n \t\tcerr << \"Unable to find media entity 'Scaler'\" << endl;\n-\t\tmedia_->release();\n \t\treturn TestFail;\n \t}\n \n@@ -67,7 +63,6 @@ int V4L2SubdeviceTest::init()\n \tif (ret) {\n \t\tcerr << \"Unable to open video subdevice \"\n \t\t << scaler_->entity()->deviceNode() << endl;\n-\t\tmedia_->release();\n \t\treturn TestSkip;\n \t}\n \n@@ -76,7 +71,5 @@ int V4L2SubdeviceTest::init()\n \n void V4L2SubdeviceTest::cleanup()\n {\n-\tmedia_->release();\n-\n \tdelete scaler_;\n }\n","prefixes":["libcamera-devel","v3","01/11"]}