[RFC PATCH v3 8/9] libcamera: process: Use `close_range()` when available
Barnabás Pőcze
barnabas.pocze at ideasonboard.com
Tue Mar 25 19:08:20 CET 2025
Use the `close_range()` system call when available as it is
simpler and faster than iterating `/proc/self/fd/`.
Signed-off-by: Barnabás Pőcze <barnabas.pocze at ideasonboard.com>
---
meson.build | 4 ++++
src/libcamera/process.cpp | 20 ++++++++++++++++++++
2 files changed, 24 insertions(+)
diff --git a/meson.build b/meson.build
index 668ec3969..00291d628 100644
--- a/meson.build
+++ b/meson.build
@@ -103,6 +103,10 @@ if cc.has_header_symbol('stdlib.h', 'secure_getenv', prefix : '#define _GNU_SOUR
config_h.set('HAVE_SECURE_GETENV', 1)
endif
+if cc.has_header_symbol('unistd.h', 'close_range', prefix : '#define _GNU_SOURCE')
+ config_h.set('HAVE_CLOSE_RANGE', 1)
+endif
+
common_arguments = [
'-Wmissing-declarations',
'-Wshadow',
diff --git a/src/libcamera/process.cpp b/src/libcamera/process.cpp
index 01503e485..5fa813300 100644
--- a/src/libcamera/process.cpp
+++ b/src/libcamera/process.cpp
@@ -70,6 +70,26 @@ void closeAllFdsExcept(Span<const int> fds)
ASSERT(v.empty() || v.front() >= 0);
+#if HAVE_CLOSE_RANGE
+ static const bool hasCloseRange = [] {
+ return close_range(~0u, 0, 0) < 0 && errno == EINVAL;
+ }();
+
+ if (hasCloseRange) {
+ unsigned int prev = 0;
+
+ for (unsigned int curr : v) {
+ ASSERT(prev <= curr);
+ if (prev < curr)
+ close_range(prev, curr - 1, 0);
+ prev = curr + 1;
+ }
+
+ close_range(prev, ~0u, 0);
+ return;
+ }
+#endif
+
DIR *dir = opendir("/proc/self/fd");
if (!dir)
return;
--
2.49.0
More information about the libcamera-devel
mailing list