remove config repository code

Author: mjansson

CHANGELOG

@@ -6,8 +6,7 @@ Added a minimal in-place JSON parser. Also parses simplified JSON.
 Added implementation SHA-2 256 and 512 bit algorithms, including uint256_t and uint512_t
 representation data types with string conversions.
 
-Changed configuration module to use explicit given configuration storage. Changed config
-storage format to use simplified json. Removed config_load function.
+Removed configuration repository since it is mostly replaced by JSON parser.
 
 Changed byte order representation of raw digest from md5_get_digest_raw to generate
 correct string representation using string_from_uint128.
@@ -30,7 +29,8 @@ Android build now requires NDK r11 and uses clang by default, with built in
 thread local storage support instead of old pthread api wrappers.
 
 Refactored the ninja build generator into modules to be easier to extend and maintain
-instead of a single monolithic file. Minor changes in generator interface.
+instead of a single monolithic file. Minor changes in generator interface. Build only
+x86-64 target on Windows by default (x86 still supported).
 
 
 1.4.1

README.md

@@ -17,7 +17,8 @@ functions to write applications and games in a platform-independent fashion. It
 * String handling in UTF-8 and UTF-16
 * Murmur hasing and statically hashed strings
 * Math support for 32 and 64 bit floats
-* Configuration repository with config file I/O
+* JSON/SJSON parser
+* SHA256/SHA512 digest
 * Application, environment and system queries and control
 * Regular expressions
 * Exception utilities (SEH, signals)

config/foundation.json

