From 1c63cbf204b1d2c667ce9f821ccb197d0ffb0ac3 Mon Sep 17 00:00:00 2001
From: Stijn Buys <ingar@osirion.org>
Date: Wed, 11 May 2011 14:48:17 +0000
Subject: Review of the main loop timer, converted timers from float to
 unsigned long, corrected a number of timing bugs, improved client framerate
 stability.

---
 src/sys/Makefile.am |  4 ++--
 src/sys/timer.cc    | 46 ++++++++++++++++++++++++++++++++++++++++++++++
 src/sys/timer.h     | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 98 insertions(+), 2 deletions(-)
 create mode 100644 src/sys/timer.cc
 create mode 100644 src/sys/timer.h

(limited to 'src/sys')

diff --git a/src/sys/Makefile.am b/src/sys/Makefile.am
index be1c636..ff1fbe0 100644
--- a/src/sys/Makefile.am
+++ b/src/sys/Makefile.am
@@ -2,5 +2,5 @@ INCLUDES = -I$(top_srcdir)/src
 METASOURCES = AUTO
 libsys_la_LDFLAGS = -avoid-version -no-undefined
 noinst_LTLIBRARIES = libsys.la
-libsys_la_SOURCES = consoleinterface.cc sys.cc
-noinst_HEADERS = consoleinterface.h sys.h
+libsys_la_SOURCES = consoleinterface.cc sys.cc timer.cc
+noinst_HEADERS = consoleinterface.h sys.h timer.h
diff --git a/src/sys/timer.cc b/src/sys/timer.cc
new file mode 100644
index 0000000..c46ece2
--- /dev/null
+++ b/src/sys/timer.cc
@@ -0,0 +1,46 @@
+/*
+   sys/timer.cc
+   This file is part of the Osirion project and is distributed under
+   the terms and conditions of the GNU General Public License version 2
+*/
+
+#include "sys/timer.h"
+
+#include <sys/time.h>
+
+#include <unistd.h>
+#include <iostream>
+
+namespace sys
+{
+
+Timer::Timer()
+{
+	reset();
+}
+
+Timer::~Timer()
+{
+}
+
+void Timer::reset()
+{
+	struct timeval tick;
+	struct timezone tick_tz;
+
+	gettimeofday(&tick, &tick_tz);
+	timer_start = tick.tv_sec * 1000 + tick.tv_usec / 1000;
+}
+
+unsigned long Timer::timestamp() const
+{
+	struct timeval tick;
+	struct timezone tick_tz;
+
+	gettimeofday(&tick, &tick_tz);
+	unsigned long delta = (tick.tv_sec * 1000 + tick.tv_usec / 1000) - timer_start;
+	
+	return delta;
+}
+
+}
diff --git a/src/sys/timer.h b/src/sys/timer.h
new file mode 100644
index 0000000..125363d
--- /dev/null
+++ b/src/sys/timer.h
@@ -0,0 +1,50 @@
+/*
+   sys/timer.h
+   This file is part of the Osirion project and is distributed under
+   the terms and conditions of the GNU General Public License version 2
+*/
+
+#ifndef __INCLUDED_SYS_TIMER_H__
+#define __INCLUDED_SYS_TIMER_H__
+
+namespace sys
+{
+
+/// a timer measures intervals in seconds
+/*! A timer class measures the time elapsed
+* between the last two calls to its mark() function.
+*/
+class Timer
+{
+public:
+	/**
+	 * @brief constructor
+	 * The constructor autmaticly calls reset()
+	 * */
+	Timer();
+	
+	/**
+	 * @brief destructor
+	 * */
+	~Timer();
+
+	/**
+	 * @brief reset the timer to 0
+	 */
+	void reset();
+
+	/**
+	 * @brief return the time elapsed since the last reset() call, in milliseconds
+	 * 
+	 * */
+	unsigned long timestamp() const;
+
+private:
+	unsigned long			timer_start;
+
+}; // class Timer
+
+} // namespace sys
+
+#endif // __INCLUDED_SYS_TIMER_H__
+
-- 
cgit v1.2.3