From mboxrd@z Thu Jan  1 00:00:00 1970
From: Samuel Thibault <samuel.thibault@eu.citrix.com>
Subject: [PATCH] [Mini-OS] add wait_event_deadline
Date: Thu, 17 Jan 2008 13:50:11 +0000
Message-ID: <20080117135011.GF11129@implementation.uk.xensource.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Return-path: <xen-devel-bounces@lists.xensource.com>
Content-Disposition: inline
List-Unsubscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xensource.com>
List-Help: <mailto:xen-devel-request@lists.xensource.com?subject=help>
List-Subscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=subscribe>
Sender: xen-devel-bounces@lists.xensource.com
Errors-To: xen-devel-bounces@lists.xensource.com
To: xen-devel@lists.xensource.com
List-Id: xen-devel@lists.xenproject.org

add wait_event_deadline

Signed-off-by: Samuel Thibault <samuel.thibault@eu.citrix.com>
Signed-off-by: Tim Deegan <tim.deegan@eu.citrix.com>

diff -r a66bdc82d8fa extras/mini-os/include/wait.h
--- a/extras/mini-os/include/wait.h	Wed Jan 16 11:44:41 2008 +0000
+++ b/extras/mini-os/include/wait.h	Thu Jan 17 12:29:01 2008 +0000
@@ -85,29 +85,31 @@ static inline void wake_up(struct wait_q
     local_irq_restore(flags);   \
 } while (0)
 
-#define wait_event(wq, condition) do{             \
-    unsigned long flags;                          \
-    if(condition)                                 \
-        break;                                    \
-    DEFINE_WAIT(__wait);                          \
-    for(;;)                                       \
-    {                                             \
-        /* protect the list */                    \
-        local_irq_save(flags);                    \
-        add_wait_queue(&wq, &__wait);             \
-        block(current);                           \
-        local_irq_restore(flags);                 \
-        if(condition)                             \
-            break;                                \
-        schedule();                               \
-    }                                             \
-    local_irq_save(flags);                        \
-    /* need to wake up */                         \
-    wake(current);                                \
-    remove_wait_queue(&__wait);                   \
-    local_irq_restore(flags);                     \
+#define wait_event_deadline(wq, condition, deadline) do {       \
+    unsigned long flags;                                        \
+    if(condition)                                               \
+        break;                                                  \
+    DEFINE_WAIT(__wait);                                        \
+    for(;;)                                                     \
+    {                                                           \
+        /* protect the list */                                  \
+        local_irq_save(flags);                                  \
+        add_wait_queue(&wq, &__wait);                           \
+        current->wakeup_time = deadline;                        \
+        clear_runnable(current);                                \
+        local_irq_restore(flags);                               \
+        if((condition) || (deadline && NOW() >= deadline))      \
+            break;                                              \
+        schedule();                                             \
+    }                                                           \
+    local_irq_save(flags);                                      \
+    /* need to wake up */                                       \
+    wake(current);                                              \
+    remove_wait_queue(&__wait);                                 \
+    local_irq_restore(flags);                                   \
 } while(0) 
 
+#define wait_event(wq, condition) wait_event_deadline(wq, condition, 0)