X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Fconf%2Fsysconf.c;h=9f0d97b28c528ba0908aa329bc0617de57211e3d;hb=4d07e5521ea811278f00f434fe2b8345ea1d8832;hp=cdaeb2a646b5588442195193a4be7590a979f5aa;hpb=0b44a0315b47dd8eced9f3b7f31580cf14bbfc01;p=musl

diff --git a/src/conf/sysconf.c b/src/conf/sysconf.c
index cdaeb2a6..9f0d97b2 100644
--- a/src/conf/sysconf.c
+++ b/src/conf/sysconf.c
@@ -1,18 +1,22 @@
 #include <unistd.h>
 #include <limits.h>
 #include <errno.h>
+#include <sys/resource.h>
+#include "syscall.h"
 
 #define VER (-2)
 #define OFLOW (-3)
+#define CPUCNT (-4)
+#define RLIM(x) (-32768|(RLIMIT_ ## x))
 
 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_OPEN_MAX] = 1024,
+		[_SC_OPEN_MAX] = RLIM(NOFILE),
 		[_SC_STREAM_MAX] = -1,
 		[_SC_TZNAME_MAX] = TZNAME_MAX,
 		[_SC_JOB_CONTROL] = 1,
@@ -36,12 +40,12 @@ long sysconf(int name)
 		[_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_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,
@@ -82,17 +86,17 @@ 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_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_STACKADDR] = VER,
 		[_SC_THREAD_ATTR_STACKSIZE] = VER,
-		[_SC_THREAD_PRIORITY_SCHEDULING] = -1,
+		[_SC_THREAD_PRIORITY_SCHEDULING] = VER,
 		[_SC_THREAD_PRIO_INHERIT] = -1,
 		[_SC_THREAD_PRIO_PROTECT] = -1,
 		[_SC_THREAD_PROCESS_SHARED] = VER,
-		[_SC_NPROCESSORS_CONF] = -1,
-		[_SC_NPROCESSORS_ONLN] = -1,
+		[_SC_NPROCESSORS_CONF] = CPUCNT,
+		[_SC_NPROCESSORS_ONLN] = CPUCNT,
 		[_SC_PHYS_PAGES] = -1,
 		[_SC_AVPHYS_PAGES] = -1,
 		[_SC_ATEXIT_MAX] = -1,
@@ -215,8 +219,19 @@ long sysconf(int name)
 	} 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] == CPUCNT) {
+		unsigned char set[128] = {1};
+		int i, cnt;
+		__syscall(SYS_sched_getaffinity, 0, sizeof set, set);
+		for (i=cnt=0; i<sizeof set; i++)
+			for (; set[i]; set[i]&=set[i]-1, cnt++);
+		return cnt;
+	} else if (values[name] < OFLOW) {
+		long lim[2];
+		__syscall(SYS_getrlimit, values[name]&16383, lim);
+		return lim[0] < 0 ? LONG_MAX : lim[0];
 	}
+	return values[name];
 }