From: Lei Xia Date: Mon, 29 Sep 2008 16:18:21 +0000 (-0500) Subject: Merge branch 'lwip_dev' of ssh://palacios@newskysaw.cs.northwestern.edu/home/palacios... X-Git-Tag: 1.0~3^2~11^2~4 X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=commitdiff_plain;h=c5f9b01f00dff761629e4be02cfc4f733ce26d09;p=palacios-OLD.git Merge branch 'lwip_dev' of ssh://palacios@newskysaw.cs.northwestern.edu/home/palacios/palacios into lwip_dev --- c5f9b01f00dff761629e4be02cfc4f733ce26d09 diff --cc palacios/include/geekos/synch.h index f5d7ebb,b1ad875..c452e31 --- a/palacios/include/geekos/synch.h +++ b/palacios/include/geekos/synch.h @@@ -36,9 -35,9 +36,10 @@@ void Mutex_Destroy(struct Mutex *mutex) 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)