projects
/
musl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sysconf support for dynamic limits (open files and processes)
[musl]
/
src
/
conf
/
sysconf.c
diff --git
a/src/conf/sysconf.c
b/src/conf/sysconf.c
index
cdaeb2a
..
5b6c14e
100644
(file)
--- a/
src/conf/sysconf.c
+++ b/
src/conf/sysconf.c
@@
-1,18
+1,21
@@
#include <unistd.h>
#include <limits.h>
#include <errno.h>
#include <unistd.h>
#include <limits.h>
#include <errno.h>
+#include <sys/resource.h>
+#include "syscall.h"
#define VER (-2)
#define OFLOW (-3)
#define VER (-2)
#define OFLOW (-3)
+#define RLIM(x) (-32768|(RLIMIT_ ## x))
long sysconf(int name)
{
static const short values[] = {
[_SC_ARG_MAX] = OFLOW,
long sysconf(int name)
{
static const short values[] = {
[_SC_ARG_MAX] = OFLOW,
- [_SC_CHILD_MAX] =
-1
,
+ [_SC_CHILD_MAX] =
RLIM(NPROC)
,
[_SC_CLK_TCK] = 100,
[_SC_NGROUPS_MAX] = 32,
[_SC_CLK_TCK] = 100,
[_SC_NGROUPS_MAX] = 32,
- [_SC_OPEN_MAX] =
1024
,
+ [_SC_OPEN_MAX] =
RLIM(NOFILE)
,
[_SC_STREAM_MAX] = -1,
[_SC_TZNAME_MAX] = TZNAME_MAX,
[_SC_JOB_CONTROL] = 1,
[_SC_STREAM_MAX] = -1,
[_SC_TZNAME_MAX] = TZNAME_MAX,
[_SC_JOB_CONTROL] = 1,
@@
-36,12
+39,12
@@
long sysconf(int name)
[_SC_AIO_PRIO_DELTA_MAX] = 0, /* ?? */
[_SC_DELAYTIMER_MAX] = _POSIX_DELAYTIMER_MAX,
[_SC_MQ_OPEN_MAX] = -1,
[_SC_AIO_PRIO_DELTA_MAX] = 0, /* ?? */
[_SC_DELAYTIMER_MAX] = _POSIX_DELAYTIMER_MAX,
[_SC_MQ_OPEN_MAX] = -1,
- [_SC_MQ_PRIO_MAX] =
_POSIX_
MQ_PRIO_MAX,
+ [_SC_MQ_PRIO_MAX] = MQ_PRIO_MAX,
[_SC_VERSION] = VER,
[_SC_PAGE_SIZE] = PAGE_SIZE,
[_SC_RTSIG_MAX] = 63, /* ?? */
[_SC_VERSION] = VER,
[_SC_PAGE_SIZE] = PAGE_SIZE,
[_SC_RTSIG_MAX] = 63, /* ?? */
- [_SC_SEM_NSEMS_MAX] =
_POSIX_
SEM_NSEMS_MAX,
- [_SC_SEM_VALUE_MAX] =
_POSIX_SEM_VALUE_MAX
,
+ [_SC_SEM_NSEMS_MAX] = SEM_NSEMS_MAX,
+ [_SC_SEM_VALUE_MAX] =
OFLOW
,
[_SC_SIGQUEUE_MAX] = -1,
[_SC_TIMER_MAX] = -1,
[_SC_BC_BASE_MAX] = _POSIX2_BC_BASE_MAX,
[_SC_SIGQUEUE_MAX] = -1,
[_SC_TIMER_MAX] = -1,
[_SC_BC_BASE_MAX] = _POSIX2_BC_BASE_MAX,
@@
-82,8
+85,8
@@
long sysconf(int name)
[_SC_LOGIN_NAME_MAX] = 256,
[_SC_TTY_NAME_MAX] = TTY_NAME_MAX,
[_SC_THREAD_DESTRUCTOR_ITERATIONS] = _POSIX_THREAD_DESTRUCTOR_ITERATIONS,
[_SC_LOGIN_NAME_MAX] = 256,
[_SC_TTY_NAME_MAX] = TTY_NAME_MAX,
[_SC_THREAD_DESTRUCTOR_ITERATIONS] = _POSIX_THREAD_DESTRUCTOR_ITERATIONS,
- [_SC_THREAD_KEYS_MAX] =
-1
,
- [_SC_THREAD_STACK_MIN] =
2*PAGE_SIZE
,
+ [_SC_THREAD_KEYS_MAX] =
PTHREAD_KEYS_MAX
,
+ [_SC_THREAD_STACK_MIN] =
PTHREAD_STACK_MIN
,
[_SC_THREAD_THREADS_MAX] = -1,
[_SC_THREAD_ATTR_STACKADDR] = -1,
[_SC_THREAD_ATTR_STACKSIZE] = VER,
[_SC_THREAD_THREADS_MAX] = -1,
[_SC_THREAD_ATTR_STACKADDR] = -1,
[_SC_THREAD_ATTR_STACKSIZE] = VER,
@@
-215,8
+218,12
@@
long sysconf(int name)
} else if (values[name] == VER) {
return _POSIX_VERSION;
} else if (values[name] == OFLOW) {
} else if (values[name] == VER) {
return _POSIX_VERSION;
} else if (values[name] == OFLOW) {
- return ARG_MAX;
- } else {
- return values[name];
+ if (name == _SC_ARG_MAX) return ARG_MAX;
+ if (name == _SC_SEM_VALUE_MAX) return SEM_VALUE_MAX;
+ } else if (values[name] < 0) {
+ long lim[2];
+ __syscall(SYS_getrlimit, values[name]&16383, lim);
+ return lim[0] < 0 ? LONG_MAX : lim[0];
}
}
+ return values[name];
}
}