X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Fconf%2Fsysconf.c;h=60d3e745350dc4b3a1ef298c94d4ae1f54392745;hb=9b132e556774c744f9052581d2d8d0fab417e97c;hp=d979b62691d70d7f5502f96e4fdcaf995b029ba8;hpb=bf7b7282f5cd65bcdd80f55eeebc90fab50c9159;p=musl

diff --git a/src/conf/sysconf.c b/src/conf/sysconf.c
index d979b626..60d3e745 100644
--- a/src/conf/sysconf.c
+++ b/src/conf/sysconf.c
@@ -2,17 +2,33 @@
 #include <limits.h>
 #include <errno.h>
 #include <sys/resource.h>
+#include <signal.h>
+#include <sys/sysinfo.h>
+#include <sys/auxv.h>
 #include "syscall.h"
+#include "libc.h"
+
+#define JT(x) (-256|(x))
+#define VER JT(1)
+#define JT_ARG_MAX JT(2)
+#define JT_MQ_PRIO_MAX JT(3)
+#define JT_PAGE_SIZE JT(4)
+#define JT_SEM_VALUE_MAX JT(5)
+#define JT_NPROCESSORS_CONF JT(6)
+#define JT_NPROCESSORS_ONLN JT(7)
+#define JT_PHYS_PAGES JT(8)
+#define JT_AVPHYS_PAGES JT(9)
+#define JT_ZERO JT(10)
+#define JT_DELAYTIMER_MAX JT(11)
+#define JT_MINSIGSTKSZ JT(12)
+#define JT_SIGSTKSZ JT(13)
 
-#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_ARG_MAX] = JT_ARG_MAX,
 		[_SC_CHILD_MAX] = RLIM(NPROC),
 		[_SC_CLK_TCK] = 100,
 		[_SC_NGROUPS_MAX] = 32,
@@ -21,7 +37,7 @@ long sysconf(int name)
 		[_SC_TZNAME_MAX] = TZNAME_MAX,
 		[_SC_JOB_CONTROL] = 1,
 		[_SC_SAVED_IDS] = 1,
-		[_SC_REALTIME_SIGNALS] = 1,
+		[_SC_REALTIME_SIGNALS] = VER,
 		[_SC_PRIORITY_SCHEDULING] = -1,
 		[_SC_TIMERS] = VER,
 		[_SC_ASYNCHRONOUS_IO] = VER,
@@ -37,15 +53,15 @@ long sysconf(int name)
 		[_SC_SHARED_MEMORY_OBJECTS] = VER,
 		[_SC_AIO_LISTIO_MAX] = -1,
 		[_SC_AIO_MAX] = -1,
-		[_SC_AIO_PRIO_DELTA_MAX] = 0, /* ?? */
-		[_SC_DELAYTIMER_MAX] = _POSIX_DELAYTIMER_MAX,
+		[_SC_AIO_PRIO_DELTA_MAX] = JT_ZERO, /* ?? */
+		[_SC_DELAYTIMER_MAX] = JT_DELAYTIMER_MAX,
 		[_SC_MQ_OPEN_MAX] = -1,
-		[_SC_MQ_PRIO_MAX] = MQ_PRIO_MAX,
+		[_SC_MQ_PRIO_MAX] = JT_MQ_PRIO_MAX,
 		[_SC_VERSION] = VER,
-		[_SC_PAGE_SIZE] = PAGE_SIZE,
-		[_SC_RTSIG_MAX] = 63, /* ?? */
+		[_SC_PAGE_SIZE] = JT_PAGE_SIZE,
+		[_SC_RTSIG_MAX] = _NSIG - 1 - 31 - 3,
 		[_SC_SEM_NSEMS_MAX] = SEM_NSEMS_MAX,
-		[_SC_SEM_VALUE_MAX] = OFLOW,
+		[_SC_SEM_VALUE_MAX] = JT_SEM_VALUE_MAX,
 		[_SC_SIGQUEUE_MAX] = -1,
 		[_SC_TIMER_MAX] = -1,
 		[_SC_BC_BASE_MAX] = _POSIX2_BC_BASE_MAX,
@@ -53,11 +69,9 @@ long sysconf(int name)
 		[_SC_BC_SCALE_MAX] = _POSIX2_BC_SCALE_MAX,
 		[_SC_BC_STRING_MAX] = _POSIX2_BC_STRING_MAX,
 		[_SC_COLL_WEIGHTS_MAX] = COLL_WEIGHTS_MAX,
