Patch Detail
Show a patch.
GET /api/patches/10584/?format=api
{ "id": 10584, "url": "https://patchwork.libcamera.org/api/patches/10584/?format=api", "web_url": "https://patchwork.libcamera.org/patch/10584/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/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": "<20201205103106.242080-22-paul.elder@ideasonboard.com>", "date": "2020-12-05T10:31:04", "name": "[libcamera-devel,v5,21/23] tests: Add test for IPCPipeUnixSocket", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "b74052cb143e5c5a130e5937e5e2e278fa3b1519", "submitter": { "id": 17, "url": "https://patchwork.libcamera.org/api/people/17/?format=api", "name": "Paul Elder", "email": "paul.elder@ideasonboard.com" }, "delegate": { "id": 17, "url": "https://patchwork.libcamera.org/api/users/17/?format=api", "username": "epaul", "first_name": "Paul", "last_name": "Elder", "email": "paul.elder@ideasonboard.com" }, "mbox": "https://patchwork.libcamera.org/patch/10584/mbox/", "series": [ { "id": 1506, "url": "https://patchwork.libcamera.org/api/series/1506/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=1506", "date": "2020-12-05T10:30:43", "name": "IPA isolation implementation", "version": 5, "mbox": "https://patchwork.libcamera.org/series/1506/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/10584/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/10584/checks/", "tags": {}, "headers": { "Return-Path": "<libcamera-devel-bounces@lists.libcamera.org>", "X-Original-To": "parsemail@patchwork.libcamera.org", "Delivered-To": "parsemail@patchwork.libcamera.org", "Received": [ "from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id AF902BDB20\n\tfor <parsemail@patchwork.libcamera.org>;\n\tSat, 5 Dec 2020 10:32:03 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 7DCBC635FA;\n\tSat, 5 Dec 2020 11:32:03 +0100 (CET)", "from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 9DD44635F7\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tSat, 5 Dec 2020 11:32:02 +0100 (CET)", "from pyrite.rasen.tech (unknown\n\t[IPv6:2400:4051:61:600:2c71:1b79:d06d:5032])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 4C9642A4;\n\tSat, 5 Dec 2020 11:32:01 +0100 (CET)" ], "Authentication-Results": "lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"ob9MiEqb\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1607164322;\n\tbh=X4krYc102aiM/pHeH3b5FqwvVyas206y5KBVn3DGO7Q=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=ob9MiEqb/1/h7pHMu5eDclugJujNR2N2z+iTl7DktkzSsvhbjFp7/v4ZgmkiB74WB\n\t+AAnbdQuOS+RONtPCYDq0jbjevu8HfLq9uOoxhCFaXj6afCzU575RbZRy3kRvxpszZ\n\tl1QfODSV/P2mQssvYvUhrPY8Zu+jHiuOD1jZtrkE=", "From": "Paul Elder <paul.elder@ideasonboard.com>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Sat, 5 Dec 2020 19:31:04 +0900", "Message-Id": "<20201205103106.242080-22-paul.elder@ideasonboard.com>", "X-Mailer": "git-send-email 2.27.0", "In-Reply-To": "<20201205103106.242080-1-paul.elder@ideasonboard.com>", "References": "<20201205103106.242080-1-paul.elder@ideasonboard.com>", "MIME-Version": "1.0", "Subject": "[libcamera-devel] [PATCH v5 21/23] tests: Add test for\n\tIPCPipeUnixSocket", "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>", "Content-Type": "text/plain; charset=\"us-ascii\"", "Content-Transfer-Encoding": "7bit", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "Test the IPC functions of IPCPipeUnixSocket.\n\nSigned-off-by: Paul Elder <paul.elder@ideasonboard.com>\n\n---\nChanges in v5:\n- rename IPAIPCUnixSocket to IPCPipeUnixSocket\n- use IPCMessage\n\nNo change in v4\n\nChanges in v3:\n- use readHeader, writeHeader, and eraseHeader as static class functions\n of IPAIPCUnixSocket\n\nNew in v2\n---\n test/ipc/meson.build | 3 +-\n test/ipc/unixsocket_ipc.cpp | 237 ++++++++++++++++++++++++++++++++++++\n 2 files changed, 239 insertions(+), 1 deletion(-)\n create mode 100644 test/ipc/unixsocket_ipc.cpp", "diff": "diff --git a/test/ipc/meson.build b/test/ipc/meson.build\nindex 650df1d6..ecb6d022 100644\n--- a/test/ipc/meson.build\n+++ b/test/ipc/meson.build\n@@ -1,7 +1,8 @@\n # SPDX-License-Identifier: CC0-1.0\n \n ipc_tests = [\n- [ 'unixsocket', 'unixsocket.cpp' ],\n+ [ 'unixsocket_ipc', 'unixsocket_ipc.cpp' ],\n+ [ 'unixsocket', 'unixsocket.cpp' ],\n ]\n \n foreach t : ipc_tests\ndiff --git a/test/ipc/unixsocket_ipc.cpp b/test/ipc/unixsocket_ipc.cpp\nnew file mode 100644\nindex 00000000..827689f7\n--- /dev/null\n+++ b/test/ipc/unixsocket_ipc.cpp\n@@ -0,0 +1,237 @@\n+/* SPDX-License-Identifier: GPL-2.0-or-later */\n+/*\n+ * Copyright (C) 2020, Google Inc.\n+ *\n+ * unixsocket_ipc.cpp - Unix socket IPC test\n+ */\n+\n+#include <algorithm>\n+#include <fcntl.h>\n+#include <iostream>\n+#include <stdlib.h>\n+#include <string.h>\n+#include <sys/stat.h>\n+#include <sys/types.h>\n+#include <sys/wait.h>\n+#include <unistd.h>\n+\n+#include \"libcamera/internal/event_dispatcher.h\"\n+#include \"libcamera/internal/ipa_data_serializer.h\"\n+#include \"libcamera/internal/ipc_pipe.h\"\n+#include \"libcamera/internal/ipc_pipe_unixsocket.h\"\n+#include \"libcamera/internal/process.h\"\n+#include \"libcamera/internal/thread.h\"\n+#include \"libcamera/internal/timer.h\"\n+#include \"libcamera/internal/utils.h\"\n+\n+#include \"test.h\"\n+\n+#define CMD_EXIT\t0\n+#define CMD_GET_SYNC\t1\n+#define CMD_SET_ASYNC\t2\n+\n+using namespace std;\n+using namespace libcamera;\n+\n+class UnixSocketTestIPCSlave\n+{\n+public:\n+\tUnixSocketTestIPCSlave()\n+\t\t: value_(1337), exitCode_(EXIT_FAILURE), exit_(false)\n+\t{\n+\t\tdispatcher_ = Thread::current()->eventDispatcher();\n+\t\tipc_.readyRead.connect(this, &UnixSocketTestIPCSlave::readyRead);\n+\t}\n+\n+\tint run(int fd)\n+\t{\n+\t\tif (ipc_.bind(fd)) {\n+\t\t\tcerr << \"Failed to connect to IPC channel\" << endl;\n+\t\t\treturn EXIT_FAILURE;\n+\t\t}\n+\n+\t\twhile (!exit_)\n+\t\t\tdispatcher_->processEvents();\n+\n+\t\tipc_.close();\n+\n+\t\treturn exitCode_;\n+\t}\n+\n+private:\n+\tvoid readyRead(IPCUnixSocket *ipc)\n+\t{\n+\t\tIPCUnixSocket::Payload message;\n+\t\tint ret;\n+\n+\t\tret = ipc->receive(&message);\n+\t\tif (ret) {\n+\t\t\tcerr << \"Receive message failed: \" << ret << endl;\n+\t\t\treturn;\n+\t\t}\n+\n+\t\tIPCMessage ipcMessage(message);\n+\t\tuint32_t cmd = ipcMessage.header().cmd;\n+\n+\t\tswitch (cmd) {\n+\t\tcase CMD_EXIT: {\n+\t\t\texit_ = true;\n+\t\t\tbreak;\n+\t\t}\n+\n+\t\tcase CMD_GET_SYNC: {\n+\t\t\tIPCMessage::Header header = { cmd, ipcMessage.header().cookie };\n+\t\t\tIPCMessage response(header);\n+\n+\t\t\tvector<uint8_t> buf;\n+\t\t\ttie(buf, ignore) = IPADataSerializer<int32_t>::serialize(value_);\n+\t\t\tresponse.data().insert(response.data().end(), buf.begin(), buf.end());\n+\n+\t\t\tret = ipc_.send(response.payload());\n+\t\t\tif (ret < 0) {\n+\t\t\t\tcerr << \"Reply failed\" << endl;\n+\t\t\t\tstop(ret);\n+\t\t\t}\n+\t\t\tbreak;\n+\t\t}\n+\n+\t\tcase CMD_SET_ASYNC: {\n+\t\t\tvalue_ = IPADataSerializer<int32_t>::deserialize(ipcMessage.data());\n+\t\t\tbreak;\n+\t\t}\n+\t\t}\n+\t}\n+\n+\tvoid stop(int code)\n+\t{\n+\t\texitCode_ = code;\n+\t\texit_ = true;\n+\t}\n+\n+\tint32_t value_;\n+\n+\tIPCUnixSocket ipc_;\n+\tEventDispatcher *dispatcher_;\n+\tint exitCode_;\n+\tbool exit_;\n+};\n+\n+class UnixSocketTestIPC : public Test\n+{\n+protected:\n+\tint init()\n+\t{\n+\t\treturn 0;\n+\t}\n+\n+\tint setVal(int32_t val)\n+\t{\n+\t\tIPCMessage buf;\n+\t\ttie(buf.data(), ignore) = IPADataSerializer<int32_t>::serialize(val);\n+\n+\t\tint ret = ipc_->sendAsync(CMD_SET_ASYNC, buf);\n+\t\tif (ret < 0) {\n+\t\t\tcerr << \"Failed to call set value\" << endl;\n+\t\t\treturn ret;\n+\t\t}\n+\n+\t\treturn 0;\n+\t}\n+\n+\tint getVal()\n+\t{\n+\t\tIPCMessage buf;\n+\n+\t\tint ret = ipc_->sendSync(CMD_GET_SYNC, {}, &buf);\n+\t\tif (ret < 0) {\n+\t\t\tcerr << \"Failed to call get value\" << endl;\n+\t\t\treturn ret;\n+\t\t}\n+\n+\t\treturn IPADataSerializer<int32_t>::deserialize(buf.data());\n+\t}\n+\n+\tint exit()\n+\t{\n+\t\tint ret = ipc_->sendAsync(CMD_EXIT, {});\n+\t\tif (ret < 0) {\n+\t\t\tcerr << \"Failed to call exit\" << endl;\n+\t\t\treturn ret;\n+\t\t}\n+\n+\t\treturn 0;\n+\t}\n+\n+\tint run()\n+\t{\n+\t\tchar selfpath[100];\n+\t\tmemset(selfpath, 0, sizeof(selfpath));\n+\t\tint ret = readlink(\"/proc/self/exe\", selfpath, sizeof(selfpath));\n+\t\tif (ret < 0) {\n+\t\t\tint err = errno;\n+\t\t\tcerr << \"Failed to get path: \" << strerror(err) << endl;\n+\t\t\treturn TestFail;\n+\t\t}\n+\n+\t\tipc_ = std::make_unique<IPCPipeUnixSocket>(\"\", selfpath);\n+\t\tif (!ipc_->isConnected()) {\n+\t\t\tcerr << \"Failed to create IPCPipe\" << endl;\n+\t\t\treturn TestFail;\n+\t\t}\n+\n+\t\tret = getVal();\n+\t\tif (ret < 0) {\n+\t\t\tcerr << \"Failed to get initial value: \" << strerror(-ret) << endl;\n+\t\t\treturn TestFail;\n+\t\t}\n+\t\tif (ret != 1337) {\n+\t\t\tcerr << \"Wrong inital value, expected 1337, got \" << ret << endl;\n+\t\t\treturn TestFail;\n+\t\t}\n+\n+\t\tret = setVal(9001);\n+\t\tif (ret < 0) {\n+\t\t\tcerr << \"Failed to set value: \" << strerror(-ret) << endl;\n+\t\t\treturn TestFail;\n+\t\t}\n+\n+\t\tret = getVal();\n+\t\tif (ret < 0) {\n+\t\t\tcerr << \"Failed to get value: \" << strerror(-ret) << endl;\n+\t\t\treturn TestFail;\n+\t\t}\n+\t\tif (ret != 9001) {\n+\t\t\tcerr << \"Wrong set value, expected 9001, got \" << ret << endl;\n+\t\t\treturn TestFail;\n+\t\t}\n+\n+\t\tret = exit();\n+\t\tif (ret < 0) {\n+\t\t\tcerr << \"Failed to exit: \" << strerror(-ret) << endl;\n+\t\t\treturn TestFail;\n+\t\t}\n+\n+\t\treturn TestPass;\n+\t}\n+\n+private:\n+\tProcessManager processManager_;\n+\n+\tunique_ptr<IPCPipeUnixSocket> ipc_;\n+};\n+\n+/*\n+ * Can't use TEST_REGISTER() as single binary needs to act as both proxy\n+ * master and slave.\n+ */\n+int main(int argc, char **argv)\n+{\n+\t/* IPCPipeUnixSocket passes IPA module path in argv[1] */\n+\tif (argc == 3) {\n+\t\tint ipcfd = std::stoi(argv[2]);\n+\t\tUnixSocketTestIPCSlave slave;\n+\t\treturn slave.run(ipcfd);\n+\t}\n+\n+\treturn UnixSocketTestIPC().execute();\n+}\n", "prefixes": [ "libcamera-devel", "v5", "21/23" ] }