Patch Detail
Show a patch.
GET /api/1.1/patches/1798/?format=api
{ "id": 1798, "url": "https://patchwork.libcamera.org/api/1.1/patches/1798/?format=api", "web_url": "https://patchwork.libcamera.org/patch/1798/", "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": "<20190812150232.1088-1-laurent.pinchart@ideasonboard.com>", "date": "2019-08-12T15:02:32", "name": "[libcamera-devel] hal: Simplify thread RPC with Object::invokeMethod()", "commit_ref": "0c32433d8c742d2a52d44264c64faec2c7ac28f2", "pull_url": null, "state": "accepted", "archived": false, "hash": "ca9c38c19de5a97ea8f9919293e2f23cc49a3543", "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/1798/mbox/", "series": [ { "id": 457, "url": "https://patchwork.libcamera.org/api/1.1/series/457/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=457", "date": "2019-08-12T15:02:32", "name": "[libcamera-devel] hal: Simplify thread RPC with Object::invokeMethod()", "version": 1, "mbox": "https://patchwork.libcamera.org/series/457/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/1798/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/1798/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 EFD9F6161B\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tMon, 12 Aug 2019 17:02:38 +0200 (CEST)", "from pendragon.bb.dnainternet.fi\n\t(dfj612yhrgyx302h3jwwy-3.rev.dnainternet.fi\n\t[IPv6:2001:14ba:21f5:5b00:ce28:277f:58d7:3ca4])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 5A729327\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tMon, 12 Aug 2019 17:02:38 +0200 (CEST)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1565622158;\n\tbh=nsEYxgUZcKHmEuMpI1yMgZhSeBgQxqO/fdfkFolYraI=;\n\th=From:To:Subject:Date:From;\n\tb=U7CpCEuVJNywV9emjRh0Z+WjbA7W0xhTKl2frTTseIs1hxPrlNbGxo4sYatMw/NmN\n\t4yybdgF7JjNNT4jw97hzi3HX8d8x3EKhOxdQ5cbplLTGeMKD8Y06bVof+yerJhYgib\n\tvp/h2r3npZZITnFGLcaysCrWSAW2UPKKgA20bA+c=", "From": "Laurent Pinchart <laurent.pinchart@ideasonboard.com>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Mon, 12 Aug 2019 18:02:32 +0300", "Message-Id": "<20190812150232.1088-1-laurent.pinchart@ideasonboard.com>", "X-Mailer": "git-send-email 2.21.0", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH] hal: Simplify thread RPC with\n\tObject::invokeMethod()", "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": "Mon, 12 Aug 2019 15:02:39 -0000" }, "content": "Replace the manual implementation of asynchronous method invocation\nthrough a custom message with Object::invokeMethod(). This simplifies\nthe thread RPC implementation.\n\nSigned-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n---\n\nThis patch applies on top of the \"[PATCH 00/18] Object & Thread\nenhancements\" series.\n\n src/android/camera_device.cpp | 8 +-------\n src/android/camera_device.h | 4 +++-\n src/android/camera_proxy.cpp | 8 +++-----\n src/android/thread_rpc.cpp | 18 +-----------------\n src/android/thread_rpc.h | 15 ---------------\n 5 files changed, 8 insertions(+), 45 deletions(-)", "diff": "diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\nindex e2c1f2a246c8..999c51e6ba4a 100644\n--- a/src/android/camera_device.cpp\n+++ b/src/android/camera_device.cpp\n@@ -70,14 +70,8 @@ CameraDevice::~CameraDevice()\n /*\n * Handle RPC request received from the associated proxy.\n */\n-void CameraDevice::message(Message *message)\n+void CameraDevice::call(ThreadRpc *rpc)\n {\n-\tif (message->type() != ThreadRpcMessage::type())\n-\t\treturn Object::message(message);\n-\n-\tThreadRpcMessage *rpcMessage = static_cast<ThreadRpcMessage *>(message);\n-\tThreadRpc *rpc = rpcMessage->rpc;\n-\n \tswitch (rpc->tag) {\n \tcase ThreadRpc::ProcessCaptureRequest:\n \t\tprocessCaptureRequest(rpc->request);\ndiff --git a/src/android/camera_device.h b/src/android/camera_device.h\nindex ac5b95c95104..4d834ceb08a5 100644\n--- a/src/android/camera_device.h\n+++ b/src/android/camera_device.h\n@@ -26,13 +26,15 @@\n \t\treturn nullptr;\t\t\\\n \t} while(0);\n \n+class ThreadRpc;\n+\n class CameraDevice : public libcamera::Object\n {\n public:\n \tCameraDevice(unsigned int id, std::shared_ptr<libcamera::Camera> &camera);\n \t~CameraDevice();\n \n-\tvoid message(libcamera::Message *message);\n+\tvoid call(ThreadRpc *rpc);\n \n \tint open();\n \tvoid close();\ndiff --git a/src/android/camera_proxy.cpp b/src/android/camera_proxy.cpp\nindex f0cacac8025b..3eb2f9fbcffb 100644\n--- a/src/android/camera_proxy.cpp\n+++ b/src/android/camera_proxy.cpp\n@@ -9,6 +9,8 @@\n \n #include <system/camera_metadata.h>\n \n+#include <libcamera/object.h>\n+\n #include \"log.h\"\n #include \"message.h\"\n #include \"utils.h\"\n@@ -185,10 +187,6 @@ int CameraProxy::processCaptureRequest(camera3_capture_request_t *request)\n \n void CameraProxy::threadRpcCall(ThreadRpc &rpcRequest)\n {\n-\tstd::unique_ptr<ThreadRpcMessage> message =\n-\t\t\t\tutils::make_unique<ThreadRpcMessage>();\n-\tmessage->rpc = &rpcRequest;\n-\n-\tcameraDevice_->postMessage(std::move(message));\n+\tcameraDevice_->invokeMethod(&CameraDevice::call, &rpcRequest);\n \trpcRequest.waitDelivery();\n }\ndiff --git a/src/android/thread_rpc.cpp b/src/android/thread_rpc.cpp\nindex 295a05d7c676..f57891ff56bf 100644\n--- a/src/android/thread_rpc.cpp\n+++ b/src/android/thread_rpc.cpp\n@@ -5,19 +5,11 @@\n * thread_rpc.cpp - Inter-thread procedure call\n */\n \n+#include \"thread.h\"\n #include \"thread_rpc.h\"\n \n-#include \"message.h\"\n-\n using namespace libcamera;\n \n-libcamera::Message::Type ThreadRpcMessage::rpcType_ = Message::Type::None;\n-\n-ThreadRpcMessage::ThreadRpcMessage()\n-\t: Message(type())\n-{\n-}\n-\n void ThreadRpc::notifyReception()\n {\n \t{\n@@ -32,11 +24,3 @@ void ThreadRpc::waitDelivery()\n \tlibcamera::MutexLocker locker(mutex_);\n \tcv_.wait(locker, [&] { return delivered_; });\n }\n-\n-Message::Type ThreadRpcMessage::type()\n-{\n-\tif (ThreadRpcMessage::rpcType_ == Message::Type::None)\n-\t\trpcType_ = Message::registerMessageType();\n-\n-\treturn rpcType_;\n-}\ndiff --git a/src/android/thread_rpc.h b/src/android/thread_rpc.h\nindex 6d8992839d0b..f577a5d9fb32 100644\n--- a/src/android/thread_rpc.h\n+++ b/src/android/thread_rpc.h\n@@ -12,9 +12,6 @@\n \n #include <hardware/camera3.h>\n \n-#include \"message.h\"\n-#include \"thread.h\"\n-\n class ThreadRpc\n {\n public:\n@@ -39,16 +36,4 @@ private:\n \tstd::condition_variable cv_;\n };\n \n-class ThreadRpcMessage : public libcamera::Message\n-{\n-public:\n-\tThreadRpcMessage();\n-\tThreadRpc *rpc;\n-\n-\tstatic Message::Type type();\n-\n-private:\n-\tstatic libcamera::Message::Type rpcType_;\n-};\n-\n #endif /* __ANDROID_THREAD_RPC_H__ */\n", "prefixes": [ "libcamera-devel" ] }