-		[_SC_EQUIV_CLASS_MAX] = -1, /* ?? */
 		[_SC_EXPR_NEST_MAX] = -1,
 		[_SC_LINE_MAX] = -1,
 		[_SC_RE_DUP_MAX] = RE_DUP_MAX,
-		[_SC_CHARCLASS_NAME_MAX] = -1, /* ?? */
 		[_SC_2_VERSION] = VER,
 		[_SC_2_C_BIND] = VER,
 		[_SC_2_C_DEV] = -1,
@@ -65,20 +79,7 @@ long sysconf(int name)
 		[_SC_2_FORT_RUN] = -1,
 		[_SC_2_SW_DEV] = -1,
 		[_SC_2_LOCALEDEF] = -1,
-		[_SC_PII] = -1, /* ????????? */
-		[_SC_PII_XTI] = -1,
-		[_SC_PII_SOCKET] = -1,
-		[_SC_PII_INTERNET] = -1,
-		[_SC_PII_OSI] = -1,
-		[_SC_POLL] = 1,
-		[_SC_SELECT] = 1,
 		[_SC_IOV_MAX] = IOV_MAX,
-		[_SC_PII_INTERNET_STREAM] = -1,
-		[_SC_PII_INTERNET_DGRAM] = -1,
-		[_SC_PII_OSI_COTS] = -1,
-		[_SC_PII_OSI_CLTS] = -1,
-		[_SC_PII_OSI_M] = -1,
-		[_SC_T_IOV_MAX] = -1,
 		[_SC_THREADS] = VER,
 		[_SC_THREAD_SAFE_FUNCTIONS] = VER,
 		[_SC_GETGR_R_SIZE_MAX] = -1,
@@ -95,10 +96,10 @@ long sysconf(int name)
 		[_SC_THREAD_PRIO_INHERIT] = -1,
 		[_SC_THREAD_PRIO_PROTECT] = -1,
 		[_SC_THREAD_PROCESS_SHARED] = VER,
-		[_SC_NPROCESSORS_CONF] = CPUCNT,
-		[_SC_NPROCESSORS_ONLN] = CPUCNT,
-		[_SC_PHYS_PAGES] = -1,
-		[_SC_AVPHYS_PAGES] = -1,
+		[_SC_NPROCESSORS_CONF] = JT_NPROCESSORS_CONF,
+		[_SC_NPROCESSORS_ONLN] = JT_NPROCESSORS_ONLN,
+		[_SC_PHYS_PAGES] = JT_PHYS_PAGES,
+		[_SC_AVPHYS_PAGES] = JT_AVPHYS_PAGES,
 		[_SC_ATEXIT_MAX] = -1,
 		[_SC_PASS_MAX] = -1,
 		[_SC_XOPEN_VERSION] = _XOPEN_VERSION,
@@ -108,89 +109,44 @@ long sysconf(int name)
 		[_SC_XOPEN_ENH_I18N] = 1,
 		[_SC_XOPEN_SHM] = 1,
 		[_SC_2_CHAR_TERM] = -1,
-		[_SC_2_C_VERSION] = -1,
 		[_SC_2_UPE] = -1,
 		[_SC_XOPEN_XPG2] = -1,
 		[_SC_XOPEN_XPG3] = -1,
 		[_SC_XOPEN_XPG4] = -1,
-		[_SC_CHAR_BIT] = -1,
-		[_SC_CHAR_MAX] = -1,
-		[_SC_CHAR_MIN] = -1,
-		[_SC_INT_MAX] = -1,
-		[_SC_INT_MIN] = -1,
-		[_SC_LONG_BIT] = -1,
-		[_SC_WORD_BIT] = -1,
-		[_SC_MB_LEN_MAX] = -1,
 		[_SC_NZERO] = NZERO,
