Patch Detail
Show a patch.
GET /api/1.1/patches/2510/?format=api
{ "id": 2510, "url": "https://patchwork.libcamera.org/api/1.1/patches/2510/?format=api", "web_url": "https://patchwork.libcamera.org/patch/2510/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/1.1/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": "<20200104050947.7673-15-laurent.pinchart@ideasonboard.com>", "date": "2020-01-04T05:09:47", "name": "[libcamera-devel,14/14] libcamera: v4l2: Use Object::invokeMethod() return value", "commit_ref": "b4415f1c9863a2fda42e1882ed4857de9d9366b1", "pull_url": null, "state": "accepted", "archived": false, "hash": "1e5b76fc14662772562ce81468fbfa8a693ea940", "submitter": { "id": 2, "url": "https://patchwork.libcamera.org/api/1.1/people/2/?format=api", "name": "Laurent Pinchart", "email": "laurent.pinchart@ideasonboard.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/2510/mbox/", "series": [ { "id": 600, "url": "https://patchwork.libcamera.org/api/1.1/series/600/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=600", "date": "2020-01-04T05:09:33", "name": "object: Propagate return value of invoked method", "version": 1, "mbox": "https://patchwork.libcamera.org/series/600/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/2510/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/2510/checks/", "tags": {}, "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 C858B60606\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tSat, 4 Jan 2020 06:10:07 +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 3889AFA0\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tSat, 4 Jan 2020 06:10:07 +0100 (CET)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1578114607;\n\tbh=TGHhZ1p1kO44vtGIQS1hQjXWoTpvjmdnu6PNPf7AOTw=;\n\th=From:To:Subject:Date:In-Reply-To:References:From;\n\tb=B2ex/BLbf53RWDKfX0mi6Pc4AcoRX+pyphVCJg2nyoyaHhpcgMgI9QjHIqQeTfX4a\n\twpq6CvfstV5XNK/20XwzclR06PBL67+tsoee3KuJI/t6u6cdUTaM5YddnrgBXVbwDp\n\tetVB1c5Oey89Gbx4LK0chZmHw8Uaj94rxmpNh+Fk=", "From": "Laurent Pinchart <laurent.pinchart@ideasonboard.com>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Sat, 4 Jan 2020 07:09:47 +0200", "Message-Id": "<20200104050947.7673-15-laurent.pinchart@ideasonboard.com>", "X-Mailer": "git-send-email 2.24.1", "In-Reply-To": "<20200104050947.7673-1-laurent.pinchart@ideasonboard.com>", "References": "<20200104050947.7673-1-laurent.pinchart@ideasonboard.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH 14/14] libcamera: v4l2: Use\n\tObject::invokeMethod() return value", "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": "Sat, 04 Jan 2020 05:10:08 -0000" }, "content": "Now that Object::invokeMethod() supports returning a value, use it and\ndrop the return value method argument.\n\nSigned-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n---\n src/v4l2/v4l2_camera.cpp | 109 +++++++++++++++------------------\n src/v4l2/v4l2_camera.h | 18 +++---\n src/v4l2/v4l2_camera_proxy.cpp | 51 ++++++++-------\n 3 files changed, 82 insertions(+), 96 deletions(-)", "diff": "diff --git a/src/v4l2/v4l2_camera.cpp b/src/v4l2/v4l2_camera.cpp\nindex 3590730fde08..4545483cf1c7 100644\n--- a/src/v4l2/v4l2_camera.cpp\n+++ b/src/v4l2/v4l2_camera.cpp\n@@ -34,23 +34,21 @@ V4L2Camera::~V4L2Camera()\n \tcamera_->release();\n }\n \n-void V4L2Camera::open(int *ret)\n+int V4L2Camera::open()\n {\n \t/* \\todo Support multiple open. */\n \tif (camera_->acquire() < 0) {\n \t\tLOG(V4L2Compat, Error) << \"Failed to acquire camera\";\n-\t\t*ret = -EINVAL;\n-\t\treturn;\n+\t\treturn -EINVAL;\n \t}\n \n \tconfig_ = camera_->generateConfiguration({ StreamRole::Viewfinder });\n \tif (!config_) {\n \t\tcamera_->release();\n-\t\t*ret = -EINVAL;\n-\t\treturn;\n+\t\treturn -EINVAL;\n \t}\n \n-\t*ret = 0;\n+\treturn 0;\n }\n \n void V4L2Camera::close()\n@@ -92,9 +90,9 @@ void V4L2Camera::requestComplete(Request *request)\n \tbufferSema_.release();\n }\n \n-void V4L2Camera::configure(int *ret, StreamConfiguration *streamConfigOut,\n-\t\t\t const Size &size, PixelFormat pixelformat,\n-\t\t\t unsigned int bufferCount)\n+int V4L2Camera::configure(StreamConfiguration *streamConfigOut,\n+\t\t\t const Size &size, PixelFormat pixelformat,\n+\t\t\t unsigned int bufferCount)\n {\n \tStreamConfiguration &streamConfig = config_->at(0);\n \tstreamConfig.size.width = size.width;\n@@ -106,8 +104,7 @@ void V4L2Camera::configure(int *ret, StreamConfiguration *streamConfigOut,\n \tCameraConfiguration::Status validation = config_->validate();\n \tif (validation == CameraConfiguration::Invalid) {\n \t\tLOG(V4L2Compat, Debug) << \"Configuration invalid\";\n-\t\t*ret = -EINVAL;\n-\t\treturn;\n+\t\treturn -EINVAL;\n \t}\n \tif (validation == CameraConfiguration::Adjusted)\n \t\tLOG(V4L2Compat, Debug) << \"Configuration adjusted\";\n@@ -115,24 +112,25 @@ void V4L2Camera::configure(int *ret, StreamConfiguration *streamConfigOut,\n \tLOG(V4L2Compat, Debug) << \"Validated configuration is: \"\n \t\t\t << streamConfig.toString();\n \n-\t*ret = camera_->configure(config_.get());\n-\tif (*ret < 0)\n-\t\treturn;\n+\tint ret = camera_->configure(config_.get());\n+\tif (ret < 0)\n+\t\treturn ret;\n \n \t*streamConfigOut = config_->at(0);\n+\n+\treturn 0;\n }\n \n-void V4L2Camera::mmap(void **ret, unsigned int index)\n+void *V4L2Camera::mmap(unsigned int index)\n {\n \tStream *stream = *camera_->streams().begin();\n-\t*ret = stream->buffers()[index].planes()[0].mem();\n+\treturn stream->buffers()[index].planes()[0].mem();\n }\n \n-void V4L2Camera::allocBuffers(int *ret, unsigned int count)\n+int V4L2Camera::allocBuffers(unsigned int count)\n {\n-\t*ret = camera_->allocateBuffers();\n-\tif (*ret == -EACCES)\n-\t\t*ret = -EBUSY;\n+\tint ret = camera_->allocateBuffers();\n+\treturn ret == -EACCES ? -EBUSY : ret;\n }\n \n void V4L2Camera::freeBuffers()\n@@ -140,85 +138,76 @@ void V4L2Camera::freeBuffers()\n \tcamera_->freeBuffers();\n }\n \n-void V4L2Camera::streamOn(int *ret)\n+int V4L2Camera::streamOn()\n {\n-\t*ret = 0;\n-\n \tif (isRunning_)\n-\t\treturn;\n+\t\treturn 0;\n+\n+\tint ret = camera_->start();\n+\tif (ret < 0)\n+\t\treturn ret == -EACCES ? -EBUSY : ret;\n \n-\t*ret = camera_->start();\n-\tif (*ret < 0) {\n-\t\tif (*ret == -EACCES)\n-\t\t\t*ret = -EBUSY;\n-\t\treturn;\n-\t}\n \tisRunning_ = true;\n \n \tfor (std::unique_ptr<Request> &req : pendingRequests_) {\n \t\t/* \\todo What should we do if this returns -EINVAL? */\n-\t\t*ret = camera_->queueRequest(req.release());\n-\t\tif (*ret < 0) {\n-\t\t\tif (*ret == -EACCES)\n-\t\t\t\t*ret = -EBUSY;\n-\t\t\treturn;\n-\t\t}\n+\t\tret = camera_->queueRequest(req.release());\n+\t\tif (ret < 0)\n+\t\t\treturn ret == -EACCES ? -EBUSY : ret;\n \t}\n \n \tpendingRequests_.clear();\n+\n+\treturn 0;\n }\n \n-void V4L2Camera::streamOff(int *ret)\n+int V4L2Camera::streamOff()\n {\n-\t*ret = 0;\n-\n \t/* \\todo Restore buffers to reqbufs state? */\n \tif (!isRunning_)\n-\t\treturn;\n+\t\treturn 0;\n+\n+\tint ret = camera_->stop();\n+\tif (ret < 0)\n+\t\treturn ret == -EACCES ? -EBUSY : ret;\n \n-\t*ret = camera_->stop();\n-\tif (*ret < 0) {\n-\t\tif (*ret == -EACCES)\n-\t\t\t*ret = -EBUSY;\n-\t\treturn;\n-\t}\n \tisRunning_ = false;\n+\n+\treturn 0;\n }\n \n-void V4L2Camera::qbuf(int *ret, unsigned int index)\n+int V4L2Camera::qbuf(unsigned int index)\n {\n \tStream *stream = config_->at(0).stream();\n \tstd::unique_ptr<Buffer> buffer = stream->createBuffer(index);\n \tif (!buffer) {\n \t\tLOG(V4L2Compat, Error) << \"Can't create buffer\";\n-\t\t*ret = -ENOMEM;\n-\t\treturn;\n+\t\treturn -ENOMEM;\n \t}\n \n \tstd::unique_ptr<Request> request =\n \t\tstd::unique_ptr<Request>(camera_->createRequest());\n \tif (!request) {\n \t\tLOG(V4L2Compat, Error) << \"Can't create request\";\n-\t\t*ret = -ENOMEM;\n-\t\treturn;\n+\t\treturn -ENOMEM;\n \t}\n \n-\t*ret = request->addBuffer(std::move(buffer));\n-\tif (*ret < 0) {\n+\tint ret = request->addBuffer(std::move(buffer));\n+\tif (ret < 0) {\n \t\tLOG(V4L2Compat, Error) << \"Can't set buffer for request\";\n-\t\t*ret = -ENOMEM;\n-\t\treturn;\n+\t\treturn -ENOMEM;\n \t}\n \n \tif (!isRunning_) {\n \t\tpendingRequests_.push_back(std::move(request));\n-\t\treturn;\n+\t\treturn 0;\n \t}\n \n-\t*ret = camera_->queueRequest(request.release());\n-\tif (*ret < 0) {\n+\tret = camera_->queueRequest(request.release());\n+\tif (ret < 0) {\n \t\tLOG(V4L2Compat, Error) << \"Can't queue request\";\n-\t\tif (*ret == -EACCES)\n-\t\t\t*ret = -EBUSY;\n+\t\treturn ret == -EACCES ? -EBUSY : ret;\n \t}\n+\n+\treturn 0;\n }\ndiff --git a/src/v4l2/v4l2_camera.h b/src/v4l2/v4l2_camera.h\nindex d24dbca6aaf4..5a889efdb4a2 100644\n--- a/src/v4l2/v4l2_camera.h\n+++ b/src/v4l2/v4l2_camera.h\n@@ -48,23 +48,23 @@ public:\n \tV4L2Camera(std::shared_ptr<Camera> camera);\n \t~V4L2Camera();\n \n-\tvoid open(int *ret);\n+\tint open();\n \tvoid close();\n \tvoid getStreamConfig(StreamConfiguration *streamConfig);\n \tstd::vector<FrameMetadata> completedBuffers();\n \n-\tvoid mmap(void **ret, unsigned int index);\n+\tvoid *mmap(unsigned int index);\n \n-\tvoid configure(int *ret, StreamConfiguration *streamConfigOut,\n-\t\t const Size &size, PixelFormat pixelformat,\n-\t\t unsigned int bufferCount);\n+\tint configure(StreamConfiguration *streamConfigOut,\n+\t\t const Size &size, PixelFormat pixelformat,\n+\t\t unsigned int bufferCount);\n \n-\tvoid allocBuffers(int *ret, unsigned int count);\n+\tint allocBuffers(unsigned int count);\n \tvoid freeBuffers();\n-\tvoid streamOn(int *ret);\n-\tvoid streamOff(int *ret);\n+\tint streamOn();\n+\tint streamOff();\n \n-\tvoid qbuf(int *ret, unsigned int index);\n+\tint qbuf(unsigned int index);\n \n \tSemaphore bufferSema_;\n \ndiff --git a/src/v4l2/v4l2_camera_proxy.cpp b/src/v4l2/v4l2_camera_proxy.cpp\nindex 559caba69270..2eeb12396d90 100644\n--- a/src/v4l2/v4l2_camera_proxy.cpp\n+++ b/src/v4l2/v4l2_camera_proxy.cpp\n@@ -40,9 +40,8 @@ int V4L2CameraProxy::open(bool nonBlocking)\n {\n \tLOG(V4L2Compat, Debug) << \"Servicing open\";\n \n-\tint ret;\n-\tvcam_->invokeMethod(&V4L2Camera::open, ConnectionTypeBlocking,\n-\t\t\t &ret);\n+\tint ret = vcam_->invokeMethod(&V4L2Camera::open,\n+\t\t\t\t ConnectionTypeBlocking);\n \tif (ret < 0) {\n \t\terrno = -ret;\n \t\treturn -1;\n@@ -91,9 +90,8 @@ void *V4L2CameraProxy::mmap(size_t length, int prot, int flags, off_t offset)\n \t\treturn MAP_FAILED;\n \t}\n \n-\tvoid *val;\n-\tvcam_->invokeMethod(&V4L2Camera::mmap, ConnectionTypeBlocking,\n-\t\t\t &val, index);\n+\tvoid *val = vcam_->invokeMethod(&V4L2Camera::mmap,\n+\t\t\t\t\tConnectionTypeBlocking, index);\n \n \tbuffers_[index].flags |= V4L2_BUF_FLAG_MAPPED;\n \tmmaps_[val] = index;\n@@ -245,9 +243,11 @@ int V4L2CameraProxy::vidioc_s_fmt(struct v4l2_format *arg)\n \t\treturn ret;\n \n \tSize size(arg->fmt.pix.width, arg->fmt.pix.height);\n-\tvcam_->invokeMethod(&V4L2Camera::configure, ConnectionTypeBlocking,\n-\t\t\t &ret, &streamConfig_, size,\n-\t\t\t v4l2ToDrm(arg->fmt.pix.pixelformat), bufferCount_);\n+\tret = vcam_->invokeMethod(&V4L2Camera::configure,\n+\t\t\t\t ConnectionTypeBlocking,\n+\t\t\t\t &streamConfig_, size,\n+\t\t\t\t v4l2ToDrm(arg->fmt.pix.pixelformat),\n+\t\t\t\t bufferCount_);\n \tif (ret < 0)\n \t\treturn -EINVAL;\n \n@@ -297,9 +297,8 @@ int V4L2CameraProxy::freeBuffers()\n {\n \tLOG(V4L2Compat, Debug) << \"Freeing libcamera bufs\";\n \n-\tint ret;\n-\tvcam_->invokeMethod(&V4L2Camera::streamOff,\n-\t\t\t ConnectionTypeBlocking, &ret);\n+\tint ret = vcam_->invokeMethod(&V4L2Camera::streamOff,\n+\t\t\t\t ConnectionTypeBlocking);\n \tif (ret < 0) {\n \t\tLOG(V4L2Compat, Error) << \"Failed to stop stream\";\n \t\treturn ret;\n@@ -327,10 +326,11 @@ int V4L2CameraProxy::vidioc_reqbufs(struct v4l2_requestbuffers *arg)\n \t\treturn freeBuffers();\n \n \tSize size(curV4L2Format_.fmt.pix.width, curV4L2Format_.fmt.pix.height);\n-\tvcam_->invokeMethod(&V4L2Camera::configure, ConnectionTypeBlocking,\n-\t\t\t &ret, &streamConfig_, size,\n-\t\t\t v4l2ToDrm(curV4L2Format_.fmt.pix.pixelformat),\n-\t\t\t arg->count);\n+\tret = vcam_->invokeMethod(&V4L2Camera::configure,\n+\t\t\t\t ConnectionTypeBlocking,\n+\t\t\t\t &streamConfig_, size,\n+\t\t\t\t v4l2ToDrm(curV4L2Format_.fmt.pix.pixelformat),\n+\t\t\t\t arg->count);\n \tif (ret < 0)\n \t\treturn -EINVAL;\n \n@@ -343,8 +343,8 @@ int V4L2CameraProxy::vidioc_reqbufs(struct v4l2_requestbuffers *arg)\n \targ->count = streamConfig_.bufferCount;\n \tbufferCount_ = arg->count;\n \n-\tvcam_->invokeMethod(&V4L2Camera::allocBuffers,\n-\t\t\t ConnectionTypeBlocking, &ret, arg->count);\n+\tret = vcam_->invokeMethod(&V4L2Camera::allocBuffers,\n+\t\t\t\t ConnectionTypeBlocking, arg->count);\n \tif (ret < 0) {\n \t\targ->count = 0;\n \t\treturn ret;\n@@ -392,9 +392,8 @@ int V4L2CameraProxy::vidioc_qbuf(struct v4l2_buffer *arg)\n \t arg->index >= bufferCount_)\n \t\treturn -EINVAL;\n \n-\tint ret;\n-\tvcam_->invokeMethod(&V4L2Camera::qbuf, ConnectionTypeBlocking,\n-\t\t\t &ret, arg->index);\n+\tint ret = vcam_->invokeMethod(&V4L2Camera::qbuf, ConnectionTypeBlocking,\n+\t\t\t\t arg->index);\n \tif (ret < 0)\n \t\treturn ret;\n \n@@ -437,9 +436,8 @@ int V4L2CameraProxy::vidioc_streamon(int *arg)\n \tif (!validateBufferType(*arg))\n \t\treturn -EINVAL;\n \n-\tint ret;\n-\tvcam_->invokeMethod(&V4L2Camera::streamOn,\n-\t\t\t ConnectionTypeBlocking, &ret);\n+\tint ret = vcam_->invokeMethod(&V4L2Camera::streamOn,\n+\t\t\t\t ConnectionTypeBlocking);\n \n \treturn ret;\n }\n@@ -451,9 +449,8 @@ int V4L2CameraProxy::vidioc_streamoff(int *arg)\n \tif (!validateBufferType(*arg))\n \t\treturn -EINVAL;\n \n-\tint ret;\n-\tvcam_->invokeMethod(&V4L2Camera::streamOff,\n-\t\t\t ConnectionTypeBlocking, &ret);\n+\tint ret = vcam_->invokeMethod(&V4L2Camera::streamOff,\n+\t\t\t\t ConnectionTypeBlocking);\n \n \tfor (struct v4l2_buffer &buf : buffers_)\n \t\tbuf.flags &= ~(V4L2_BUF_FLAG_QUEUED | V4L2_BUF_FLAG_DONE);\n", "prefixes": [ "libcamera-devel", "14/14" ] }