another minor optimization - better for low cpu%

2 files changed, 27 insertions, 76 deletions

diff --git a/src/os_time.cpp b/src/os_time.cpp
index 706ab4d8..1854749d 100755
--- a/src/os_time.cpp
+++ b/src/os_time.cpp
@@ -22,69 +22,9 @@ limitations under the License.
 
 #include "os_time.h"
 #include <stdio.h>
-hr_time_t start_time;
 
-#ifdef WIN32
+COsTimeGlobalData  timer_gd;
 
-#include <windows.h>
-uint32_t os_get_time_msec(){
-    return (GetTickCount());
-}
-uint32_t os_get_time_freq(){
-    return (1000);
-}
-
-
-typedef union {
-		struct {
-		uint32_t low;
-		uint32_t high;
-		} h;
-		hr_time_t x;
-} timer_hl_t;
-
-//hr_time_t os_get_hr_freq(void);
-
-hr_time_t    os_get_hr_freq(void){
-	return (3000000000);
-}
-
-
-hr_time_t os_get_hr_tick_64(void) {
-	uint32_t _low,_high;
-	__asm {
-        mov ecx,0       ;select Counter0        
-        
-        _emit 0x0F      ;RDPMC - get beginning value of Counter0 to edx:eax
-        _emit 0x31
-        
-        mov _high,edx       ;save beginning value
-        mov _low,eax
-	}
-	
-    timer_hl_t x;
-
-    x.h.low  = _low;
-    x.h.high = _high;
-    
-	return x.x;
-}
-
-uint32_t os_get_hr_tick_32(void) {
-	uint32_t _low,_high;
-	__asm {
-        mov ecx,0       ;select Counter0        
-        
-        _emit 0x0F      ;RDPMC - get beginning value of Counter0 to edx:eax
-        _emit 0x31
-        
-        mov _high,edx       ;save beginning value
-        mov _low,eax
-	}
-	return _low;
-}
-
-#else
 
 
 #include <time.h>
@@ -120,6 +60,6 @@ uint32_t os_get_time_freq(){
 
 
 
-#endif 
+
 
 
diff --git a/src/os_time.h b/src/os_time.h
index 42be576f..b1d44c03 100755
--- a/src/os_time.h
+++ b/src/os_time.h
@@ -24,19 +24,26 @@ limitations under the License.
 #include <stdint.h>
 #include <time.h>
 
-typedef uint64_t   hr_time_t; // time in high res tick 
-typedef uint32_t   hr_time_32_t; // time in high res tick 
-typedef double     dsec_t;    //time in sec double
 
 uint32_t 	 os_get_time_msec();
 uint32_t 	 os_get_time_freq();
 
-static inline double
-usec_to_sec(double usec) {
+static inline double usec_to_sec(double usec) {
     return (usec / (1000 * 1000));
 }
 
 
+typedef uint64_t   hr_time_t; // time in high res tick 
+typedef uint32_t   hr_time_32_t; // time in high res tick 
+typedef double     dsec_t;    //time in sec double
+
+struct COsTimeGlobalData {
+
+    hr_time_t  m_start_time;
+    double     m_1_div_freq;
+    double     m_freq;
+} __attribute__((__aligned__(128)));
+
 
 #ifdef LINUX
 
@@ -111,26 +118,30 @@ hr_time_t    os_get_hr_freq(void);
 #endif
 
 
+
+extern  COsTimeGlobalData  timer_gd;
+
+static inline void time_init(){
+	timer_gd.m_start_time = os_get_hr_tick_64();
+    timer_gd.m_freq       = (double)os_get_hr_freq();
+    timer_gd.m_1_div_freq = 1.0/(double)os_get_hr_freq();
+}
+
+
 /* convert delta time */
 static inline hr_time_t ptime_convert_dsec_hr(dsec_t dsec){
-    return((hr_time_t)(dsec*(double)os_get_hr_freq()) );
+    return((hr_time_t)(dsec* timer_gd.m_freq) );
 }
 
 /* convert delta time */
 static inline dsec_t  ptime_convert_hr_dsec(hr_time_t hrt){
-    return ((dsec_t)((double)hrt/(double)os_get_hr_freq() ));
+    return ((dsec_t)((double)hrt * timer_gd.m_1_div_freq ));
 }
 
 
-extern  hr_time_t start_time;
-
-static inline void time_init(){
-	start_time=os_get_hr_tick_64();
-}
-
 /* should be fixed , need to move to high rez tick */
 static inline dsec_t now_sec(void){
-    hr_time_t d=os_get_hr_tick_64() - start_time;
+    hr_time_t d=os_get_hr_tick_64() - timer_gd.m_start_time;
 	return ( ptime_convert_hr_dsec(d) );
 }