Use single box for halo mesh

[minetest.git] / src / porting.h

diff --git a/src/porting.h b/src/porting.h
index 5da32607cfaa0897c87286670096c24ea6c5631a..4d51c5058cd3c0d1acff734c799d932ac73a29ba 100644 (file)
--- a/src/porting.h
+++ b/src/porting.h
@@ -211,43 +211,56 @@ void initIrrlicht(irr::IrrlichtDevice * );
        }
 
 #else // Posix
-
-       inline u32 getTimeS()
+       inline void _os_get_clock(struct timespec *ts)
        {
+#if defined(__MACH__) && defined(__APPLE__)
+       // from http://stackoverflow.com/questions/5167269/clock-gettime-alternative-in-mac-os-x
+       // OS X does not have clock_gettime, use clock_get_time
+               clock_serv_t cclock;
+               mach_timespec_t mts;
+               host_get_clock_service(mach_host_self(), CALENDAR_CLOCK, &cclock);
+               clock_get_time(cclock, &mts);
+               mach_port_deallocate(mach_task_self(), cclock);
+               ts->tv_sec = mts.tv_sec;
+               ts->tv_nsec = mts.tv_nsec;
+#elif defined(CLOCK_MONOTONIC_RAW)
+               clock_gettime(CLOCK_MONOTONIC_RAW, ts);
+#elif defined(_POSIX_MONOTONIC_CLOCK)
+               clock_gettime(CLOCK_MONOTONIC, ts);
+#else
                struct timeval tv;
                gettimeofday(&tv, NULL);
-               return tv.tv_sec;
+               TIMEVAL_TO_TIMESPEC(&tv, ts);
+#endif // defined(__MACH__) && defined(__APPLE__)
+       }
+
+       // Note: these clock functions do not return wall time, but
+       // generally a clock that starts at 0 when the process starts.
+       inline u32 getTimeS()
+       {
+               struct timespec ts;
+               _os_get_clock(&ts);
+               return ts.tv_sec;
        }
 
        inline u32 getTimeMs()
        {
-               struct timeval tv;
-               gettimeofday(&tv, NULL);
-               return tv.tv_sec * 1000 + tv.tv_usec / 1000;
+               struct timespec ts;
+               _os_get_clock(&ts);
+               return ts.tv_sec * 1000 + ts.tv_nsec / 1000000;
        }
 
        inline u32 getTimeUs()
        {
-               struct timeval tv;
-               gettimeofday(&tv, NULL);
-               return tv.tv_sec * 1000000 + tv.tv_usec;
+               struct timespec ts;
+               _os_get_clock(&ts);
+               return ts.tv_sec * 1000000 + ts.tv_nsec / 1000;
        }
 
        inline u32 getTimeNs()
        {
                struct timespec ts;
-               // from http://stackoverflow.com/questions/5167269/clock-gettime-alternative-in-mac-os-x
-#if defined(__MACH__) && defined(__APPLE__) // OS X does not have clock_gettime, use clock_get_time
-               clock_serv_t cclock;
-               mach_timespec_t mts;
-               host_get_clock_service(mach_host_self(), CALENDAR_CLOCK, &cclock);
-               clock_get_time(cclock, &mts);
-               mach_port_deallocate(mach_task_self(), cclock);
-               ts.tv_sec = mts.tv_sec;
-               ts.tv_nsec = mts.tv_nsec;
-#else
-               clock_gettime(CLOCK_REALTIME, &ts);
-#endif
+               _os_get_clock(&ts);
                return ts.tv_sec * 1000000000 + ts.tv_nsec;
        }