1 files changed, 51 insertions, 24 deletions

diff --git a/drivers/unix/os_unix.cpp b/drivers/unix/os_unix.cpp
index 05dfd69f58..6c70934bc6 100644
--- a/drivers/unix/os_unix.cpp
+++ b/drivers/unix/os_unix.cpp
@@ -32,30 +32,27 @@
 
 #ifdef UNIX_ENABLED
 
-#include "servers/visual_server.h"
-
 #include "core/os/thread_dummy.h"
-#include "mutex_posix.h"
-#include "rw_lock_posix.h"
-#include "semaphore_posix.h"
-#include "thread_posix.h"
-
-//#include "core/io/file_access_buffered_fa.h"
-#include "dir_access_unix.h"
-#include "file_access_unix.h"
-#include "packet_peer_udp_posix.h"
-#include "stream_peer_tcp_posix.h"
-#include "tcp_server_posix.h"
+#include "core/project_settings.h"
+#include "drivers/unix/dir_access_unix.h"
+#include "drivers/unix/file_access_unix.h"
+#include "drivers/unix/mutex_posix.h"
+#include "drivers/unix/net_socket_posix.h"
+#include "drivers/unix/rw_lock_posix.h"
+#include "drivers/unix/semaphore_posix.h"
+#include "drivers/unix/thread_posix.h"
+#include "servers/visual_server.h"
 
 #ifdef __APPLE__
 #include <mach-o/dyld.h>
+#include <mach/mach_time.h>
 #endif
 
 #if defined(__FreeBSD__) || defined(__OpenBSD__)
 #include <sys/param.h>
 #include <sys/sysctl.h>
 #endif
-#include "project_settings.h"
+
 #include <assert.h>
 #include <dlfcn.h>
 #include <errno.h>
@@ -68,6 +65,32 @@
 #include <sys/wait.h>
 #include <unistd.h>
 
+/// Clock Setup function (used by get_ticks_usec)
+static uint64_t _clock_start = 0;
+#if defined(__APPLE__)
+static double _clock_scale = 0;
+static void _setup_clock() {
+	mach_timebase_info_data_t info;
+	kern_return_t ret = mach_timebase_info(&info);
+	ERR_EXPLAIN("OS CLOCK IS NOT WORKING!");
+	ERR_FAIL_COND(ret != 0);
+	_clock_scale = ((double)info.numer / (double)info.denom) / 1000.0;
+	_clock_start = mach_absolute_time() * _clock_scale;
+}
+#else
+#if defined(CLOCK_MONOTONIC_RAW) && !defined(JAVASCRIPT_ENABLED) // This is a better clock on Linux.
+#define GODOT_CLOCK CLOCK_MONOTONIC_RAW
+#else
+#define GODOT_CLOCK CLOCK_MONOTONIC
+#endif
+static void _setup_clock() {
+	struct timespec tv_now = { 0, 0 };
+	ERR_EXPLAIN("OS CLOCK IS NOT WORKING!");
+	ERR_FAIL_COND(clock_gettime(GODOT_CLOCK, &tv_now) != 0);
+	_clock_start = ((uint64_t)tv_now.tv_nsec / 1000L) + (uint64_t)tv_now.tv_sec * 1000000L;
+}
+#endif
+
 void OS_Unix::debug_break() {
 
 	assert(false);
@@ -126,14 +149,11 @@ void OS_Unix::initialize_core() {
 	DirAccess::make_default<DirAccessUnix>(DirAccess::ACCESS_FILESYSTEM);
 
 #ifndef NO_NETWORK
-	TCPServerPosix::make_default();
-	StreamPeerTCPPosix::make_default();
-	PacketPeerUDPPosix::make_default();
+	NetSocketPosix::make_default();
 	IP_Unix::make_default();
 #endif
 
-	ticks_start = 0;
-	ticks_start = get_ticks_usec();
+	_setup_clock();
 
 	struct sigaction sa;
 	sa.sa_handler = &handle_sigchld;
@@ -145,6 +165,8 @@ void OS_Unix::initialize_core() {
 }
 
 void OS_Unix::finalize_core() {
+
+	NetSocketPosix::cleanup();
 }
 
 void OS_Unix::alert(const String &p_alert, const String &p_title) {
@@ -250,11 +272,16 @@ void OS_Unix::delay_usec(uint32_t p_usec) const {
 }
 uint64_t OS_Unix::get_ticks_usec() const {
 
-	struct timeval tv_now;
-	gettimeofday(&tv_now, NULL);
-
-	uint64_t longtime = (uint64_t)tv_now.tv_usec + (uint64_t)tv_now.tv_sec * 1000000L;
-	longtime -= ticks_start;
+#if defined(__APPLE__)
+	uint64_t longtime = mach_absolute_time() * _clock_scale;
+#else
+	// Unchecked return. Static analyzers might complain.
+	// If _setup_clock() succeded, we assume clock_gettime() works.
+	struct timespec tv_now = { 0, 0 };
+	clock_gettime(GODOT_CLOCK, &tv_now);
+	uint64_t longtime = ((uint64_t)tv_now.tv_nsec / 1000L) + (uint64_t)tv_now.tv_sec * 1000000L;
+#endif
+	longtime -= _clock_start;
 
 	return longtime;
 }