Patch Detail
Show a patch.
GET /api/1.1/patches/1637/?format=api
{ "id": 1637, "url": "https://patchwork.libcamera.org/api/1.1/patches/1637/?format=api", "web_url": "https://patchwork.libcamera.org/patch/1637/", "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": "<20190709184450.32023-5-paul.elder@ideasonboard.com>", "date": "2019-07-09T18:44:47", "name": "[libcamera-devel,v3,4/7] libcamera: proxy: add default linux IPA proxy", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "7869263b45f8e7badf679509e69095f6cd1d16dc", "submitter": { "id": 17, "url": "https://patchwork.libcamera.org/api/1.1/people/17/?format=api", "name": "Paul Elder", "email": "paul.elder@ideasonboard.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/1637/mbox/", "series": [ { "id": 410, "url": "https://patchwork.libcamera.org/api/1.1/series/410/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=410", "date": "2019-07-09T18:44:43", "name": "Add IPA process isolation", "version": 3, "mbox": "https://patchwork.libcamera.org/series/410/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/1637/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/1637/checks/", "tags": {}, "headers": { "Return-Path": "<paul.elder@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 7F97761577\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 9 Jul 2019 20:45:07 +0200 (CEST)", "from neptunite.amanokami.net (softbank126163157105.bbtec.net\n\t[126.163.157.105])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 0382D56A;\n\tTue, 9 Jul 2019 20:45:05 +0200 (CEST)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1562697907;\n\tbh=t54uBJ1gYUlyKdE0Dt1Ip77xedGW72MuUmx/KSnpPpI=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=Ig8icIOt10YQVEK/P81oGdcs9zQCgVnicnM1JUT/zdU+u0fQ/zYHh/1YhMHkyvIgB\n\tIWSgAVWMxEDpebUe00qqyf/DMoQYdggThjS2z267Ttu2An+7xbucnApieif5IuHybK\n\t3fVbUo6Wk+3KtOK9FOU5jEdHBynF3VTKWJlN9t40=", "From": "Paul Elder <paul.elder@ideasonboard.com>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Wed, 10 Jul 2019 03:44:47 +0900", "Message-Id": "<20190709184450.32023-5-paul.elder@ideasonboard.com>", "X-Mailer": "git-send-email 2.20.1", "In-Reply-To": "<20190709184450.32023-1-paul.elder@ideasonboard.com>", "References": "<20190709184450.32023-1-paul.elder@ideasonboard.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH v3 4/7] libcamera: proxy: add default\n\tlinux IPA proxy", "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": "Tue, 09 Jul 2019 18:45:07 -0000" }, "content": "Add a skeletal default linux IPA proxy. It currently lacks the IPA proxy\nprotocol itself.\n\nSigned-off-by: Paul Elder <paul.elder@ideasonboard.com>\n---\nChanges in v3:\n- better logging (both main proxy and proxy worker)\n- renamed ProxyLinuxDefault to IPAProxyLinux\n- initialize listeners for IPC\n\nNew in v2\n- replaces the dummy/linux default shim\n\n src/libcamera/meson.build | 7 +-\n src/libcamera/proxy/ipa_proxy_linux.cpp | 96 +++++++++++++++++++\n src/libcamera/proxy/meson.build | 3 +\n .../proxy/worker/ipa_proxy_linux_worker.cpp | 89 +++++++++++++++++\n src/libcamera/proxy/worker/meson.build | 16 ++++\n 5 files changed, 207 insertions(+), 4 deletions(-)\n create mode 100644 src/libcamera/proxy/ipa_proxy_linux.cpp\n create mode 100644 src/libcamera/proxy/meson.build\n create mode 100644 src/libcamera/proxy/worker/ipa_proxy_linux_worker.cpp\n create mode 100644 src/libcamera/proxy/worker/meson.build", "diff": "diff --git a/src/libcamera/meson.build b/src/libcamera/meson.build\nindex 73a6fc7..57238fe 100644\n--- a/src/libcamera/meson.build\n+++ b/src/libcamera/meson.build\n@@ -64,10 +64,7 @@ includes = [\n ]\n \n subdir('pipeline')\n-\n-proxy_install_dir = join_paths(get_option('libdir'), 'libcamera', 'proxy')\n-config_h.set('IPA_PROXY_DIR',\n- '\"' + join_paths(get_option('prefix'), proxy_install_dir) + '\"')\n+subdir('proxy')\n \n libudev = dependency('libudev', required : false)\n \n@@ -111,3 +108,5 @@ libcamera = shared_library('camera',\n libcamera_dep = declare_dependency(sources : [libcamera_api, libcamera_h],\n include_directories : libcamera_includes,\n link_with : libcamera)\n+\n+subdir('proxy/worker')\ndiff --git a/src/libcamera/proxy/ipa_proxy_linux.cpp b/src/libcamera/proxy/ipa_proxy_linux.cpp\nnew file mode 100644\nindex 0000000..1f982f7\n--- /dev/null\n+++ b/src/libcamera/proxy/ipa_proxy_linux.cpp\n@@ -0,0 +1,96 @@\n+/* SPDX-License-Identifier: LGPL-2.1-or-later */\n+/*\n+ * Copyright (C) 2019, Google Inc.\n+ *\n+ * ipa_proxy_linux.cpp - Default Image Processing Algorithm proxy for Linux\n+ */\n+\n+#include <vector>\n+\n+#include <libcamera/ipa/ipa_interface.h>\n+#include <libcamera/ipa/ipa_module_info.h>\n+\n+#include \"ipa_module.h\"\n+#include \"ipa_proxy.h\"\n+#include \"ipc_unixsocket.h\"\n+#include \"log.h\"\n+#include \"process.h\"\n+\n+namespace libcamera {\n+\n+LOG_DECLARE_CATEGORY(IPAProxy)\n+\n+class IPAProxyLinux : public IPAProxy\n+{\n+public:\n+\tIPAProxyLinux(IPAModule *ipam);\n+\t~IPAProxyLinux();\n+\n+\tint init();\n+\n+private:\n+\tvoid readyRead(IPCUnixSocket *ipc);\n+\n+\tProcess *proc_;\n+\n+\tIPCUnixSocket *socket_;\n+};\n+\n+int IPAProxyLinux::init()\n+{\n+\tLOG(IPAProxy, Debug) << \"initializing IPA via dummy proxy!\";\n+\n+\treturn 0;\n+}\n+\n+IPAProxyLinux::IPAProxyLinux(IPAModule *ipam)\n+{\n+\tLOG(IPAProxy, Debug)\n+\t\t<< \"initializing dummy proxy: loading IPA from \"\n+\t\t<< ipam->path();\n+\n+\tstd::vector<int> fds;\n+\tstd::vector<std::string> args;\n+\targs.push_back(ipam->path());\n+\tconst std::string path = resolvePath(\"ipa_proxy_linux\");\n+\tif (path.empty()) {\n+\t\tLOG(IPAProxy, Error)\n+\t\t\t<< \"Failed to get IPAProxyLinux worker path\";\n+\t\treturn;\n+\t}\n+\n+\tsocket_ = new IPCUnixSocket();\n+\tint fd = socket_->create();\n+\tif (fd < 0) {\n+\t\tLOG(IPAProxy, Error)\n+\t\t\t<< \"Failed to create socket for IPAProxyLinux\";\n+\t\treturn;\n+\t}\n+\targs.push_back(std::to_string(fd));\n+\tfds.push_back(fd);\n+\n+\tproc_ = new Process();\n+\tint ret = proc_->start(path, args, fds);\n+\tif (ret) {\n+\t\tLOG(IPAProxy, Error)\n+\t\t\t<< \"Failed to start IPAProxyLinux worker process\";\n+\t\treturn;\n+\t}\n+\tsocket_->readyRead.connect(this, &IPAProxyLinux::readyRead);\n+\n+\tvalid_ = true;\n+}\n+\n+IPAProxyLinux::~IPAProxyLinux()\n+{\n+\tdelete proc_;\n+\tdelete socket_;\n+}\n+\n+void IPAProxyLinux::readyRead(IPCUnixSocket *ipc)\n+{\n+}\n+\n+REGISTER_IPA_PROXY(IPAProxyLinux)\n+\n+}; /* namespace libcamera */\ndiff --git a/src/libcamera/proxy/meson.build b/src/libcamera/proxy/meson.build\nnew file mode 100644\nindex 0000000..efc1132\n--- /dev/null\n+++ b/src/libcamera/proxy/meson.build\n@@ -0,0 +1,3 @@\n+libcamera_sources += files([\n+ 'ipa_proxy_linux.cpp',\n+])\ndiff --git a/src/libcamera/proxy/worker/ipa_proxy_linux_worker.cpp b/src/libcamera/proxy/worker/ipa_proxy_linux_worker.cpp\nnew file mode 100644\nindex 0000000..adf4511\n--- /dev/null\n+++ b/src/libcamera/proxy/worker/ipa_proxy_linux_worker.cpp\n@@ -0,0 +1,89 @@\n+/* SPDX-License-Identifier: GPL-2.0-or-later */\n+/*\n+ * Copyright (C) 2019, Google Inc.\n+ *\n+ * ipa_proxy_linux_worker.cpp - Default Image Processing Algorithm proxy worker for Linux\n+ */\n+\n+#include <iostream>\n+#include <sys/types.h>\n+#include <unistd.h>\n+\n+#include <libcamera/camera_manager.h>\n+#include <libcamera/event_dispatcher.h>\n+#include <libcamera/ipa/ipa_interface.h>\n+\n+#include \"ipa_module.h\"\n+#include \"ipc_unixsocket.h\"\n+#include \"log.h\"\n+#include \"utils.h\"\n+\n+using namespace libcamera;\n+\n+LOG_DEFINE_CATEGORY(IPAProxyLinuxWorker)\n+\n+void readyRead(IPCUnixSocket *ipc)\n+{\n+\tIPCUnixSocket::Payload message;\n+\tint ret;\n+\n+\tret = ipc->receive(&message);\n+\tif (ret) {\n+\t\tLOG(IPAProxyLinuxWorker, Error)\n+\t\t\t<< \"Receive message failed: \" << ret;\n+\t\treturn;\n+\t}\n+\n+\tLOG(IPAProxyLinuxWorker, Debug) << \"Received a message!\";\n+}\n+\n+int main(int argc, char **argv)\n+{\n+\tstd::string logPath = \"/tmp/libcamera.worker.\" + std::to_string(getpid()) + \".log\";\n+\tint ret = setenv(\"LIBCAMERA_LOG_FILE\", logPath.c_str(), 1);\n+\tif (ret < 0) {\n+\t\tret = errno;\n+\t\tstd::cerr << \"Failed to read log file env variable\" << std::endl;\n+\t\treturn ret;\n+\t}\n+\n+\tif (argc < 3) {\n+\t\tLOG(IPAProxyLinuxWorker, Debug)\n+\t\t\t<< \"Tried to start worker with no args\";\n+\t\treturn EXIT_FAILURE;\n+\t}\n+\n+\tint fd = std::stoi(argv[2]);\n+\tLOG(IPAProxyLinuxWorker, Debug)\n+\t\t<< \"Starting worker for IPA module \" << argv[1]\n+\t\t<< \" with IPC fd = \" << fd;\n+\n+\tstd::unique_ptr<IPAModule> ipam = utils::make_unique<IPAModule>(argv[1]);\n+\tif (!ipam->isValid() || !ipam->load()) {\n+\t\tLOG(IPAProxyLinuxWorker, Error)\n+\t\t\t<< \"IPAModule \" << argv[1] << \" should be valid but isn't\";\n+\t\treturn EXIT_FAILURE;\n+\t}\n+\n+\tIPCUnixSocket socket;\n+\tif (socket.bind(fd) < 0) {\n+\t\tLOG(IPAProxyLinuxWorker, Error) << \"IPC socket binding failed\";\n+\t\treturn EXIT_FAILURE;\n+\t}\n+\tsocket.readyRead.connect(&readyRead);\n+\n+\tstd::unique_ptr<IPAInterface> ipa = ipam->createInstance();\n+\tif (!ipa) {\n+\t\tLOG(IPAProxyLinuxWorker, Error) << \"Failed to create IPA interface\";\n+\t\treturn EXIT_FAILURE;\n+\t}\n+\n+\tLOG(IPAProxyLinuxWorker, Debug) << \"Proxy worker successfully started!\";\n+\n+\t/* TODO upgrade listening loop */\n+\tEventDispatcher *dispatcher = CameraManager::instance()->eventDispatcher();\n+\twhile (1)\n+\t\tdispatcher->processEvents();\n+\n+\treturn 0;\n+}\ndiff --git a/src/libcamera/proxy/worker/meson.build b/src/libcamera/proxy/worker/meson.build\nnew file mode 100644\nindex 0000000..839156f\n--- /dev/null\n+++ b/src/libcamera/proxy/worker/meson.build\n@@ -0,0 +1,16 @@\n+ipa_proxy_sources = [\n+ ['ipa_proxy_linux', 'ipa_proxy_linux_worker.cpp']\n+]\n+\n+proxy_install_dir = join_paths(get_option('libexecdir'), 'libcamera')\n+\n+foreach t : ipa_proxy_sources\n+ proxy = executable(t[0], t[1],\n+ include_directories : libcamera_internal_includes,\n+ install : true,\n+ install_dir : proxy_install_dir,\n+ dependencies : libcamera_dep)\n+endforeach\n+\n+config_h.set('IPA_PROXY_DIR',\n+ '\"' + join_paths(get_option('prefix'), proxy_install_dir) + '\"')\n", "prefixes": [ "libcamera-devel", "v3", "4/7" ] }