{"id":1592,"url":"https://patchwork.libcamera.org/api/1.1/patches/1592/?format=json","web_url":"https://patchwork.libcamera.org/patch/1592/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/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":"<20190703080007.21376-5-paul.elder@ideasonboard.com>","date":"2019-07-03T08:00:04","name":"[libcamera-devel,RFC,v2,4/7] libcamera: proxy: add default linux proxy","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"b41c409063f8f816f885dc0afe90c124ad7593e3","submitter":{"id":17,"url":"https://patchwork.libcamera.org/api/1.1/people/17/?format=json","name":"Paul Elder","email":"paul.elder@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/1592/mbox/","series":[{"id":392,"url":"https://patchwork.libcamera.org/api/1.1/series/392/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=392","date":"2019-07-03T08:00:00","name":"Add IPA process isolation","version":2,"mbox":"https://patchwork.libcamera.org/series/392/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/1592/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/1592/checks/","tags":{},"headers":{"Return-Path":"","Received":["from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id A772D61570\n\tfor ;\n\tWed, 3 Jul 2019 10:00:31 +0200 (CEST)","from neptunite.flets-east.jp\n\t(p1871204-ipngn14001hodogaya.kanagawa.ocn.ne.jp [153.220.127.204])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 3E49224B;\n\tWed, 3 Jul 2019 10:00:29 +0200 (CEST)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1562140831;\n\tbh=0lfv3ebIrfnTrad1gW5etS9qqRfT+3ME5te7dwLePFc=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=DOnHjHLo2hMaRDI9UJLAT1I4ZltjQM3H0ZRexvsMOQeKEW7+7rNwrjnihDijFE5rr\n\tvPrI2epGvz7c1RH/6Xr2gpnT0ZAX6I5KzbttzFpM3jd4FFwle2vMV49gQImtoDRmZj\n\tHQvgNFBB59h2sEiB2spu5FYYf+jbm99FKoQD5Omg=","From":"Paul Elder ","To":"libcamera-devel@lists.libcamera.org","Date":"Wed, 3 Jul 2019 17:00:04 +0900","Message-Id":"<20190703080007.21376-5-paul.elder@ideasonboard.com>","X-Mailer":"git-send-email 2.20.1","In-Reply-To":"<20190703080007.21376-1-paul.elder@ideasonboard.com>","References":"<20190703080007.21376-1-paul.elder@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [RFC PATCH v2 4/7] libcamera: proxy: add default\n\tlinux proxy","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":"Wed, 03 Jul 2019 08:00:31 -0000"},"content":"Add a default linux proxy.\n\nSigned-off-by: Paul Elder \n---\nNew in v2\n- replaces the dummy/linux default shim\n\n src/libcamera/meson.build | 7 +-\n src/libcamera/proxy/meson.build | 3 +\n src/libcamera/proxy/proxy_linux_default.cpp | 90 +++++++++++++++++++\n src/libcamera/proxy_worker/meson.build | 18 ++++\n .../proxy_linux_default_worker.cpp | 46 ++++++++++\n 5 files changed, 160 insertions(+), 4 deletions(-)\n create mode 100644 src/libcamera/proxy/meson.build\n create mode 100644 src/libcamera/proxy/proxy_linux_default.cpp\n create mode 100644 src/libcamera/proxy_worker/meson.build\n create mode 100644 src/libcamera/proxy_worker/proxy_linux_default_worker.cpp","diff":"diff --git a/src/libcamera/meson.build b/src/libcamera/meson.build\nindex 412564f..e470fe7 100644\n--- a/src/libcamera/meson.build\n+++ b/src/libcamera/meson.build\n@@ -65,10 +65,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@@ -103,3 +100,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/meson.build b/src/libcamera/proxy/meson.build\nnew file mode 100644\nindex 0000000..508ed5f\n--- /dev/null\n+++ b/src/libcamera/proxy/meson.build\n@@ -0,0 +1,3 @@\n+libcamera_sources += files([\n+ 'proxy_linux_default.cpp',\n+])\ndiff --git a/src/libcamera/proxy/proxy_linux_default.cpp b/src/libcamera/proxy/proxy_linux_default.cpp\nnew file mode 100644\nindex 0000000..1de028a\n--- /dev/null\n+++ b/src/libcamera/proxy/proxy_linux_default.cpp\n@@ -0,0 +1,90 @@\n+/* SPDX-License-Identifier: LGPL-2.1-or-later */\n+/*\n+ * Copyright (C) 2019, Google Inc.\n+ *\n+ * proxy_linux_default.cpp - Default Image Processing Algorithm proxy for Linux\n+ */\n+\n+#include \n+#include \n+#include \n+\n+#include \n+#include \n+#include \n+#include \n+#include \n+#include \n+\n+#include \n+#include \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+#include \"process_manager.h\"\n+\n+namespace libcamera {\n+\n+LOG_DEFINE_CATEGORY(ProxyLinuxDefault)\n+\n+class ProxyLinuxDefault : public Proxy\n+{\n+public:\n+\tProxyLinuxDefault(IPAModule *ipam);\n+\t~ProxyLinuxDefault();\n+\n+\tint init();\n+\n+private:\n+\tProcess *proc_;\n+\n+\tIPCUnixSocket *socket_;\n+};\n+\n+int ProxyLinuxDefault::init()\n+{\n+\tstd::cout << \"initializing IPA via dummy proxy!\" << std::endl;\n+\n+\treturn 0;\n+}\n+\n+ProxyLinuxDefault::ProxyLinuxDefault(IPAModule *ipam)\n+\t: Proxy(ipam)\n+{\n+\tstd::cout << \"initializing dummy proxy: loading IPA from \"\n+\t\t << ipam->path() << std::endl;\n+\n+\tstd::vector fds;\n+\tstd::vector args;\n+\targs.push_back(ipam->path());\n+\tconst std::string path = resolvePath(\"proxy_linux_default\");\n+\tif (path.empty())\n+\t\treturn;\n+\n+\tsocket_ = new IPCUnixSocket();\n+\tint fd = socket_->create();\n+\tif (fd < 0)\n+\t\treturn;\n+\targs.push_back(std::to_string(fd));\n+\n+\tproc_ = new Process();\n+\tproc_->exec(path, args, fds);\n+\n+\tvalid_ = true;\n+\treturn;\n+}\n+\n+ProxyLinuxDefault::~ProxyLinuxDefault()\n+{\n+\tif (proc_)\n+\t\tdelete proc_;\n+\tif (socket_)\n+\t\tdelete socket_;\n+}\n+\n+REGISTER_IPA_PROXY(ProxyLinuxDefault)\n+\n+}; /* namespace libcamera */\ndiff --git a/src/libcamera/proxy_worker/meson.build b/src/libcamera/proxy_worker/meson.build\nnew file mode 100644\nindex 0000000..6f927c5\n--- /dev/null\n+++ b/src/libcamera/proxy_worker/meson.build\n@@ -0,0 +1,18 @@\n+ipa_proxy_sources = [\n+ ['proxy_linux_default', 'proxy_linux_default_worker.cpp']\n+]\n+\n+proxy_install_dir = join_paths(get_option('libdir'), 'libcamera', 'proxy')\n+\n+foreach t : ipa_proxy_sources\n+ proxy = executable(t[0],\n+ t[1],\n+ name_prefix : '',\n+ include_directories : includes,\n+ install : true,\n+ install_dir : proxy_install_dir,\n+ link_with : libcamera)\n+endforeach\n+\n+config_h.set('IPA_PROXY_DIR',\n+ '\"' + join_paths(get_option('prefix'), proxy_install_dir) + '\"')\ndiff --git a/src/libcamera/proxy_worker/proxy_linux_default_worker.cpp b/src/libcamera/proxy_worker/proxy_linux_default_worker.cpp\nnew file mode 100644\nindex 0000000..86b7689\n--- /dev/null\n+++ b/src/libcamera/proxy_worker/proxy_linux_default_worker.cpp\n@@ -0,0 +1,46 @@\n+#include \n+\n+#include \n+\n+#include \n+\n+#include \"ipa_module.h\"\n+#include \"ipc_unixsocket.h\"\n+#include \"utils.h\"\n+\n+using namespace libcamera;\n+\n+int main(int argc, char **argv)\n+{\n+\tif (argc < 3) {\n+\t\tstd::cout << \"hello world! no args\" << std::endl;\n+\t\treturn 0;\n+\t}\n+\n+\tint fd = std::stoi(argv[2]);\n+\tstd::cout << \"hello world! we're starting! fd = \" << fd << \", path = \" << argv[1] << std::endl;\n+\n+\tstd::unique_ptr ipam = utils::make_unique(argv[1]);\n+\tif (!ipam->isValid() || !ipam->load()) {\n+\t\tstd::cerr << \"Houston, we have a problem: IPAModule should be valid but isn't\" << std::endl;\n+\t\treturn -1;\n+\t}\n+\n+\tIPCUnixSocket socket;\n+\tif (socket.bind(fd) < 0) {\n+\t\tstd::cerr << \"IPC socket binding failed\" << std::endl;\n+\t\treturn -1;\n+\t}\n+\n+\tstd::unique_ptr ipa = ipam->createInstance();\n+\tif (!ipa) {\n+\t\tstd::cerr << \"Failed to create IPA interface\" << std::endl;\n+\t\treturn -1;\n+\t}\n+\n+\tstd::cout << \"hello world from the proxy worker!\" << std::endl;\n+\n+\t/* TODO IPC listening loop */\n+\n+\treturn 0;\n+}\n","prefixes":["libcamera-devel","RFC","v2","4/7"]}