Merge branch 'lwip_dev' of ssh://palacios@newskysaw.cs.northwestern.edu/home/palacios...

diff --git a/palacios/include/geekos/synch.h b/palacios/include/geekos/synch.h
index b1ad875..c452e31 100644 (file)
--- a/palacios/include/geekos/synch.h
+++ b/palacios/include/geekos/synch.h
@@ -32,12 +32,14 @@ struct Condition {
 void Mutex_Init(struct Mutex* mutex);
 void Mutex_Lock(struct Mutex* mutex);
 void Mutex_Unlock(struct Mutex* mutex);
+void Mutex_Destroy(struct Mutex *mutex);   //added by Lei, do some cleaning work?
 
 void Cond_Init(struct Condition* cond);
 void Cond_Wait(struct Condition* cond, struct Mutex* mutex);
 int Cond_Wait_Timeout(struct Condition * cond, struct Mutex * mutex, uint_t ms);
 void Cond_Signal(struct Condition* cond);
 void Cond_Broadcast(struct Condition* cond);
+void Cond_Destroy(struct Condition *cond); //added by Lei
 
 #define IS_HELD(mutex) \
     ((mutex)->state == MUTEX_LOCKED && (mutex)->owner == g_currentThread)

diff --git a/palacios/include/geekos/timer.h b/palacios/include/geekos/timer.h
index 9b08713..b9f4eb4 100644 (file)
--- a/palacios/include/geekos/timer.h
+++ b/palacios/include/geekos/timer.h
@@ -41,7 +41,6 @@ int Get_Remaining_Timer_MSecs(int id);
 int Get_Remaining_Timer_Ticks(int id);
 int Cancel_Timer(int id);
 
-
 void Micro_Delay(int us);
 
 #endif  /* GEEKOS_TIMER_H */

diff --git a/palacios/src/common/string.c b/palacios/src/common/string.c
index 7415067..5c82ec4 100644 (file)
--- a/palacios/src/common/string.c
+++ b/palacios/src/common/string.c
@@ -294,9 +294,17 @@ int fprintf(FILE *file, char *fmt, ...)
 
 }
 
-/* int fflush(FILE *stream)
+int printf(char *fmt, ...)
 {
-    PrintDebug("In fflush!!\n");
+   // PrintDebug("In fprintf!!\n");
+
+   return 0;
+
+}
+
+int fflush(FILE *stream)
+{
+    //PrintDebug("In fflush!!\n");
 
     return 0;
 }*/

diff --git a/palacios/src/geekos/timer.c b/palacios/src/geekos/timer.c
index 663a694..9a54ff2 100644 (file)
--- a/palacios/src/geekos/timer.c
+++ b/palacios/src/geekos/timer.c
@@ -439,3 +439,6 @@ void Micro_Delay(int us)
 
     Spin(numSpins);
 }
+
+
+