-		[_SC_SSIZE_MAX] = -1,
-		[_SC_SCHAR_MAX] = -1,
-		[_SC_SCHAR_MIN] = -1,
-		[_SC_SHRT_MAX] = -1,
-		[_SC_SHRT_MIN] = -1,
-		[_SC_UCHAR_MAX] = -1,
-		[_SC_UINT_MAX] = -1,
-		[_SC_ULONG_MAX] = -1,
-		[_SC_USHRT_MAX] = -1,
-		[_SC_NL_ARGMAX] = -1,
-		[_SC_NL_LANGMAX] = -1,
-		[_SC_NL_MSGMAX] = -1,
-		[_SC_NL_NMAX] = -1,
-		[_SC_NL_SETMAX] = -1,
-		[_SC_NL_TEXTMAX] = -1,
 		[_SC_XBS5_ILP32_OFF32] = -1,
-		[_SC_XBS5_ILP32_OFFBIG] = 2*(sizeof(long)==4)-1,
-		[_SC_XBS5_LP64_OFF64] = 2*(sizeof(long)==8)-1,
+		[_SC_XBS5_ILP32_OFFBIG] = sizeof(long)==4 ? 1 : -1,
+		[_SC_XBS5_LP64_OFF64] = sizeof(long)==8 ? 1 : -1,
 		[_SC_XBS5_LPBIG_OFFBIG] = -1,
 		[_SC_XOPEN_LEGACY] = -1,
 		[_SC_XOPEN_REALTIME] = -1,
 		[_SC_XOPEN_REALTIME_THREADS] = -1,
 		[_SC_ADVISORY_INFO] = VER,
 		[_SC_BARRIERS] = VER,
-		[_SC_BASE] = -1,
-		[_SC_C_LANG_SUPPORT] = -1,
-		[_SC_C_LANG_SUPPORT_R] = -1,
 		[_SC_CLOCK_SELECTION] = VER,
 		[_SC_CPUTIME] = VER,
 		[_SC_THREAD_CPUTIME] = VER,
-		[_SC_DEVICE_IO] = -1,
-		[_SC_DEVICE_SPECIFIC] = -1,
-		[_SC_DEVICE_SPECIFIC_R] = -1,
-		[_SC_FD_MGMT] = -1,
-		[_SC_FIFO] = -1,
-		[_SC_PIPE] = -1,
-		[_SC_FILE_ATTRIBUTES] = -1,
-		[_SC_FILE_LOCKING] = -1,
-		[_SC_FILE_SYSTEM] = -1,
 		[_SC_MONOTONIC_CLOCK] = VER,
-		[_SC_MULTI_PROCESS] = -1,
-		[_SC_SINGLE_PROCESS] = -1,
-		[_SC_NETWORKING] = -1,
 		[_SC_READER_WRITER_LOCKS] = VER,
 		[_SC_SPIN_LOCKS] = VER,
 		[_SC_REGEXP] = 1,
-		[_SC_REGEX_VERSION] = -1,
 		[_SC_SHELL] = 1,
-		[_SC_SIGNALS] = -1,
 		[_SC_SPAWN] = VER,
 		[_SC_SPORADIC_SERVER] = -1,
 		[_SC_THREAD_SPORADIC_SERVER] = -1,
-		[_SC_SYSTEM_DATABASE] = -1,
-		[_SC_SYSTEM_DATABASE_R] = -1,
 		[_SC_TIMEOUTS] = VER,
 		[_SC_TYPED_MEMORY_OBJECTS] = -1,
-		[_SC_USER_GROUPS] = -1,
-		[_SC_USER_GROUPS_R] = -1,
 		[_SC_2_PBS] = -1,
 		[_SC_2_PBS_ACCOUNTING] = -1,
 		[_SC_2_PBS_LOCATE] = -1,
 		[_SC_2_PBS_MESSAGE] = -1,
 		[_SC_2_PBS_TRACK] = -1,
 		[_SC_SYMLOOP_MAX] = SYMLOOP_MAX,
-		[_SC_STREAMS] = 0,
+		[_SC_STREAMS] = JT_ZERO,
 		[_SC_2_PBS_CHECKPOINT] = -1,
 		[_SC_V6_ILP32_OFF32] = -1,
-		[_SC_V6_ILP32_OFFBIG] = 2*(sizeof(long)==4)-1,
-		[_SC_V6_LP64_OFF64] = 2*(sizeof(long)==8)-1,
+		[_SC_V6_ILP32_OFFBIG] = sizeof(long)==4 ? 1 : -1,
+		[_SC_V6_LP64_OFF64] = sizeof(long)==8 ? 1 : -1,
 		[_SC_V6_LPBIG_OFFBIG] = -1,
 		[_SC_HOST_NAME_MAX] = HOST_NAME_MAX,
 		[_SC_TRACE] = -1,
