stable compliation version with some running problems in kernel thread

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

diff --git a/palacios/src/geekos/timer.c b/palacios/src/geekos/timer.c
index fb5c9d2..0e3804f 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
  * ---------------------------------------------------------------------- */
@@ -192,7 +191,7 @@ static void Timer_Interrupt_Handler(struct Interrupt_State* state)
     if (pendingTimerEvents[i].ticks == 0) {
       if (timerDebug) Print("timer: event %d expired (%d ticks)\n", 
                            pendingTimerEvents[i].id, pendingTimerEvents[i].origTicks);
-      (pendingTimerEvents[i].callBack)(pendingTimerEvents[i].id);
+      (pendingTimerEvents[i].callBack)(pendingTimerEvents[i].id, pendingTimerEvents[i].cb_arg);
       pendingTimerEvents[i].ticks = pendingTimerEvents[i].origTicks;
     } else {
       pendingTimerEvents[i].ticks--;
@@ -338,31 +337,34 @@ void Init_Timer(void)
 }
 
 
-int Start_Timer_Secs(int seconds, timerCallback cb) {
-  return Start_Timer(seconds * HZ, cb);
+int Start_Timer_Secs(int seconds, timerCallback cb, void * arg) {
+  return Start_Timer(seconds * HZ, cb, arg);
 }
 
 
-int Start_Timer_MSecs(int msecs, timerCallback cb) {
+int Start_Timer_MSecs(int msecs, timerCallback cb, void * arg) {
   msecs += 10 - (msecs % 10);
 
-  return Start_Timer(msecs * (HZ / 1000), cb);
+  return Start_Timer(msecs * (HZ / 1000), cb, arg);
 }
 
 
 
-int Start_Timer(int ticks, timerCallback cb)
+int Start_Timer(int ticks, timerCallback cb, void * arg)
 {
     int ret;
 
     KASSERT(!Interrupts_Enabled());
 
+    PrintBoth ("there\n");
+
     if (timeEventCount == MAX_TIMER_EVENTS) {
        return -1;
     } else {
        ret = nextEventID++;
        pendingTimerEvents[timeEventCount].id = ret;
        pendingTimerEvents[timeEventCount].callBack = cb;
+       pendingTimerEvents[timeEventCount].cb_arg = arg;
        pendingTimerEvents[timeEventCount].ticks = ticks;
        pendingTimerEvents[timeEventCount].origTicks = ticks;
        timeEventCount++;