Remove lot of duplicated code by sharing POSIX code in Posix.cpp

engine/Android.mk

@@ -139,12 +139,13 @@ LOCAL_SRC_FILES :=\
 \
 	gui/Gui.cpp\
 \
+	os/android/Android.cpp\
 	os/android/AndroidDevice.cpp\
-	os/android/AndroidOS.cpp\
 	os/android/ApkFile.cpp\
 	os/android/ApkFilesystem.cpp\
 	os/android/OsWindow.cpp\
 	os/posix/OsFile.cpp\
+	os/posix/Posix.cpp\
 \
 	physics/Actor.cpp\
 	physics/Controller.cpp\

engine/CMakeLists.txt

@@ -462,9 +462,10 @@ if (LINUX)
 	)
 
 	list (APPEND OS_SRC
-		os/linux/LinuxOS.cpp
+		os/linux/Linux.cpp
 		os/linux/OsWindow.cpp
 		os/posix/OsFile.cpp
+		os/posix/Posix.cpp
 	)
 
 	list (APPEND RENDERERS_SRC

engine/os/android/Android.cpp

@@ -0,0 +1,85 @@
+/*
+Copyright (c) 2013 Daniele Bartolini, Michele Rossi
+Copyright (c) 2012 Daniele Bartolini, Simone Boscaratto
+
+Permission is hereby granted, free of charge, to any person
+obtaining a copy of this software and associated documentation
+files (the "Software"), to deal in the Software without
+restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+#include <jni.h>
+#include <android/log.h>
+#include <cstdarg>
+#include <cstdio>
+#include <cstdlib>
+#include <dirent.h>
+#include <dlfcn.h>
+#include <sys/stat.h>
+#include <sys/time.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+#include <time.h>
+#include <unistd.h>
+
+#include "OS.h"
+#include "Assert.h"
+#include "StringUtils.h"
+#include "OsTypes.h"
+
+namespace crown
+{
+namespace os
+{
+
+extern timespec g_base_time;
+
+//-----------------------------------------------------------------------------
+void log_debug(const char* string, va_list arg)
+{
+	__android_log_vprint(ANDROID_LOG_DEBUG, "crown", string, arg);
+}
+
+//-----------------------------------------------------------------------------
+void log_error(const char* string, va_list arg)
+{
+	__android_log_vprint(ANDROID_LOG_ERROR, "crown", string, arg);
+}
+
+//-----------------------------------------------------------------------------
+void log_warning(const char* string, va_list arg)
+{
+	__android_log_vprint(ANDROID_LOG_WARN, "crown", string, arg);
+}
+
+//-----------------------------------------------------------------------------
+void log_info(const char* string, va_list arg)
+{
+	__android_log_vprint(ANDROID_LOG_INFO, "crown", string, arg);
+}
+
+//-----------------------------------------------------------------------------
+void init_os()
+{
+	// Initilize the base time
+	clock_gettime(CLOCK_MONOTONIC, &g_base_time);
+}
+
+} // namespace os
+} // namespace crown

engine/os/android/AndroidOS.cpp

@@ -1,313 +0,0 @@
-/*
-Copyright (c) 2013 Daniele Bartolini, Michele Rossi
-Copyright (c) 2012 Daniele Bartolini, Simone Boscaratto
-
-Permission is hereby granted, free of charge, to any person
-obtaining a copy of this software and associated documentation
-files (the "Software"), to deal in the Software without
-restriction, including without limitation the rights to use,
-copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following
-conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-#include <jni.h>
-#include <android/log.h>
-#include <cstdarg>
-#include <cstdio>
-#include <cstdlib>
-#include <dirent.h>
-#include <dlfcn.h>
-#include <sys/stat.h>
-#include <sys/time.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <time.h>
-#include <unistd.h>
-
-#include "OS.h"
-#include "Assert.h"
-#include "StringUtils.h"
-#include "OsTypes.h"
-
-namespace crown
-{
-namespace os
-{
-
-static timespec	base_time;
-
-//-----------------------------------------------------------------------------
-void printf(const char* string, ...)
-{
-	va_list args;
-
-	va_start(args, string);
-	::vprintf(string, args);
-	va_end(args);
-}
-
-//-----------------------------------------------------------------------------
-void vprintf(const char* string, va_list arg)
-{
-	::vprintf(string, arg);
-}
-
-//-----------------------------------------------------------------------------
-void log_debug(const char* string, va_list arg)
-{
-	__android_log_vprint(ANDROID_LOG_DEBUG, "crown", string, arg);
-}
-
-//-----------------------------------------------------------------------------
-void log_error(const char* string, va_list arg)
-{
-	__android_log_vprint(ANDROID_LOG_ERROR, "crown", string, arg);
-}
-
-//-----------------------------------------------------------------------------
-void log_warning(const char* string, va_list arg)
-{
-	__android_log_vprint(ANDROID_LOG_WARN, "crown", string, arg);
-}
-
-//-----------------------------------------------------------------------------
-void log_info(const char* string, va_list arg)
-{
-	__android_log_vprint(ANDROID_LOG_INFO, "crown", string, arg);
-}
-
-//-----------------------------------------------------------------------------
-bool is_root_path(const char* path)
-{
-	CE_ASSERT(path != NULL, "Path must be != NULL");
-
-	if (string::strlen(path) == 1)
-	{
-		if (path[0] == PATH_SEPARATOR)
-		{
-			return true;
-		}
-	}
-
-	return false;
-}
-
-//-----------------------------------------------------------------------------
-bool is_absolute_path(const char* path)
-{
-	CE_ASSERT(path != NULL, "Path must be != NULL");
-
-	if (string::strlen(path) > 0)
-	{
-		if (path[0] == PATH_SEPARATOR)
-		{
-			return true;
-		}
-	}
-
-	return false;
-}
-
-//-----------------------------------------------------------------------------
-bool exists(const char* path)
-{
-	struct stat dummy;
-	return (stat(path, &dummy) == 0);
-}
-
-//-----------------------------------------------------------------------------
-bool is_directory(const char* path)
-{
-	struct stat info;
-	memset(&info, 0, sizeof(struct stat));
-	lstat(path, &info);
-	return ((S_ISDIR(info.st_mode)) != 0 && (S_ISLNK(info.st_mode) == 0));
-}
-
-//-----------------------------------------------------------------------------
-bool is_file(const char* path)
-{
-	struct stat info;
-	memset(&info, 0, sizeof(struct stat));
-	lstat(path, &info);
-	return ((S_ISREG(info.st_mode) != 0) && (S_ISLNK(info.st_mode) == 0));
-}
-
-//-----------------------------------------------------------------------------
-bool create_file(const char* path)
-{
-	// Permission mask: rw-r--r--
-	return ::mknod(path, S_IFREG | S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH, 0) == 0;
-}
-
-//-----------------------------------------------------------------------------
-bool delete_file(const char* path)
-{
-	return (::unlink(path) == 0);
-}
-
-//-----------------------------------------------------------------------------
-bool create_directory(const char* path)
-{
-	// rwxr-xr-x permission mask
-	return (::mkdir(path, S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH) == 0);
-}
-
-//-----------------------------------------------------------------------------
-bool delete_directory(const char* path)
-{
-	return (::rmdir(path) == 0);
-}
-
-//-----------------------------------------------------------------------------
-void list_files(const char* path, Vector<DynamicString>& files)
-{
-	DIR *dir;
-	struct dirent *entry;
-
-	if (!(dir = opendir(path)))
-	{
-		return;
-	}
-
-	while ((entry = readdir(dir)))
-	{
-		if (strcmp(entry->d_name, ".") == 0 || strcmp(entry->d_name, "..") == 0)
-		{
-			continue;
-		}
-
-		DynamicString filename(default_allocator());
-
-		filename = entry->d_name;
-		files.push_back(filename);
-	}
-
-	closedir(dir);
-}
-
-//-----------------------------------------------------------------------------
-const char* normalize_path(const char* path)
-{
-	static char norm[MAX_PATH_LENGTH];
-	char* cur = norm;
-
-	while ((*path) != '\0')
-	{
-		if ((*path) == '\\')
-		{
-			(*cur) = PATH_SEPARATOR;
-		}
-		else
-		{
-			(*cur) = (*path);
-		}
-
-		path++;
-		cur++;
-	}
-
-	return norm;
-}
-
-//-----------------------------------------------------------------------------
-const char* get_cwd()
-{
-	static char cwdBuf[MAX_PATH_LENGTH];
-	if (getcwd(cwdBuf, MAX_PATH_LENGTH) == NULL)
-	{
-		return string::EMPTY;
-	}
-
-	return cwdBuf;
-}
-
-//-----------------------------------------------------------------------------
-const char* get_home()
-{
-	char* envHome = NULL;
-	envHome = getenv("HOME");
-
-	if (envHome == NULL)
-	{
-		return string::EMPTY;
-	}
-
-	return envHome;
-}
-
-//-----------------------------------------------------------------------------
-const char* get_env(const char* env)
-{
-	char* envDevel = NULL;
-	envDevel = getenv(env);
-
-	if (envDevel == NULL)
-	{
-		return string::EMPTY;
-	}
-
-	return envDevel;
-}
-
-//-----------------------------------------------------------------------------
-void init_os()
-{
-	// Initilize the base time
-	clock_gettime(CLOCK_MONOTONIC, &base_time);
-}
-
-//-----------------------------------------------------------------------------
-uint64_t milliseconds()
-{
-	timespec tmp;
-
-	clock_gettime(CLOCK_MONOTONIC, &tmp);
-
-	return (tmp.tv_sec - base_time.tv_sec) * 1000 + (tmp.tv_nsec - base_time.tv_nsec) / 1000000;
-}
-
-//-----------------------------------------------------------------------------
-uint64_t microseconds()
-{
-	timespec tmp;
-	clock_gettime(CLOCK_MONOTONIC, &tmp);
-	return (tmp.tv_sec - base_time.tv_sec) * 1000000 + (tmp.tv_nsec - base_time.tv_nsec) / 1000;
-}
-
-//-----------------------------------------------------------------------------
-void execute_process(const char* args[])
-{
-	pid_t pid = fork();
-	CE_ASSERT(pid != -1, "Unable to fork");
-
-	if (pid)
-	{
-		int32_t dummy;
-		wait(&dummy);
-	}
-	else
-	{
-		int res = execv(args[0], (char* const*)args);
-		CE_ASSERT(res != -1, "Unable to exec '%s'. errno %d", args[0], res);
-		exit(EXIT_SUCCESS);
-	}
-}
-
-} // namespace os
-} // namespace crown
-

engine/os/linux/Linux.cpp

@@ -0,0 +1,98 @@
+/*
+Copyright (c) 2013 Daniele Bartolini, Michele Rossi
+Copyright (c) 2012 Daniele Bartolini, Simone Boscaratto
+
+Permission is hereby granted, free of charge, to any person
+obtaining a copy of this software and associated documentation
+files (the "Software"), to deal in the Software without
+restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
+*/
+
+#include "Assert.h"
+#include <X11/Xlib.h>
+#include <cstdarg>
+#include <cstdio>
+#include <cstdlib>
+#include <dirent.h>
+#include <dlfcn.h>
+#include <sys/stat.h>
+#include <sys/time.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+#include <time.h>
+#include <unistd.h>
+
+#include "OS.h"
+#include "StringUtils.h"
+#include "TempAllocator.h"
+
+namespace crown
+{
+namespace os
+{
+
+extern timespec g_base_time;
+
+//-----------------------------------------------------------------------------
+void vprintf(const char* string, va_list arg)
+{
+	::vprintf(string, arg);
+}
+
+//-----------------------------------------------------------------------------
+void log_debug(const char* string, va_list arg)
+{
+	printf("D: ");
+	vprintf(string, arg);
+	printf("\n");
+}
+
+//-----------------------------------------------------------------------------
+void log_error(const char* string, va_list arg)
+{
+	printf("E: ");
+	vprintf(string, arg);
+	printf("\n");
+}
+
+//-----------------------------------------------------------------------------
+void log_warning(const char* string, va_list arg)
+{
+	printf("W: ");
+	vprintf(string, arg);
+	printf("\n");
+}
+
+//-----------------------------------------------------------------------------
+void log_info(const char* string, va_list arg)
+{
+	printf("I: ");
+	vprintf(string, arg);
+	printf("\n");
+}
+
+//-----------------------------------------------------------------------------
+void init_os()
+{
+	// Initilize the base time
+	clock_gettime(CLOCK_MONOTONIC, &g_base_time);
+}
+
+} // namespace os
+} // namespace crown

engine/os/linux/LinuxOS.cpp → engine/os/posix/Posix.cpp

@@ -25,7 +25,6 @@ OTHER DEALINGS IN THE SOFTWARE.
 */
 
 #include "Assert.h"
-#include <X11/Xlib.h>
 #include <cstdarg>
 #include <cstdio>
 #include <cstdlib>
@@ -47,7 +46,7 @@ namespace crown
 namespace os
 {
 
-static timespec base_time;
+timespec g_base_time;
 
 //-----------------------------------------------------------------------------
 void printf(const char* string, ...)
@@ -59,44 +58,6 @@ void printf(const char* string, ...)
 	va_end(args);
 }
 
-//-----------------------------------------------------------------------------
-void vprintf(const char* string, va_list arg)
-{
-	::vprintf(string, arg);
-}
-
-//-----------------------------------------------------------------------------
-void log_debug(const char* string, va_list arg)
-{
-	printf("D: ");
-	vprintf(string, arg);
-	printf("\n");
-}
-
-//-----------------------------------------------------------------------------
-void log_error(const char* string, va_list arg)
-{
-	printf("E: ");
-	vprintf(string, arg);
-	printf("\n");
-}
-
-//-----------------------------------------------------------------------------
-void log_warning(const char* string, va_list arg)
-{
-	printf("W: ");
-	vprintf(string, arg);
-	printf("\n");
-}
-
-//-----------------------------------------------------------------------------
-void log_info(const char* string, va_list arg)
-{
-	printf("I: ");
-	vprintf(string, arg);
-	printf("\n");
-}
-
 //-----------------------------------------------------------------------------
 bool is_root_path(const char* path)
 {
@@ -271,13 +232,6 @@ const char* get_env(const char* env)
 	return envDevel;
 }
 
-//-----------------------------------------------------------------------------
-void init_os()
-{
-	// Initilize the base time
-	clock_gettime(CLOCK_MONOTONIC, &base_time);
-}
-
 //-----------------------------------------------------------------------------
 uint64_t milliseconds()
 {
@@ -285,7 +239,7 @@ uint64_t milliseconds()
 
 	clock_gettime(CLOCK_MONOTONIC, &tmp);
 
-	return (tmp.tv_sec - base_time.tv_sec) * 1000 + (tmp.tv_nsec - base_time.tv_nsec) / 1000000;
+	return (tmp.tv_sec - g_base_time.tv_sec) * 1000 + (tmp.tv_nsec - g_base_time.tv_nsec) / 1000000;
 }
 
 //-----------------------------------------------------------------------------
@@ -293,7 +247,7 @@ uint64_t microseconds()
 {
 	timespec tmp;
 	clock_gettime(CLOCK_MONOTONIC, &tmp);
-	return (tmp.tv_sec - base_time.tv_sec) * 1000000 + (tmp.tv_nsec - base_time.tv_nsec) / 1000;
+	return (tmp.tv_sec - g_base_time.tv_sec) * 1000000 + (tmp.tv_nsec - g_base_time.tv_nsec) / 1000;
 }
 
 //-----------------------------------------------------------------------------