[{"id":2288,"web_url":"https://patchwork.libcamera.org/comment/2288/","msgid":"<20190716075146.GC22355@pendragon.ideasonboard.com>","date":"2019-07-16T07:51:46","subject":"Re: [libcamera-devel] [PATCH v2 3/4] test: logging: add logging\n\tprocess test","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Paul,\n\nThank you for the patch.\n\nOn Tue, Jul 16, 2019 at 04:05:07PM +0900, Paul Elder wrote:\n> Add a test to test that logging works in isolated child processes,\n\ns/,$/./\n\n> Only logSetFile is tested, because stdout and stderr are closed for\n> isolated child processes, and syslog and the none logging destinations\n> are expected to be the same as non-isolated processes.\n> \n> Signed-off-by: Paul Elder \n> ---\n> Changes in v2:\n> - unlink the log file\n> - move random number generation and process completion connection to\n> init\n> - other minor changes\n> \n> test/log_process.cpp | 153 +++++++++++++++++++++++++++++++++++++++++++\n> test/meson.build | 1 +\n> 2 files changed, 154 insertions(+)\n> create mode 100644 test/log_process.cpp\n> \n> diff --git a/test/log_process.cpp b/test/log_process.cpp\n> new file mode 100644\n> index 0000000..499a5a8\n> --- /dev/null\n> +++ b/test/log_process.cpp\n> @@ -0,0 +1,153 @@\n> +/* SPDX-License-Identifier: GPL-2.0-or-later */\n> +/*\n> + * Copyright (C) 2019, Google Inc.\n> + *\n> + * log_process.cpp - Logging in isolated child process test\n> + */\n> +\n> +#include \n> +#include \n> +#include \n> +#include \n> +#include \n> +#include \n> +#include \n> +#include \n> +\n> +#include \n> +#include \n> +#include \n> +#include \n> +\n> +#include \"log.h\"\n> +#include \"process.h\"\n> +#include \"test.h\"\n> +#include \"utils.h\"\n> +\n> +using namespace std;\n> +using namespace libcamera;\n> +\n> +static string message(\"hello from the child\");\n\ns/static/static const/\n\n> +\n> +LOG_DEFINE_CATEGORY(LogProcessTest)\n> +\n> +class LogProcessTestChild\n> +{\n> +public:\n> +\tint run(int status, int num)\n> +\t{\n> +\t\tusleep(50000);\n> +\n> +\t\tstring logPath = \"/tmp/libcamera.worker.test.\" +\n> +\t\t\t\t to_string(num) + \".log\";\n> +\t\tif (logSetFile(logPath.c_str()) < 0)\n> +\t\t\treturn TestSkip;\n> +\n> +\t\tLOG(LogProcessTest, Warning) << message;\n> +\n> +\t\treturn status;\n> +\t}\n> +};\n> +\n> +class LogProcessTest : public Test\n> +{\n> +protected:\n> +\tint init()\n> +\t{\n> +\t\trandom_device random;\n> +\t\tnum_ = random();\n> +\n> +\t\tproc_.finished.connect(this, &LogProcessTest::procFinished);\n> +\t\treturn 0;\n> +\t}\n> +\n> +\tint run()\n> +\t{\n> +\t\tEventDispatcher *dispatcher = CameraManager::instance()->eventDispatcher();\n> +\t\tTimer timeout;\n> +\n> +\t\tint exitCode = 42;\n> +\t\tvector args;\n> +\t\targs.push_back(to_string(exitCode));\n> +\t\targs.push_back(to_string(num_));\n> +\t\tint ret = proc_.start(\"/proc/self/exe\", args);\n> +\t\tif (ret) {\n> +\t\t\tcerr << \"failed to start process\" << endl;\n> +\t\t\treturn TestFail;\n> +\t\t}\n> +\n> +\t\ttimeout.start(200);\n> +\t\twhile (timeout.isRunning())\n> +\t\t\tdispatcher->processEvents();\n> +\n> +\t\tif (exitStatus_ != Process::NormalExit) {\n> +\t\t\tcerr << \"process did not exit normally\" << endl;\n> +\t\t\treturn TestFail;\n> +\t\t}\n> +\n> +\t\tif (exitCode_ == TestSkip)\n> +\t\t\treturn TestSkip;\n> +\n> +\t\tif (exitCode_ != exitCode) {\n> +\t\t\tcerr << \"exit code should be \" << exitCode\n> +\t\t\t << \", actual is \" << exitCode_ << endl;\n> +\t\t\treturn TestFail;\n> +\t\t}\n> +\n> +\t\tlogPath_ = \"/tmp/libcamera.worker.test.\" +\n> +\t\t\t\t to_string(num_) + \".log\";\n\nPlease set logPath_ in the init() function, otherwise you may end up\ncalling unlink(\"\") in cleanup().\n\n> +\t\tint fd = open(logPath_.c_str(), O_RDONLY, S_IRUSR);\n> +\t\tif (fd < 0) {\n> +\t\t\tcerr << \"failed to open tmp log file\" << endl;\n> +\t\t\treturn TestFail;\n> +\t\t}\n> +\n> +\t\tchar buf[200];\n> +\t\tmemset(buf, 0, sizeof(buf));\n> +\t\tif (read(fd, buf, sizeof(buf)) < 0) {\n> +\t\t\tcerr << \"Failed to read tmp log file\" << endl;\n> +\t\t\treturn TestFail;\n> +\t\t}\n> +\t\tclose(fd);\n> +\n> +\t\tstring str(buf);\n> +\t\tif (str.find(message) == string::npos)\n> +\t\t\treturn TestFail;\n> +\n> +\t\treturn TestPass;\n> +\t}\n> +\n> +\tvoid cleanup()\n> +\t{\n> +\t\tunlink(logPath_.c_str());\n> +\t}\n> +\n> +private:\n> +\tvoid procFinished(Process *proc, enum Process::ExitStatus exitStatus, int exitCode)\n> +\t{\n> +\t\texitStatus_ = exitStatus;\n> +\t\texitCode_ = exitCode;\n> +\t}\n> +\n> +\tProcess proc_;\n> +\tenum Process::ExitStatus exitStatus_;\n\ns/enum //\n\nReviewed-by: Laurent Pinchart \n\n> +\tstring logPath_;\n> +\tint exitCode_;\n> +\tint num_;\n> +};\n> +\n> +/*\n> + * Can't use TEST_REGISTER() as single binary needs to act as both\n> + * parent and child processes.\n> + */\n> +int main(int argc, char **argv)\n> +{\n> +\tif (argc == 3) {\n> +\t\tint status = std::stoi(argv[1]);\n> +\t\tint num = std::stoi(argv[2]);\n> +\t\tLogProcessTestChild child;\n> +\t\treturn child.run(status, num);\n> +\t}\n> +\n> +\treturn LogProcessTest().execute();\n> +}\n> diff --git a/test/meson.build b/test/meson.build\n> index ad1a2f2..658f283 100644\n> --- a/test/meson.build\n> +++ b/test/meson.build\n> @@ -23,6 +23,7 @@ public_tests = [\n> internal_tests = [\n> ['camera-sensor', 'camera-sensor.cpp'],\n> ['log', 'log.cpp'],\n> + ['log_process', 'log_process.cpp'],\n> ['message', 'message.cpp'],\n> ['signal-threads', 'signal-threads.cpp'],\n> ['threads', 'threads.cpp'],","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 260AC61AD3\n\tfor ;\n\tTue, 16 Jul 2019 09:52:16 +0200 (CEST)","from pendragon.ideasonboard.com (unknown\n\t[IPv6:2a00:79e1:abc:3602:59ec:6c:1869:337])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id E5D2B564;\n\tTue, 16 Jul 2019 09:52:14 +0200 (CEST)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1563263535;\n\tbh=8CGucCQjWyIS1EP5ICQkkCx1cccfh2dudpiwkniP4is=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=rcDMFAerHIQ7shJgNWI0gvQ0J7IJC5UegZkzNqy2Q6ijC5SuZn79cgj7OA9odf6PY\n\t6+UAf68PQNZwLf/CUuqc8WBnURIgKImBx+aySbf5uEV4fsgw7zg8CEOVtb84AkTlhL\n\txFYEkSINuGjQAen+FUIu5NQB3+IBtUtyKrxVwCxA=","Date":"Tue, 16 Jul 2019 10:51:46 +0300","From":"Laurent Pinchart ","To":"Paul Elder ","Cc":"libcamera-devel@lists.libcamera.org","Message-ID":"<20190716075146.GC22355@pendragon.ideasonboard.com>","References":"<20190716070508.24589-1-paul.elder@ideasonboard.com>\n\t<20190716070508.24589-3-paul.elder@ideasonboard.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","In-Reply-To":"<20190716070508.24589-3-paul.elder@ideasonboard.com>","User-Agent":"Mutt/1.10.1 (2018-07-13)","Subject":"Re: [libcamera-devel] [PATCH v2 3/4] test: logging: add logging\n\tprocess test","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":"Tue, 16 Jul 2019 07:52:16 -0000"}}]