lib+driver+common: Move capabilities.c to v.h

It's now v_sys_get_cores under a new v_sys section.
It looks a bit lonely there all by itself, but 95% of the time that
function is the one I want to use.

Author: vkoskiv

include/v.h

@@ -30,6 +30,10 @@
 extern "C" {
 #endif
 
+// --- decl v_sys (System capabilities)
+
+int v_sys_get_cores(void);
+
 // --- decl v_mod (Runtime module loading)
 typedef void * v_mod_t;
 v_mod_t v_mod_load(const char *filename);
@@ -239,6 +243,49 @@ void *v_thread_wait(v_thread *);
 extern "C" {
 #endif
 
+// --- impl v_sys (System capabilities)
+
+#ifdef __APPLE__
+typedef unsigned int u_int;
+typedef unsigned char u_char;
+typedef unsigned short u_short;
+#include <sys/param.h>
+#include <sys/sysctl.h>
+#elif _WIN32
+#include <windows.h>
+#elif __linux__ || __COSMOPOLITAN__
+#include <unistd.h>
+#endif
+
+int v_sys_get_cores(void) {
+#if defined(__APPLE__)
+	int nm[2];
+	size_t len = 4;
+	uint32_t count;
+
+	nm[0] = CTL_HW; nm[1] = HW_AVAILCPU;
+	sysctl(nm, 2, &count, &len, NULL, 0);
+
+	if (count < 1) {
+		nm[1] = HW_NCPU;
+		sysctl(nm, 2, &count, &len, NULL, 0);
+		if (count < 1) {
+			count = 1;
+		}
+	}
+	return (int)count;
+#elif defined(_WIN32)
+	SYSTEM_INFO sysInfo;
+	GetSystemInfo(&sysInfo);
+	return sysInfo.dwNumberOfProcessors;
+#elif defined(__linux__) || defined(__COSMOPOLITAN__)
+	return (int)sysconf(_SC_NPROCESSORS_ONLN);
+#else
+#warning "Unknown platform, v_sys_get_cores() will return 1. Let vkoskiv know about this, please."
+	return 1;
+#endif
+}
+
 // --- impl v_mod (Runtime library loading) (c-ray) ---
 #if defined(WINDOWS)
 	#include <windows.h>

src/common/json_loader.c

@@ -20,7 +20,6 @@
 #include "transforms.h"
 #include "vector.h"
 #include "cr_string.h"
-#include "platform/capabilities.h"
 #include "logging.h"
 #include "fileio.h"
 
@@ -79,7 +78,7 @@ void parse_prefs(struct cr_renderer *ext, const cJSON *data) {
 			cr_renderer_set_num_pref(ext, cr_renderer_threads, threads->valueint);
 			// prefs->fromSystem = false;
 		} else {
-			cr_renderer_set_num_pref(ext, cr_renderer_threads, sys_get_cores() + 2);
+			cr_renderer_set_num_pref(ext, cr_renderer_threads, v_sys_get_cores() + 2);
 			// prefs->fromSystem = true;
 		}
 	}

src/common/platform/capabilities.c

@@ -16,7 +16,6 @@
 #include "args.h"
 
 #include <common/platform/terminal.h>
-#include <common/platform/capabilities.h>
 #include <common/hashtable.h>
 #include <common/logging.h>
 #include <common/fileio.h>
@@ -110,9 +109,10 @@ struct driver_args *args_parse(int argc, char **argv) {
 		if (stringEquals(argv[i], "-j")) {
 			char *threadstr = argv[i + 1];
 			if (threadstr) {
+				int n_cores = v_sys_get_cores();
 				int n = atoi(threadstr);
 				n = n < 0 ? 0 : n;
-				n = n > sys_get_cores() * 2 ? sys_get_cores() * 2 : n;
+				n = n > n_cores * 2 ? n_cores * 2 : n;
 				setDatabaseInt(args, "thread_override", n);
 			} else {
 				logr(warning, "Invalid -j parameter given!\n");

src/common/platform/capabilities.h

@@ -17,7 +17,6 @@
 #include <common/hashtable.h>
 #include <common/vendored/cJSON.h>
 #include <common/json_loader.h>
-#include <common/platform/capabilities.h>
 #include <encoders/encoder.h>
 #include <args.h>
 #include <sdl.h>
@@ -282,7 +281,7 @@ int main(int argc, char *argv[]) {
 	uint64_t bounces = cr_renderer_get_num_pref(renderer, cr_renderer_bounces);
 
 	logr(info, "Starting c-ray renderer for frame %"PRIu64"\n", out_num);
-	bool sys_thread = threads == (size_t)sys_get_cores() + 2;
+	bool sys_thread = threads == (size_t)v_sys_get_cores() + 2;
 	logr(info, "Rendering at %s%"PRIu64"%s x %s%"PRIu64"%s\n", KWHT, width, KNRM, KWHT, height, KNRM);
 	logr(info, "Rendering %s%"PRIu64"%s samples with %s%"PRIu64"%s bounces.\n", KBLU, samples, KNRM, KGRN, bounces, KNRM);
 	logr(info, "Rendering with %s%"PRIu64"%s%s local thread%s.\n",

src/driver/args.c

@@ -16,9 +16,6 @@
 #include <datatypes/poly.h>
 #include <renderer/instance.h>
 #include <common/vector.h>
-#include <common/platform/thread_pool.h>
-#include <common/platform/capabilities.h>
-#include <common/platform/signal.h>
 
 #include <limits.h>
 #include <assert.h>

src/driver/main.c

@@ -24,7 +24,6 @@
 #include <common/hashtable.h>
 #include <common/json_loader.h>
 #include <common/node_parse.h>
-#include <common/platform/capabilities.h>
 #include <common/platform/thread_pool.h>
 #include <common/platform/signal.h>
 #include <accelerators/bvh.h>
@@ -820,7 +819,7 @@ void cr_renderer_render(struct cr_renderer *ext) {
 		r->state.clients = clients_sync(r);
 	}
 	if (!r->state.clients.count && !r->prefs.threads) {
-		r->prefs.threads = sys_get_cores();
+		r->prefs.threads = v_sys_get_cores();
 		logr(warning, "No worker nodes and -j 0 specified, bumping threads 0 -> %zu\n", r->prefs.threads);
 	}
 	renderer_render(r);

src/lib/accelerators/bvh.c

@@ -15,7 +15,6 @@
 #include <common/hashtable.h>
 #include <common/textbuffer.h>
 #include <common/node_parse.h>
-#include <common/platform/capabilities.h>
 #include <common/platform/thread_pool.h>
 #include <common/texture.h>
 #include "camera.h"
@@ -34,7 +33,7 @@ struct world *scene_new(void) {
 	s->storage.node_pool = newBlock(NULL, 1024);
 	s->storage.node_table = newHashtable(compareNodes, &s->storage.node_pool);
 	s->bvh_lock = v_rwlock_create();
-	s->bg_worker = thread_pool_create(sys_get_cores());
+	s->bg_worker = thread_pool_create(v_sys_get_cores());
 	return s;
 }
 

src/lib/api/c-ray.c

@@ -26,8 +26,6 @@
 #include <common/networking.h>
 #include <common/base64.h>
 #include <common/node_parse.h>
-#include <common/platform/thread_pool.h>
-#include <common/platform/capabilities.h>
 #include <renderer/renderer.h>
 #include <renderer/instance.h>
 #include <datatypes/tile.h>