From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 5 Jun 2018 13:21:47 +0000 (+0200)
Subject: main: split out reading of /proc/sys/fs/nr_open into its own function
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=83e6d192cbe160dbea62427bab0f6f7d490ce215;p=elogind.git

main: split out reading of /proc/sys/fs/nr_open into its own function

This doesn't really reduce the code size over all, but it does make main.c
shorter and more readable, and that's always a good thing.
---

diff --git a/src/basic/fd-util.c b/src/basic/fd-util.c
index ed82cd628..efe974ee2 100644
--- a/src/basic/fd-util.c
+++ b/src/basic/fd-util.c
@@ -934,3 +934,27 @@ int fd_reopen(int fd, int flags) {
 
         return new_fd;
 }
+
+int read_nr_open(void) {
+        _cleanup_free_ char *nr_open = NULL;
+        int r;
+
+        /* Returns the kernel's current fd limit, either by reading it of /proc/sys if that works, or using the
+         * hard-coded default compiled-in value of current kernels (1M) if not. This call will never fail. */
+
+        r = read_one_line_file("/proc/sys/fs/nr_open", &nr_open);
+        if (r < 0)
+                log_debug_errno(r, "Failed to read /proc/sys/fs/nr_open, ignoring: %m");
+        else {
+                int v;
+
+                r = safe_atoi(nr_open, &v);
+                if (r < 0)
+                        log_debug_errno(r, "Failed to parse /proc/sys/fs/nr_open value '%s', ignoring: %m", nr_open);
+                else
+                        return v;
+        }
+
+        /* If we fail, fallback to the hard-coded kernel limit of 1024 * 1024. */
+        return 1024 * 1024;
+}
diff --git a/src/basic/fd-util.h b/src/basic/fd-util.h
index 5d52e3b19..7f7ac8901 100644
--- a/src/basic/fd-util.h
+++ b/src/basic/fd-util.h
@@ -112,3 +112,5 @@ static inline int make_null_stdio(void) {
         })
 
 int fd_reopen(int fd, int flags);
+
+int read_nr_open(void);
diff --git a/src/test/test-fd-util.c b/src/test/test-fd-util.c
index edcb8ab75..d50810c01 100644
--- a/src/test/test-fd-util.c
+++ b/src/test/test-fd-util.c
@@ -317,7 +317,14 @@ static void test_fd_duplicate_data_fd(void) {
         assert_se(read(fd2, &j, sizeof(j)) == 0);
 }
 
+static void test_read_nr_open(void) {
+        log_info("nr-open: %i", read_nr_open());
+}
+
 int main(int argc, char *argv[]) {
+
+        log_set_max_level(LOG_DEBUG);
+
         test_close_many();
         test_close_nointr();
 #if 0 /// UNNEEDED by elogind
@@ -328,6 +335,7 @@ int main(int argc, char *argv[]) {
         test_fd_move_above_stdio();
         test_rearrange_stdio();
         test_fd_duplicate_data_fd();
+        test_read_nr_open();
 
         return 0;
 }