Changeset 4178 in vbox for trunk/src/VBox/Runtime/r0drv/solaris

Timestamp:

Aug 16, 2007 3:07:51 PM (17 years ago)

Author:

vboxsync

Message:

Solaris changes.

Location:

trunk/src/VBox/Runtime/r0drv/solaris

Files:

• alloc-r0drv-solaris.c (modified) (2 diffs)
• semevent-r0drv-solaris.c (modified) (4 diffs)
• semfastmutex-r0drv-solaris.c (modified) (1 diff)
• spinlock-r0drv-solaris.c (modified) (2 diffs)
• the-solaris-kernel.h (modified) (1 diff)
• thread-r0drv-solaris.c (modified) (2 diffs)
• thread2-r0drv-solaris.c (modified) (3 diffs)

trunk/src/VBox/Runtime/r0drv/solaris/alloc-r0drv-solaris.c

@@ -37 +37 @@
     PRTMEMHDR pHdr;
     if (fFlags & RTMEMHDR_FLAG_ZEROED)
-        pHdr = (PRTMEMHDR)kmem_zalloc(cb + sizeof(*pHdr), KM_NOSLEEP);
+        pHdr = (PRTMEMHDR)kmem_zalloc(cb + sizeof(*pHdr), KM_SLEEP);
     else
-        pHdr = (PRTMEMHDR)kmem_alloc(cb + sizeof(*pHdr), KM_NOSLEEP);
+        pHdr = (PRTMEMHDR)kmem_alloc(cb + sizeof(*pHdr), KM_SLEEP);
     if (pHdr)
     {
@@ -74 +74 @@
 RTR0DECL(void *) RTMemContAlloc(PRTCCPHYS pPhys, size_t cb)
 {
-    /* Solaris currently supports allocating contiguous memory
-     * only for DMA drivers which requires passing the driver's
-     * device ID, and upper/lower DMA memory limits
-     * Currently thus disabled since RTMemContAlloc isn't really used
-     * anywhere significant yet (only in GuestAdditions which is not
-     * there for Solaris)
-     * ddi_umem_alloc doesn't allocate contiguous memory!
-     */
-    /**@todo Implement RTMemContAlloc on Solaris - there is no way around this. */
+    /** @todo: implement RTMemContAlloc in Solaris */
+    /* ddi_umem_alloc without PAGEABLE flag might produce contiguous physical memory, but
+        the documentation doesn't talk about contiguous at all :( 
+       If we can use ddi_umem_alloc we need to keep track of the ddi_umem_cookie
+       which kernel allocates, but the ContFree() function only passes us back
+       the address. Maybe we could for each ContAlloc build a linked list of
+       structures that have the cookie and corresponding virtual address. */
     return NULL;
 }

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

@@ -50 +50 @@
     uint32_t volatile   cWaking;
     /** The Solaris mutex protecting this structure and pairing up the with the cv. */
-    struct mutex        Mtx;
+    kmutex_t            Mtx;
     /** The Solaris condition variable. */
     kcondvar_t          Cnd;
@@ -104 +104 @@
     {
         mutex_exit(&pEventInt->Mtx);
+        cv_destroy(&pEventInt->Cnd);
         mutex_destroy(&pEventInt->Mtx);
-        cv_destroy(&pEventInt->Cnd);
         RTMemFree(pEventInt);
     }
@@ -166 +166 @@
         else
             cTicks = 0;
-        cTicks += timeout;
+        timeout += cTicks;
         
         ASMAtomicIncU32(&pEventInt->cWaiters);
@@ -178 +178 @@
             {
                 rc = VERR_SEM_DESTROYED;
-                /** @todo r=bird: better make sure you're the last guy out before doing the cleanup.... */
-                mutex_exit(&pEventInt->Mtx);
-                cv_destroy(&pEventInt->Cnd);
-                mutex_destroy(&pEventInt->Mtx);
-                RTMemFree(pEventInt);
-                return rc;
+                if (!ASMAtomicDecU32(&pEventInt->cWaking))
+                {
+                    mutex_exit(&pEventInt->Mtx);
+                    cv_destroy(&pEventInt->Cnd);
+                    mutex_destroy(&pEventInt->Mtx);
+                    RTMemFree(pEventInt);
+                    return rc;
+                }
             }
 

trunk/src/VBox/Runtime/r0drv/solaris/semfastmutex-r0drv-solaris.c

@@ -42 +42 @@
     uint32_t            u32Magic;
     /** The Solaris mutex. */
-    struct mutex        Mtx;
+    kmutex_t            Mtx;
 } RTSEMFASTMUTEXINTERNAL, *PRTSEMFASTMUTEXINTERNAL;
 