@@ -1,4 +1,6 @@
-foundation = {
-	temporary_memory  = 0
-	memory_tracker    = local
+{
+	"foundation" : {
+		"temporary_memory":  0,
+		"memory_tracker": "local"
+	}
 }

configure.py

@@ -17,7 +17,7 @@
 
 foundation_sources = [
   'android.c', 'array.c', 'assert.c', 'assetstream.c', 'atomic.c', 'base64.c', 'beacon.c', 'bitbuffer.c', 'blowfish.c',
-  'bufferstream.c', 'config.c', 'environment.c', 'error.c', 'event.c', 'exception.c', 'foundation.c', 'fs.c',
+  'bufferstream.c', 'environment.c', 'error.c', 'event.c', 'exception.c', 'foundation.c', 'fs.c',
   'hash.c', 'hashmap.c', 'hashtable.c', 'json.c', 'library.c', 'log.c', 'main.c', 'md5.c', 'memory.c', 'mutex.c',
   'objectmap.c', 'path.c', 'pipe.c', 'pnacl.c', 'process.c', 'profile.c', 'radixsort.c', 'random.c', 'regex.c',
   'ringbuffer.c', 'sha.c', 'semaphore.c', 'stacktrace.c', 'stream.c', 'string.c', 'system.c', 'thread.c', 'time.c',
@@ -37,7 +37,7 @@
 test_lib = generator.lib(module = 'test', basepath = 'test', sources = ['test.c', 'test.m'], includepaths = includepaths)
 
 test_cases = [
-  'app', 'array', 'atomic', 'base64', 'beacon', 'bitbuffer', 'blowfish', 'bufferstream', 'config', 'environment', 'error',
+  'app', 'array', 'atomic', 'base64', 'beacon', 'bitbuffer', 'blowfish', 'bufferstream', 'environment', 'error',
   'event', 'exception', 'fs', 'hash', 'hashmap', 'hashtable', 'json', 'library', 'math', 'md5', 'mutex', 'objectmap',
   'path', 'pipe', 'process', 'profile', 'radixsort', 'random', 'regex', 'ringbuffer', 'semaphore', 'sha', 'stacktrace',
   'stream', 'string', 'system', 'time', 'uuid'

foundation/config.c

@@ -378,7 +378,6 @@ environment_set_current_working_directory(const char* path, size_t length) {
 	string_t buffer, pathstr;
 #endif
 	bool result = true;
-	log_debugf(0, STRING_CONST("Setting current working directory to: %.*s"), (int)length, path);
 #if FOUNDATION_PLATFORM_WINDOWS
 	{
 		wchar_t* wpath = wstring_allocate_from_string(path, length);

foundation/config.h

@@ -60,7 +60,6 @@ Wrapper for foundation library headers and main entry/exit points */
 #include <foundation/profile.h>
 
 #include <foundation/environment.h>
-#include <foundation/config.h>
 #include <foundation/stream.h>
 #include <foundation/fs.h>
 #include <foundation/bufferstream.h>

foundation/environment.c

@@ -1286,8 +1286,8 @@ _fs_monitor(void* monitorptr) {
 
 #endif
 
-	log_debugf(0, STRING_CONST("Monitoring file system: %.*s"),
-	           STRING_FORMAT(monitor->path));
+	//log_debugf(0, STRING_CONST("Monitoring file system: %.*s"),
+	//           STRING_FORMAT(monitor->path));
 
 #if FOUNDATION_PLATFORM_WINDOWS
 	{
@@ -1459,15 +1459,15 @@ _fs_monitor(void* monitorptr) {
 //        https://github.com/emcrisostomo/fswatch/blob/master/libfswatch/src/libfswatch/c%2B%2B/kqueue_monitor.cpp
 
 #else
-		log_debug(0, STRING_CONST("Filesystem watcher not implemented on this platform"));
+		//log_debug(0, STRING_CONST("Filesystem watcher not implemented on this platform"));
 		//Not implemented yet, just wait for signal to simulate thread
 		thread_wait();
 		keep_running = false;
 #endif
 	}
 
-	log_debugf(0, STRING_CONST("Stopped monitoring file system: %.*s"),
-	           STRING_FORMAT(monitor->path));
+	//log_debugf(0, STRING_CONST("Stopped monitoring file system: %.*s"),
+	//           STRING_FORMAT(monitor->path));
 
 #if FOUNDATION_PLATFORM_WINDOWS
 

foundation/foundation.h

@@ -776,7 +776,6 @@ static bool          _memory_tracker_initialized;
 
 static int
 _memory_tracker_initialize(void) {
-	log_debug(HASH_MEMORY, STRING_CONST("Initializing local memory tracker"));
 	if (!_memory_tracker_initialized) {
 		size_t size = sizeof(memory_tag_t) * _foundation_config.memory_tracker_max;
 		_memory_tags = memory_allocate(0, size, 16, MEMORY_PERSISTENT | MEMORY_ZERO_INITIALIZED);
@@ -816,7 +815,6 @@ _memory_tracker_finalize(void) {
 		unsigned int it;
 		bool got_leaks = false;
 
-		log_debug(HASH_MEMORY, STRING_CONST("Checking for memory leaks"));
 		for (it = 0; it < _foundation_config.memory_tracker_max; ++it) {
 			memory_tag_t* tag = _memory_tags + it;
 			if (atomic_loadptr(&tag->address)) {
@@ -830,9 +828,6 @@ _memory_tracker_finalize(void) {
 				got_leaks = true;
 			}
 		}
-
-		if (!got_leaks)
-			log_debug(HASH_MEMORY, STRING_CONST("No memory leaks detected"));
 	}
 	_memory_tracker_cleanup();
 }

foundation/fs.c

@@ -991,7 +991,9 @@ typedef struct atomicptr_t atomicptr_t;
 #define STRING_FORMAT(s) (int)(s).length, (s).str
 
 // Misc
-#if FOUNDATION_COMPILER_GCC || defined(__COVERITY__)
+#if defined(__COVERITY__)
+#define FOUNDATION_UNUSED(x) ((void)(x))
+#elif FOUNDATION_COMPILER_GCC
 #define FOUNDATION_UNUSED(x) ((void)sizeof((x)))
 #else
 #define FOUNDATION_UNUSED(x) (/*lint --e{505,550,818,866} */(void)sizeof((x), 0))

foundation/memory.c

@@ -249,8 +249,8 @@ process_spawn(process_t* proc) {
 			log_warn(0, WARNING_UNSUPPORTED, STRING_CONST("Unable to redirect standard in/out"
 			                                              " through pipes when using ShellExecute for process spawning"));
 
-		log_debugf(0, STRING_CONST("Spawn process (ShellExecute): %.*s %.*s"),
-		           STRING_FORMAT(proc->path), STRING_FORMAT(cmdline));
+		//log_debugf(0, STRING_CONST("Spawn process (ShellExecute): %.*s %.*s"),
+		//           STRING_FORMAT(proc->path), STRING_FORMAT(cmdline));
 
 		if (!ShellExecuteExW(&sei)) {
 			string_const_t errstr = system_error_message(0);
@@ -292,8 +292,8 @@ process_spawn(process_t* proc) {
 			inherit_handles = TRUE;
 		}
 
-		log_debugf(0, STRING_CONST("Spawn process (CreateProcess): %.*s %.*s"),
-		           STRING_FORMAT(proc->path), STRING_FORMAT(cmdline));
+		//log_debugf(0, STRING_CONST("Spawn process (CreateProcess): %.*s %.*s"),
+		//           STRING_FORMAT(proc->path), STRING_FORMAT(cmdline));
 
 		if (!CreateProcessW(0, wcmdline, 0, 0, inherit_handles,
 		                    (proc->flags & PROCESS_CONSOLE) ? CREATE_NEW_CONSOLE : 0, 0, wwd, &si, &pi)) {
@@ -365,7 +365,7 @@ process_spawn(process_t* proc) {
 		params.application = fsref;
 		params.argv = argvref;
 
-		log_debugf(0, STRING_CONST("Spawn process (LSOpenApplication): %.*s"), STRING_FORMAT(localpath));
+		//log_debugf(0, STRING_CONST("Spawn process (LSOpenApplication): %.*s"), STRING_FORMAT(localpath));
 
 		status = LSOpenApplication(&params, &psn);
 		if (status != 0) {
@@ -448,12 +448,12 @@ process_spawn(process_t* proc) {
 	if (pid == 0) {
 		//Child
 		if (proc->wd.length) {
-			log_debugf(0, STRING_CONST("Spawned child process, setting working directory to %.*s"),
-			           STRING_FORMAT(proc->wd));
+			//log_debugf(0, STRING_CONST("Spawned child process, setting working directory to %.*s"),
+			//           STRING_FORMAT(proc->wd));
 			environment_set_current_working_directory(STRING_ARGS(proc->wd));
 		}
 
-		log_debugf(0, STRING_CONST("Child process executing: %.*s"), STRING_FORMAT(proc->path));
+		//log_debugf(0, STRING_CONST("Child process executing: %.*s"), STRING_FORMAT(proc->path));
 
 		if (proc->flags & PROCESS_STDSTREAMS) {
 			pipe_close_read(proc->pipeout);
@@ -478,7 +478,7 @@ process_spawn(process_t* proc) {
 	memory_deallocate(argv);
 
 	if (pid > 0) {
-		log_debugf(0, STRING_CONST("Child process forked, pid %d"), pid);
+		//log_debugf(0, STRING_CONST("Child process forked, pid %d"), pid);
 
 		proc->pid = pid;
 

foundation/platform.h

@@ -354,8 +354,6 @@ profile_initialize(const char* identifier, size_t length, void* buffer, size_t s
 	thread_initialize(&_profile_io_thread, _profile_io, 0, STRING_CONST("profile_io"),
 	                  THREAD_PRIORITY_BELOWNORMAL, 0);
 
-	log_debugf(0, STRING_CONST("Initialize profiling system with %u blocks (%" PRIsize "KiB)"),
-	           num_blocks, size / 1024);
 	_profile_initialized = true;
 }
 

foundation/process.c

@@ -224,9 +224,9 @@ _thread_entry(thread_arg_t data) {
 		pthread_set_name_np(pthread_self(), thread->name.str);
 #endif
 
-	log_debugf(0, STRING_CONST("Starting thread '%.*s' (%" PRIx64 ") %s"),
-	           STRING_FORMAT(thread->name), thread->osid,
-	           handler ? " (exceptions handled)" : "");
+	//log_debugf(0, STRING_CONST("Starting thread '%.*s' (%" PRIx64 ") %s"),
+	//           STRING_FORMAT(thread->name), thread->osid,
+	//           handler ? " (exceptions handled)" : "");
 
 	set_thread_self(thread);
 	atomic_store32(&thread->state, 1);
@@ -247,8 +247,8 @@ _thread_entry(thread_arg_t data) {
 		}
 	}
 
-	log_debugf(0, STRING_CONST("Exiting thread '%.*s' (%" PRIx64 ")"),
-	           STRING_FORMAT(thread->name), thread->osid);
+	//log_debugf(0, STRING_CONST("Exiting thread '%.*s' (%" PRIx64 ")"),
+	//           STRING_FORMAT(thread->name), thread->osid);
 
 	if (thread_is_main())
 		_thread_main_id = (uint64_t)-1;

foundation/profile.c

@@ -174,9 +174,8 @@ string_from_uuid(char* buffer, size_t size, const uuid_t val) {
 	               convert.raw.data4[2], convert.raw.data4[3], convert.raw.data4[4], convert.raw.data4[5],
 	               convert.raw.data4[6], convert.raw.data4[7]);
 	if ((len < 0) || ((unsigned int)len > size)) {
-		if (size)
-			buffer[ size - 1 ] = 0;
-		return (string_t) {buffer, size ? (size - 1) : 0};
+		buffer[ size - 1 ] = 0;
+		return (string_t) {buffer, size - 1};
 	}
 	return (string_t) {buffer, (unsigned int)len};
 }