X-Git-Url: http://nsz.repo.hu/git/?p=musl;a=blobdiff_plain;f=src%2Fconf%2Fsysconf.c;h=d6691df8b0de371ad9b74db1d46860fb069651e6;hp=5b6c14e520f2c97e93bfc753e632cd6ae76221e9;hb=2bf469310de6793228c103691859ed4d3158b117;hpb=2e0c1fed36be1f1435de79bfc7cdc34824cb5614

diff --git a/src/conf/sysconf.c b/src/conf/sysconf.c
index 5b6c14e5..d6691df8 100644
--- a/src/conf/sysconf.c
+++ b/src/conf/sysconf.c
@@ -6,6 +6,7 @@
 
 #define VER (-2)
 #define OFLOW (-3)
+#define CPUCNT (-4)
 #define RLIM(x) (-32768|(RLIMIT_ ## x))
 
 long sysconf(int name)
@@ -94,8 +95,8 @@ long sysconf(int name)
 		[_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,
@@ -220,7 +221,14 @@ long sysconf(int name)
 	} 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] < 0) {
+	} 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];