Changeset 24956 in vbox for trunk/src/VBox/Runtime/r0drv

Timestamp:

Nov 25, 2009 2:26:50 PM (15 years ago)

Author:

vboxsync

Message:

Runtime/r0drv/linux: final fix for the prepare_to_wait() / finish_wait() problem on Linux 2.4 kernels

Location:

trunk/src/VBox/Runtime/r0drv/linux

Files:

• semevent-r0drv-linux.c (modified) (1 diff)
• semeventmulti-r0drv-linux.c (modified) (1 diff)
• semmutex-r0drv-linux.c (modified) (1 diff)
• the-linux-kernel.h (modified) (2 diffs)

trunk/src/VBox/Runtime/r0drv/linux/semevent-r0drv-linux.c

@@ -169 +169 @@
         lTimeout = schedule_timeout(lTimeout);
 
+        after_wait(&Wait);
+
         /* Check if someone destroyed the semaphore while we were waiting. */
         if (pEventInt->u32Magic != RTSEMEVENT_MAGIC)

trunk/src/VBox/Runtime/r0drv/linux/semeventmulti-r0drv-linux.c

@@ -181 +181 @@
         lTimeout = schedule_timeout(lTimeout);
 
+        after_wait(&Wait);
+
         /* Check if someone destroyed the semaphore while we were waiting. */
         if (pThis->u32Magic != RTSEMEVENTMULTI_MAGIC)

trunk/src/VBox/Runtime/r0drv/linux/semmutex-r0drv-linux.c

@@ -170 +170 @@
             lTimeout = schedule_timeout(lTimeout);
 
+            after_wait(&Wait);
+
             /* Check if someone destroyed the semaphore while we was waiting. */
             if (pMutexInt->u32Magic != RTSEMMUTEX_MAGIC)

trunk/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h

@@ -125 +125 @@
 
 /*
- * 2.4 compatibility wrappers
+ * 2.4 / early 2.6 compatibility wrappers
  */
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 7)
@@ -163 +163 @@
 # endif  /* < 2.4.29 || >= 2.6.0 */
 
+#endif /* < 2.6.7 */
+
+/*
+ * 2.4 compatibility wrappers
+ */
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0)
+
 # define prepare_to_wait(q, wait, state) \
     do { \
+        add_wait_queue(q, wait); \
         set_current_state(state); \
-        add_wait_queue(q, wait); \
+    } while (0)
+
+# define after_wait(wait) \
+    do { \
+        list_del_init(&(wait)->task_list); \
     } while (0)
 
 # define finish_wait(q, wait) \
     do { \
-        unsigned long flags; \
         set_current_state(TASK_RUNNING); \
-        spin_lock_irqsave(&(q)->lock, flags); \
-        list_del_init(&(wait)->task_list); \
-        spin_unlock_irqrestore(&(q)->lock, flags); \
-    } while (0)
-
-#endif /* < 2.6.7 */
+        remove_wait_queue(q, wait); \
+    } while (0)
+
+#else /* >= 2.6.0 */
+
+# define after_wait(wait)       do {} while (0)
+
+#endif /* >= 2.6.0 */
 
 /** @def TICK_NSEC