shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-12-26 03:22:00 +03:00
Code

Merge pull request #25618 from keszybz/sysctl-simplify-writing

Browse Source 
Write sysctl values without newlines and as fixed strings
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2022-12-05 08:41:00 +01:00 committed by GitHub
commit c99070a8cb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
meson.build
View File

@ -510,6 +510,10 @@ conf.set('SIZEOF_TIME_T', cc.sizeof('time_t', prefix : '#include <sys/time.h>'))
conf.set('SIZEOF_RLIM_T', cc.sizeof('rlim_t', prefix : '#include <sys/resource.h>')) conf.set('SIZEOF_RLIM_T', cc.sizeof('rlim_t', prefix : '#include <sys/resource.h>'))
conf.set('SIZEOF_TIMEX_MEMBER', cc.sizeof('typeof(((struct timex *)0)->freq)', prefix : '#include <sys/timex.h>')) conf.set('SIZEOF_TIMEX_MEMBER', cc.sizeof('typeof(((struct timex *)0)->freq)', prefix : '#include <sys/timex.h>'))
long_max = cc.compute_int('LONG_MAX', prefix : '#include <limits.h>')
assert(long_max > 100000)
conf.set_quoted('LONG_MAX_STR', '@0@'.format(long_max))
decl_headers = ''' decl_headers = '''
#include <uchar.h> #include <uchar.h>
#include <sys/mount.h> #include <sys/mount.h>

2
src/basic/constants.h
View File

@ -43,7 +43,7 @@
#define DEFAULT_EXIT_USEC (30*USEC_PER_SEC) #define DEFAULT_EXIT_USEC (30*USEC_PER_SEC)
/* The default value for the net.unix.max_dgram_qlen sysctl */ /* The default value for the net.unix.max_dgram_qlen sysctl */
#define DEFAULT_UNIX_MAX_DGRAM_QLEN 512UL #define DEFAULT_UNIX_MAX_DGRAM_QLEN 512
#define SIGNALS_CRASH_HANDLER SIGSEGV,SIGILL,SIGFPE,SIGBUS,SIGQUIT,SIGABRT #define SIGNALS_CRASH_HANDLER SIGSEGV,SIGILL,SIGFPE,SIGBUS,SIGQUIT,SIGABRT
#define SIGNALS_IGNORE SIGPIPE #define SIGNALS_IGNORE SIGPIPE

10
src/core/main.c
View File

@ -1184,9 +1184,10 @@ static void bump_file_max_and_nr_open(void) {
#if BUMP_PROC_SYS_FS_FILE_MAX #if BUMP_PROC_SYS_FS_FILE_MAX
/* The maximum the kernel allows for this since 5.2 is LONG_MAX, use that. (Previously things were /* The maximum the kernel allows for this since 5.2 is LONG_MAX, use that. (Previously things were
* different, but the operation would fail silently.) */ * different, but the operation would fail silently.) */
r = sysctl_writef("fs/file-max", "%li\n", LONG_MAX); r = sysctl_write("fs/file-max", LONG_MAX_STR);
if (r < 0) if (r < 0)
log_full_errno(IN_SET(r, -EROFS, -EPERM, -EACCES) ? LOG_DEBUG : LOG_WARNING, r, "Failed to bump fs.file-max, ignoring: %m"); log_full_errno(IN_SET(r, -EROFS, -EPERM, -EACCES) ? LOG_DEBUG : LOG_WARNING,
r, "Failed to bump fs.file-max, ignoring: %m");
#endif #endif
#if BUMP_PROC_SYS_FS_NR_OPEN #if BUMP_PROC_SYS_FS_NR_OPEN
@ -1218,7 +1219,7 @@ static void bump_file_max_and_nr_open(void) {
break; break;
} }
r = sysctl_writef("fs/nr_open", "%i\n", v); r = sysctl_writef("fs/nr_open", "%i", v);
if (r == -EINVAL) { if (r == -EINVAL) {
log_debug("Couldn't write fs.nr_open as %i, halving it.", v); log_debug("Couldn't write fs.nr_open as %i, halving it.", v);
v /= 2; v /= 2;
@ -1404,8 +1405,7 @@ static int bump_unix_max_dgram_qlen(void) {
if (v >= DEFAULT_UNIX_MAX_DGRAM_QLEN) if (v >= DEFAULT_UNIX_MAX_DGRAM_QLEN)
return 0; return 0;
r = write_string_filef("/proc/sys/net/unix/max_dgram_qlen", WRITE_STRING_FILE_DISABLE_BUFFER, r = sysctl_write("net/unix/max_dgram_qlen", STRINGIFY(DEFAULT_UNIX_MAX_DGRAM_QLEN));
"%lu", DEFAULT_UNIX_MAX_DGRAM_QLEN);
if (r < 0) if (r < 0)
return log_full_errno(IN_SET(r, -EROFS, -EPERM, -EACCES) ? LOG_DEBUG : LOG_WARNING, r, return log_full_errno(IN_SET(r, -EROFS, -EPERM, -EACCES) ? LOG_DEBUG : LOG_WARNING, r,
"Failed to bump AF_UNIX datagram queue length, ignoring: %m"); "Failed to bump AF_UNIX datagram queue length, ignoring: %m");