trunk/src/VBox/Runtime/r0drv/solaris/spinlock-r0drv-solaris.c

@@ -41 +41 @@
     uint32_t volatile   u32Magic;
     /** A Solaris spinlock. */
-    struct mutex        Mtx;
+    kmutex_t            Mtx;
 } RTSPINLOCKINTERNAL, *PRTSPINLOCKINTERNAL;
 
@@ -59 +59 @@
      */
     pSpinlockInt->u32Magic = RTSPINLOCK_MAGIC;
-    mutex_init(&pSpinlockInt->Mtx, "iprt-spinlock", MUTEX_SPIN, NULL);
+    mutex_init(&pSpinlockInt->Mtx, "IPRT Spinlock", MUTEX_SPIN, NULL);
     *pSpinlock = pSpinlockInt;
     return VINF_SUCCESS;

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

@@ -29 +29 @@
 #include <sys/sdt.h>
 #include <sys/schedctl.h>
+#include <sys/time.h>
 
-/* commented for now
+/* commented for now 
 #include <iprt/cdefs.h>
-
 __BEGIN_DECLS
-extern int nanosleep(const struct timespec *, struct timespec *);
 
 __END_DECLS

trunk/src/VBox/Runtime/r0drv/solaris/thread-r0drv-solaris.c

@@ -35 +35 @@
 {
     int cTicks;
-
+    unsigned long timeout;
+    
     if (!cMillies)
     {
@@ -46 +47 @@
     else
         cTicks = 0;
-    
-    /* hm, maybe we could also use nanosleep() */
+#if 0
+    timeout = ddi_get_lbolt();
+    timeout += cTicks; 
+ 
+    kcondvar_t cnd;
+    kmutex_t mtx;
+    mutex_init(&mtx, "IPRT Sleep Mutex", MUTEX_DRIVER, NULL);
+    cv_init(&cnd, "IPRT Sleep CV", CV_DRIVER, NULL);
+    mutex_enter(&mtx);
+    cv_timedwait (&cnd, &mtx, 9000 * timeout);
+    mutex_exit(&mtx);
+    cv_destroy(&cnd);
+    mutex_destroy(&mtx);
+#endif
+
+#if 1
     delay(cTicks);
-    
-/*   Hmm, no same effect as using delay()
+#endif
+
+#if 0
+    /*   Hmm, no same effect as using delay() */
     struct timespec t;
     t.tv_sec = 0;
     t.tv_nsec = cMillies * 1000000L;
     nanosleep (&t, NULL);
-*/    
+#endif
+
     return VINF_SUCCESS;
 }

trunk/src/VBox/Runtime/r0drv/solaris/thread2-r0drv-solaris.c

@@ -39 +39 @@
 
 
-/** @todo Solaris native threading, when more info. on priority etc. (namely default prio value) is available */
 int rtThreadNativeSetPriority(PRTTHREADINT pThread, RTTHREADTYPE enmType)
 {
@@ -56 +55 @@
     }
 
-    THREAD_CHANGE_PRI(curthread, iPriority);
+    pri_t threadPrio = iPriority;
+    curthread->t_pri = threadPrio;
     return VINF_SUCCESS;
 }
@@ -88 +88 @@
 {
     int rc;
-    /** @todo passing hardcoded priority: 52. Find what default priority to pass */
+    /** @todo Passing hardcoded priority of 52, Find correct default priority */
     /* We know its from 0 to 127 priority, but what's the default?? */
     kthread_t* pKernThread = thread_create(NULL, NULL, rtThreadNativeMain, pThreadInt, 0,
                                            curproc, LMS_USER, 52);
-    if (rc == 0)
+    if (pKernThread)
     {
         *pNativeThread = (RTNATIVETHREAD)pKernThread;