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

[palacios.git] / palacios / include / geekos / synch.h

diff --git a/palacios/include/geekos/synch.h b/palacios/include/geekos/synch.h
index f5d7ebb..c452e31 100644 (file)
--- a/palacios/include/geekos/synch.h
+++ b/palacios/include/geekos/synch.h
@@ -18,9 +18,9 @@
 enum { MUTEX_UNLOCKED, MUTEX_LOCKED };
 
 struct Mutex {
-    int state;
-    struct Kernel_Thread* owner;
-    struct Thread_Queue waitQueue;
+  int state;
+  struct Kernel_Thread* owner;
+  struct Thread_Queue waitQueue;
 };
 
 #define MUTEX_INITIALIZER { MUTEX_UNLOCKED, 0, THREAD_QUEUE_INITIALIZER }
@@ -36,6 +36,7 @@ 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