Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'src/server/timer.cc')
-rw-r--r--src/server/timer.cc11
1 files changed, 7 insertions, 4 deletions
diff --git a/src/server/timer.cc b/src/server/timer.cc
index 946da2c..56075c7 100644
--- a/src/server/timer.cc
+++ b/src/server/timer.cc
@@ -5,7 +5,9 @@
*/
#include "timer.h"
+
#include <unistd.h>
+#include <iostream>
namespace server {
@@ -26,13 +28,14 @@ void Timer::mark()
float Timer::elapsed()
{
- timeval tick;
+ struct timeval tick;
+ struct timezone tick_tz;
- gettimeofday(&tick, &timer_tz);
+ gettimeofday(&tick, &tick_tz);
// calculate elapsed time in 10^-6 seconds
- long delta = (tick.tv_sec - timer_tick.tv_sec) * 1000000 + (tick.tv_usec - timer_tick.tv_usec);
- return( (float) delta / 1000000);
+ long delta = (tick.tv_sec - timer_tick.tv_sec) * 1000000 + (tick.tv_usec - timer_tick.tv_usec);
+ return( (float) delta / 1000000.0f);
}
}