Compilable version with both lwip and uip

[palacios.git] / palacios / src / geekos / timer.c

diff --git a/palacios/src/geekos/timer.c b/palacios/src/geekos/timer.c
index 9a54ff2..ec47b0b 100644 (file)
--- a/palacios/src/geekos/timer.c
+++ b/palacios/src/geekos/timer.c
@@ -131,11 +131,6 @@ timerEvent pendingTimerEvents[MAX_TIMER_EVENTS];
  */
 volatile ulong_t g_numTicks;
 
-ulong_t clock_time(void){
-       return g_numTicks;
-}
-
-
 /*
  * Number of times the spin loop can execute during one timer tick
  */
@@ -171,6 +166,10 @@ int g_Quantum = DEFAULT_MAX_TICKS;
 #  define Debug(args...)
 #endif
 
+ulong_t clock_time(void){//in millisec
+      return g_numTicks * (1000/HZ);
+}
+
 /* ----------------------------------------------------------------------
  * Private functions
  * ---------------------------------------------------------------------- */