{"id":14866,"url":"https://patchwork.libcamera.org/api/1.1/patches/14866/?format=json","web_url":"https://patchwork.libcamera.org/patch/14866/","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":"<20211130033820.18235-13-laurent.pinchart@ideasonboard.com>","date":"2021-11-30T03:38:10","name":"[libcamera-devel,v4,12/22] libcamera: process: Manage pipe fds by UniqueFD","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"96509ce7a7ada3c232f3e6dcb2fca65169acdcd3","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/1.1/people/2/?format=json","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/14866/mbox/","series":[{"id":2776,"url":"https://patchwork.libcamera.org/api/1.1/series/2776/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=2776","date":"2021-11-30T03:37:58","name":"libcamera: Introduce UniqueFD","version":4,"mbox":"https://patchwork.libcamera.org/series/2776/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/14866/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/14866/checks/","tags":{},"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 D0385BF415\n\tfor ;\n\tTue, 30 Nov 2021 03:39:09 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 8243D605C2;\n\tTue, 30 Nov 2021 04:39:09 +0100 (CET)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 01B4E605A3\n\tfor ;\n\tTue, 30 Nov 2021 04:38:54 +0100 (CET)","from pendragon.lan (62-78-145-57.bb.dnainternet.fi [62.78.145.57])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 847028F0;\n\tTue, 30 Nov 2021 04:38:53 +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=\"hoD2yPQs\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1638243533;\n\tbh=87NwiFNikiBaMpO8XkCjgfTu6j+Wt/IonCSqtM951Vc=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=hoD2yPQs/wFUJhk4nqLg7WaJCwbnKttOl0cUEIcBrT4lwCwuofu37q4Ih0VjDy8+m\n\tMwduXHzjCLnAeLAMXPVF2QK6n+ZNki7EQ2rZju8fbMWyD6sZD5u29wvChEsfZE3lNC\n\tyqEZalBoCbQNIATzPnRdWSQBjJtIX3pHo6NkQGrE=","From":"Laurent Pinchart ","To":"libcamera-devel@lists.libcamera.org","Date":"Tue, 30 Nov 2021 05:38:10 +0200","Message-Id":"<20211130033820.18235-13-laurent.pinchart@ideasonboard.com>","X-Mailer":"git-send-email 2.32.0","In-Reply-To":"<20211130033820.18235-1-laurent.pinchart@ideasonboard.com>","References":"<20211130033820.18235-1-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v4 12/22] libcamera: process: Manage pipe\n\tfds 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","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"From: Hirokazu Honda \n\nManages the file descriptors owned by Process for pipe by UniqueFDs.\n\nSigned-off-by: Hirokazu Honda \nReviewed-by: Laurent Pinchart \nReviewed-by: Jacopo Mondi \n---\n include/libcamera/internal/process.h | 4 +++-\n src/libcamera/process.cpp | 16 ++++++++++------\n 2 files changed, 13 insertions(+), 7 deletions(-)","diff":"diff --git a/include/libcamera/internal/process.h b/include/libcamera/internal/process.h\nindex 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 \tEventNotifier *sigEvent_;\n-\tint pipe_[2];\n+\tUniqueFD pipe_[2];\n };\n \n } /* namespace libcamera */\ndiff --git a/src/libcamera/process.cpp b/src/libcamera/process.cpp\nindex 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 \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 }\n \n /**\n","prefixes":["libcamera-devel","v4","12/22"]}