[{"id":21340,"web_url":"https://patchwork.libcamera.org/comment/21340/","msgid":"<20211129154127.gwsfuwmgajn43puv@uno.localdomain>","date":"2021-11-29T15:41:27","subject":"Re: [libcamera-devel] [PATCH v3 11/17] libcamera: process: Manage\n\tpipe fds by UniqueFD","submitter":{"id":3,"url":"https://patchwork.libcamera.org/api/people/3/","name":"Jacopo Mondi","email":"jacopo@jmondi.org"},"content":"Hi Laurent,\n\nOn Mon, Nov 29, 2021 at 01:57:46AM +0200, Laurent Pinchart wrote:\n> From: Hirokazu Honda \n>\n> Manages the file descriptors owned by Process for pipe by UniqueFDs.\n>\n> Signed-off-by: Hirokazu Honda \n> Reviewed-by: Laurent Pinchart \n> ---\n> include/libcamera/internal/process.h | 4 +++-\n> src/libcamera/process.cpp | 16 ++++++++++------\n> 2 files changed, 13 insertions(+), 7 deletions(-)\n>\n> diff --git a/include/libcamera/internal/process.h b/include/libcamera/internal/process.h\n> index 96748a3676e4..95e67e105a92 100644\n> --- a/include/libcamera/internal/process.h\n> +++ b/include/libcamera/internal/process.h\n> @@ -12,6 +12,7 @@\n> #include \n>\n> #include \n> +#include \n>\n> namespace libcamera {\n>\n> @@ -75,8 +76,9 @@ private:\n> \tstd::list processes_;\n>\n> \tstruct sigaction oldsa_;\n> +\n\nUnrelated but ok!\n\n> \tEventNotifier *sigEvent_;\n> -\tint pipe_[2];\n> +\tUniqueFD pipe_[2];\n> };\n>\n> } /* namespace libcamera */\n> diff --git a/src/libcamera/process.cpp b/src/libcamera/process.cpp\n> index eca1b30039b8..0e6b4e1dde58 100644\n> --- a/src/libcamera/process.cpp\n> +++ b/src/libcamera/process.cpp\n> @@ -69,7 +69,7 @@ void sigact(int signal, siginfo_t *info, void *ucontext)\n> void ProcessManager::sighandler()\n> {\n> \tchar data;\n> -\tssize_t ret = read(pipe_[0], &data, sizeof(data));\n> +\tssize_t ret = read(pipe_[0].get(), &data, sizeof(data));\n> \tif (ret < 0) {\n> \t\tLOG(Process, Error)\n> \t\t\t<< \"Failed to read byte from signal handler pipe\";\n> @@ -129,10 +129,15 @@ ProcessManager::ProcessManager()\n>\n> \tsigaction(SIGCHLD, &sa, NULL);\n>\n> -\tif (pipe2(pipe_, O_CLOEXEC | O_DIRECT | O_NONBLOCK))\n> +\tint pipe[2];\n> +\tif (pipe2(pipe, O_CLOEXEC | O_DIRECT | O_NONBLOCK))\n> \t\tLOG(Process, Fatal)\n> \t\t\t<< \"Failed to initialize pipe for signal handling\";\n> -\tsigEvent_ = new EventNotifier(pipe_[0], EventNotifier::Read);\n> +\n> +\tpipe_[0] = UniqueFD(pipe[0]);\n> +\tpipe_[1] = UniqueFD(pipe[1]);\n> +\n> +\tsigEvent_ = new EventNotifier(pipe_[0].get(), EventNotifier::Read);\n> \tsigEvent_->activated.connect(this, &ProcessManager::sighandler);\n>\n> \tself_ = this;\n> @@ -141,9 +146,8 @@ ProcessManager::ProcessManager()\n> ProcessManager::~ProcessManager()\n> {\n> \tsigaction(SIGCHLD, &oldsa_, NULL);\n> +\n\nUNrelated but ok\n\n> \tdelete sigEvent_;\n> -\tclose(pipe_[0]);\n> -\tclose(pipe_[1]);\n>\n> \tself_ = nullptr;\n> }\n> @@ -170,7 +174,7 @@ ProcessManager *ProcessManager::instance()\n> */\n> int ProcessManager::writePipe() const\n> {\n> -\treturn pipe_[1];\n> +\treturn pipe_[1].get();\n\nReviewed-by: Jacopo Mondi \n\nThanks\n j\n\n> }\n>\n> /**\n> --\n> Regards,\n>\n> Laurent Pinchart\n>","headers":{"Return-Path":"","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 EBEE4BDB13\n\tfor ;\n\tMon, 29 Nov 2021 15:40:36 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 5CA94605A4;\n\tMon, 29 Nov 2021 16:40:36 +0100 (CET)","from relay11.mail.gandi.net (relay11.mail.gandi.net\n\t[217.70.178.231])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id ECDAE60592\n\tfor ;\n\tMon, 29 Nov 2021 16:40:34 +0100 (CET)","(Authenticated sender: jacopo@jmondi.org)\n\tby relay11.mail.gandi.net (Postfix) with ESMTPSA id 69AFF100015;\n\tMon, 29 Nov 2021 15:40:34 +0000 (UTC)"],"Date":"Mon, 29 Nov 2021 16:41:27 +0100","From":"Jacopo Mondi ","To":"Laurent Pinchart ","Message-ID":"<20211129154127.gwsfuwmgajn43puv@uno.localdomain>","References":"<20211128235752.10836-1-laurent.pinchart@ideasonboard.com>\n\t<20211128235752.10836-12-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","In-Reply-To":"<20211128235752.10836-12-laurent.pinchart@ideasonboard.com>","Subject":"Re: [libcamera-devel] [PATCH v3 11/17] libcamera: process: Manage\n\tpipe fds by UniqueFD","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"libcamera-devel@lists.libcamera.org","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]