Fixed system timer for BSDs

include/utils/time.h

@@ -8,13 +8,11 @@
 #ifndef _UTILS_TIME_H_
 #define _UTILS_TIME_H_
 
-#include <ctime>
-
 /*!
  * \brief Read the system timer
  * \returns number of ticks
  */
-clock_t systemTimerGet();
+unsigned long systemTimerGet();
 
 /*!
  * \brief Reset the system timer

src/Console.cpp

@@ -14,9 +14,9 @@
 #endif
 
 #include "config.h"
-#include "main.h"
 #include "Console.h"
-#include "utils/strings.h"
+#include "main.h"
+#include "utils/time.h"
 
 Console::Console() {
     mVisible = false;
@@ -45,15 +45,17 @@ void Console::display() {
         glRecti(0, 0, window->mWidth, window->mHeight / 2);
         glEnable(GL_TEXTURE_2D);
 
-        gOpenRaider->mWindow->drawText(25, (window->mHeight / 4) - 20, 0.75f, color, "Console");
+        gOpenRaider->mWindow->drawText(10, 10, 0.50f, color, "%lus uptime %s", systemTimerGet() / 1000, VERSION);
     }
 }
 
 void Console::handleKeyboard(KeyboardButton key, bool pressed) {
+    if (pressed && (key == enter)) {
 
+    }
 }
 
 void Console::handleText(char *text, bool notFinished) {
-    printf("Got %s (%s)\n", (notFinished ? "not finished" : "finished"));
+    printf("Got %s (%s)\n", text, (notFinished ? "not finished" : "finished"));
 }
 

src/main.cpp

@@ -11,6 +11,7 @@
 
 #include "config.h"
 #include "main.h"
+#include "utils/time.h"
 
 OpenRaider *gOpenRaider = NULL;
 
@@ -28,6 +29,8 @@ void cleanupHandler() {
 int main(int argc, char *argv[]) {
     const char *config = NULL;
 
+    systemTimerReset();
+
     // Handle arguments
     if (argc == 1) {
         // Use default rc file path

src/utils/time.cpp

@@ -5,19 +5,21 @@
  * \author xythobuz
  */
 
-#include "utils/time.h"
+#include <sys/time.h>
 
-#define CLOCKS_PER_MS (CLOCKS_PER_SEC / 1000)
+#include "utils/time.h"
 
-clock_t system_timer_start;
-clock_t system_timer_stop;
+struct timeval system_timer_start;
+struct timeval system_timer_stop;
+struct timezone system_timer_zone;
 
-clock_t systemTimerGet() {
-    system_timer_stop = clock();
-    return (system_timer_stop - system_timer_start) / CLOCKS_PER_MS;
+unsigned long systemTimerGet() {
+    gettimeofday(&system_timer_stop, &system_timer_zone);
+    return ((system_timer_stop.tv_sec - system_timer_start.tv_sec) * 1000)
+        + (((system_timer_stop.tv_usec - system_timer_start.tv_usec) / 1000));
 }
 
 void systemTimerReset() {
-    system_timer_start = clock();
+    gettimeofday(&system_timer_start, &system_timer_zone);
 }