X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Futils%2Ftimer.cpp;h=9d385fe50012e629faa7e3aeaa3916d23fa073e9;hb=76df856e0df1b67770038e657f526f915c11a140;hp=433fcb263bef764219578bae10224735e29b57f5;hpb=78daa605c5abd64054dad9f5fcfee638f8c515e0;p=apps%2Flow-level-can-service.git

diff --git a/src/utils/timer.cpp b/src/utils/timer.cpp
index 433fcb2..9d385fe 100644
--- a/src/utils/timer.cpp
+++ b/src/utils/timer.cpp
@@ -15,22 +15,89 @@
  * limitations under the License.
  */
 
+#include <time.h>
+#include <stdlib.h> 
+
 #include "timer.hpp"
 
-long long int systemTimeMs()
+#define MS_PER_SECOND 1000
+
+long long int system_time_us()
+{
+	struct timespec t_usec;
+	long long int timestamp_usec;
+	
+	if(!::clock_gettime(CLOCK_MONOTONIC, &t_usec))
+		timestamp_usec = (t_usec.tv_nsec / 1000ll) + (t_usec.tv_sec* 1000000ll);
+	return timestamp_usec;
+}
+
+long long int system_time_ms()
 {
-	struct timeb t_msec;
+	struct timespec t_msec;
 	long long int timestamp_msec;
 	
-	if(!::ftime(&t_msec))
-	{
-		timestamp_msec = (t_msec.time) * 1000ll + 
-			t_msec.millitm;
-	}
+	if(!::clock_gettime(CLOCK_MONOTONIC, &t_msec))
+		timestamp_msec = (t_msec.tv_nsec / 1000000ll) + (t_msec.tv_sec* 1000ll);
 	return timestamp_msec;
 }
 
+long long int system_time_s()
+{
+	struct timespec t_sec;
+	long long int timestamp_sec;
+	
+	if(!::clock_gettime(CLOCK_MONOTONIC, &t_sec))
+		timestamp_sec = t_sec.tv_sec;
+	return timestamp_sec;
+}
 
 frequency_clock_t::frequency_clock_t()
-	: frequency_{0.0}, last_tick_{0}, time_function_{nullptr}
-{}
\ No newline at end of file
+	: frequency_{10.0}, last_tick_{0}, time_function_{nullptr}
+{}
+
+
+frequency_clock_t::frequency_clock_t(float frequency)
+	: frequency_{frequency}, last_tick_{0}, time_function_{nullptr}
+{}
+
+/// @brief Return the period in ms given the frequency in hertz.
+float frequency_clock_t::frequency_to_period(float frequency)
+{
+	return 1 / frequency * MS_PER_SECOND;
+}
+
+bool frequency_clock_t::started()
+{
+	return last_tick_ != 0;
+}
+
+time_function_t frequency_clock_t::get_time_function()
+{
+	return time_function_ != nullptr ? time_function_ : system_time_ms;
+}
+
+bool frequency_clock_t::elapsed(bool stagger)
+{
+	float period = frequency_to_period(frequency_);
+	float elapsed_time = 0;
+	if(!started() && stagger)
+		last_tick_ = get_time_function()() - (rand() % int(period));
+	else
+		// Make sure it ticks the the first call
+		elapsed_time = !started() ? period : get_time_function()() - last_tick_;
+
+	return frequency_ == 0 || elapsed_time >= period;
+}
+
+float frequency_clock_t::get_frequency() const
+{
+	return frequency_;
+}
+
+/// @brief Force the clock to tick, regardless of it its time has actually
+/// elapsed.
+void frequency_clock_t::tick()
+{
+	last_tick_ = get_time_function()();
+}
\ No newline at end of file