Changeset 22819 in vbox for trunk/src/VBox/Runtime

Timestamp:

Sep 7, 2009 7:10:55 PM (15 years ago)

Author:

vboxsync

Message:

FreeBSD: Fix R0 semevent implementation for FreeBSD 7.x

Location:

trunk/src/VBox/Runtime/r0drv/freebsd

Files:

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

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

@@ -207 +207 @@
 
                 if (fInterruptible)
-                    rc = sleepq_timedwait_sig(pEventInt, 0);
+                    rc = SLEEPQ_TIMEDWAIT_SIG(pEventInt);
                 else
-                    rc = sleepq_timedwait(pEventInt, 0);
+                    rc = SLEEPQ_TIMEDWAIT(pEventInt);
             }
             else
@@ -216 +216 @@
 
                 if (fInterruptible)
-                    rc = sleepq_wait_sig(pEventInt, 0);
+                    rc = SLEEPQ_WAIT_SIG(pEventInt);
                 else
                 {
                     rc = 0;
-                    sleepq_wait(pEventInt, 0);
+                    SLEEPQ_WAIT(pEventInt);
                 }
             }

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

@@ -43 +43 @@
 #include "internal/magics.h"
 
-
 /*******************************************************************************
 *   Structures and Typedefs                                                    *
@@ -217 +216 @@
 
                 if (fInterruptible)
-                    rc = sleepq_timedwait_sig(pEventMultiInt, 0);
+                    rc = SLEEPQ_TIMEDWAIT_SIG(pEventMultiInt);
                 else
-                    rc = sleepq_timedwait(pEventMultiInt, 0);
+                    rc = SLEEPQ_TIMEDWAIT(pEventMultiInt);
             }
             else
@@ -226 +225 @@
 
                 if (fInterruptible)
-                    rc = sleepq_wait_sig(pEventMultiInt, 0);
+                    rc = SLEEPQ_WAIT_SIG(pEventMultiInt);
                 else
                 {
                     rc = 0;
-                    sleepq_wait(pEventMultiInt, 0);
+                    SLEEPQ_WAIT(pEventMultiInt);
                 }
             }

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

@@ -72 +72 @@
 #endif*/
 
+#ifdef __FreeBSD_version >= 800026
+# define SLEEPQ_TIMEDWAIT(EventInt) sleepq_timedwait(EventInt, 0)
+# define SLEEPQ_TIMEDWAIT_SIG(EventInt) sleepq_timedwait_sig(EventInt, 0)
+# define SLEEPQ_WAIT(EventInt) sleepq_wait(EventInt, 0)
+# define SLEEPQ_WAIT_SIG(EventInt) sleepq_wait_sig(EventInt, 0)
+#elif
+# define SLEEPQ_TIMEDWAIT(EventInt) sleepq_timedwait(EventInt)
+# define SLEEPQ_TIMEDWAIT_SIG(EventInt) sleepq_timedwait_sig(EventInt)
+# define SLEEPQ_WAIT(EventInt) sleepq_wait(EventInt)
+# define SLEEPQ_WAIT_SIG(EventInt) sleepq_wait_sig(EventInt)
 #endif
+
+#endif