@@ -201,37 +157,76 @@ long sysconf(int name)
 		[_SC_IPV6] = VER,
 		[_SC_RAW_SOCKETS] = VER,
 		[_SC_V7_ILP32_OFF32] = -1,
-		[_SC_V7_ILP32_OFFBIG] = 2*(sizeof(long)==4)-1,
-		[_SC_V7_LP64_OFF64] = 2*(sizeof(long)==8)-1,
+		[_SC_V7_ILP32_OFFBIG] = sizeof(long)==4 ? 1 : -1,
+		[_SC_V7_LP64_OFF64] = sizeof(long)==8 ? 1 : -1,
 		[_SC_V7_LPBIG_OFFBIG] = -1,
 		[_SC_SS_REPL_MAX] = -1,
 		[_SC_TRACE_EVENT_NAME_MAX] = -1,
 		[_SC_TRACE_NAME_MAX] = -1,
 		[_SC_TRACE_SYS_MAX] = -1,
 		[_SC_TRACE_USER_EVENT_MAX] = -1,
-		[_SC_XOPEN_STREAMS] = 0,
+		[_SC_XOPEN_STREAMS] = JT_ZERO,
 		[_SC_THREAD_ROBUST_PRIO_INHERIT] = -1,
 		[_SC_THREAD_ROBUST_PRIO_PROTECT] = -1,
+
+		[_SC_MINSIGSTKSZ] = JT_MINSIGSTKSZ,
+		[_SC_SIGSTKSZ] = JT_SIGSTKSZ,
 	};
-	if (name > sizeof(values)/sizeof(values[0])) {
+
+	if (name >= sizeof(values)/sizeof(values[0]) || !values[name]) {
 		errno = EINVAL;
 		return -1;
-	} else if (values[name] == VER) {
+	} else if (values[name] >= -1) {
+		return values[name];
+	} else if (values[name] < -256) {
+		struct rlimit lim;
+		getrlimit(values[name]&16383, &lim);
+		if (lim.rlim_cur == RLIM_INFINITY)
+			return -1;
+		return lim.rlim_cur > LONG_MAX ? LONG_MAX : lim.rlim_cur;
+	}
+
+	switch ((unsigned char)values[name]) {
+	case VER & 255:
 		return _POSIX_VERSION;
-	} else if (values[name] == OFLOW) {
-		if (name == _SC_ARG_MAX) return ARG_MAX;
-		if (name == _SC_SEM_VALUE_MAX) return SEM_VALUE_MAX;
-	} else if (values[name] == CPUCNT) {
+	case JT_ARG_MAX & 255:
+		return ARG_MAX;
+	case JT_MQ_PRIO_MAX & 255:
+		return MQ_PRIO_MAX;
+	case JT_PAGE_SIZE & 255:
+		return PAGE_SIZE;
+	case JT_SEM_VALUE_MAX & 255:
+		return SEM_VALUE_MAX;
+	case JT_DELAYTIMER_MAX & 255:
+		return DELAYTIMER_MAX;
+	case JT_NPROCESSORS_CONF & 255:
+	case JT_NPROCESSORS_ONLN & 255: ;
 		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];
+	case JT_PHYS_PAGES & 255:
+	case JT_AVPHYS_PAGES & 255: ;
+		unsigned long long mem;
+		struct sysinfo si;
+		__lsysinfo(&si);
+		if (!si.mem_unit) si.mem_unit = 1;
+		if (name==_SC_PHYS_PAGES) mem = si.totalram;
+		else mem = si.freeram + si.bufferram;
+		mem *= si.mem_unit;
+		mem /= PAGE_SIZE;
+		return (mem > LONG_MAX) ? LONG_MAX : mem;
+	case JT_MINSIGSTKSZ & 255:
+	case JT_SIGSTKSZ & 255: ;
+		long val = __getauxval(AT_MINSIGSTKSZ);
+		if (val < MINSIGSTKSZ) val = MINSIGSTKSZ;
+		if (values[name] == JT_SIGSTKSZ)
+			val += SIGSTKSZ - MINSIGSTKSZ;
+		return val;
+	case JT_ZERO & 255:
+		return 0;
 	}
 	return values[name];
 }