{"id":23259,"url":"https://patchwork.libcamera.org/api/1.1/patches/23259/?format=json","web_url":"https://patchwork.libcamera.org/patch/23259/","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":"<20250424114103.451395-8-barnabas.pocze@ideasonboard.com>","date":"2025-04-24T11:41:01","name":"[RFC,v5,7/9] libcamera: process: Move `closeAllFdsExcept()`","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"6a323e0c88605be3a2ab9bd112fefe8f7269e1f1","submitter":{"id":216,"url":"https://patchwork.libcamera.org/api/1.1/people/216/?format=json","name":"Barnabás Pőcze","email":"barnabas.pocze@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/23259/mbox/","series":[{"id":5145,"url":"https://patchwork.libcamera.org/api/1.1/series/5145/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=5145","date":"2025-04-24T11:40:54","name":"libcamera: process: Remove `ProcessManager` singleton","version":5,"mbox":"https://patchwork.libcamera.org/series/5145/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/23259/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/23259/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 EEA10C3321\n\tfor ;\n\tThu, 24 Apr 2025 11:41:21 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 1502368AD2;\n\tThu, 24 Apr 2025 13:41:17 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 294AF68ADB\n\tfor ;\n\tThu, 24 Apr 2025 13:41:10 +0200 (CEST)","from pb-laptop.local (185.221.143.16.nat.pool.zt.hu\n\t[185.221.143.16])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id F096019EB;\n\tThu, 24 Apr 2025 13:41:07 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"JT5mr0SB\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1745494868;\n\tbh=pHOL+k+Dy/DcIWAJ0Djp8YpzXaUs4tOTqsrd2bdl+fA=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=JT5mr0SBCSHsEHRF4X5fd4y37nc5rf4YXUN54sMoy8dDMHjFooR3c7gC/xjX5ZzQt\n\tzj0iDrtyBvRPqa9ulDMPSxLja5+6mIoNHWrGPN6UVsX/TwgGU60KP1CNJfSYRqiRMV\n\tPAZzvVGWpaJpohaYnlEfTcvLmY9XHMVR9g+/SD/c=","From":"=?utf-8?q?Barnab=C3=A1s_P=C5=91cze?= ","To":"libcamera-devel@lists.libcamera.org","Cc":"Laurent Pinchart ","Subject":"[RFC PATCH v5 7/9] libcamera: process: Move `closeAllFdsExcept()`","Date":"Thu, 24 Apr 2025 13:41:01 +0200","Message-ID":"<20250424114103.451395-8-barnabas.pocze@ideasonboard.com>","X-Mailer":"git-send-email 2.49.0","In-Reply-To":"<20250424114103.451395-1-barnabas.pocze@ideasonboard.com>","References":"<20250424114103.451395-1-barnabas.pocze@ideasonboard.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=UTF-8","Content-Transfer-Encoding":"8bit","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":"Remove `closeAllFdsExcept()` from the `Process` class and have it as a\nlocal function since it is no needed \"outside\" and does not depend on\nany part of the `Process` class.\n\nSigned-off-by: Barnabás Pőcze \nReviewed-by: Laurent Pinchart \n---\n include/libcamera/internal/process.h | 1 -\n src/libcamera/process.cpp | 56 ++++++++++++++--------------\n 2 files changed, 28 insertions(+), 29 deletions(-)","diff":"diff --git a/include/libcamera/internal/process.h b/include/libcamera/internal/process.h\nindex b8eb7e043..e55d11fa3 100644\n--- a/include/libcamera/internal/process.h\n+++ b/include/libcamera/internal/process.h\n@@ -45,7 +45,6 @@ public:\n private:\n \tLIBCAMERA_DISABLE_COPY_AND_MOVE(Process)\n \n-\tvoid closeAllFdsExcept(Span fds);\n \tint isolate();\n \tvoid died(int wstatus);\n \ndiff --git a/src/libcamera/process.cpp b/src/libcamera/process.cpp\nindex 99bc3ad36..369fdb12d 100644\n--- a/src/libcamera/process.cpp\n+++ b/src/libcamera/process.cpp\n@@ -63,6 +63,34 @@ void sigact(int signal, siginfo_t *info, void *ucontext)\n \t}\n }\n \n+void closeAllFdsExcept(Span fds)\n+{\n+\tstd::vector v(fds.begin(), fds.end());\n+\tsort(v.begin(), v.end());\n+\n+\tASSERT(v.empty() || v.front() >= 0);\n+\n+\tDIR *dir = opendir(\"/proc/self/fd\");\n+\tif (!dir)\n+\t\treturn;\n+\n+\tint dfd = dirfd(dir);\n+\n+\tstruct dirent *ent;\n+\twhile ((ent = readdir(dir)) != nullptr) {\n+\t\tchar *endp;\n+\t\tint fd = strtoul(ent->d_name, &endp, 10);\n+\t\tif (*endp)\n+\t\t\tcontinue;\n+\n+\t\tif (fd >= 0 && fd != dfd &&\n+\t\t !std::binary_search(v.begin(), v.end(), fd))\n+\t\t\tclose(fd);\n+\t}\n+\n+\tclosedir(dir);\n+}\n+\n } /* namespace */\n \n void ProcessManager::sighandler()\n@@ -282,34 +310,6 @@ int Process::start(const std::string &path,\n \t}\n }\n \n-void Process::closeAllFdsExcept(Span fds)\n-{\n-\tstd::vector v(fds.begin(), fds.end());\n-\tsort(v.begin(), v.end());\n-\n-\tASSERT(v.empty() || v.front() >= 0);\n-\n-\tDIR *dir = opendir(\"/proc/self/fd\");\n-\tif (!dir)\n-\t\treturn;\n-\n-\tint dfd = dirfd(dir);\n-\n-\tstruct dirent *ent;\n-\twhile ((ent = readdir(dir)) != nullptr) {\n-\t\tchar *endp;\n-\t\tint fd = strtoul(ent->d_name, &endp, 10);\n-\t\tif (*endp)\n-\t\t\tcontinue;\n-\n-\t\tif (fd >= 0 && fd != dfd &&\n-\t\t !std::binary_search(v.begin(), v.end(), fd))\n-\t\t\tclose(fd);\n-\t}\n-\n-\tclosedir(dir);\n-}\n-\n int Process::isolate()\n {\n \tint ret = unshare(CLONE_NEWUSER | CLONE_NEWNET);\n","prefixes":["RFC","v5","7/9"]}