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

Timestamp:

Jan 27, 2007 8:05:44 PM (18 years ago)

Author:

vboxsync

Message:

RTProcSelf, RTR0ProcHandleSelf, RTR0PROCESS.

Location:

trunk/src/VBox/Runtime/r0drv

Files:

• darwin/memobj-r0drv-darwin.cpp (modified) (8 diffs)
• linux/process-r0drv-linux.cpp (copied) (copied from trunk/src/VBox/Runtime/r0drv/darwin/process-r0drv-darwin.cpp ) (4 diffs)
• nt/process-r0drv-nt.cpp (copied) (copied from trunk/src/VBox/Runtime/r0drv/darwin/process-r0drv-darwin.cpp ) (4 diffs)

trunk/src/VBox/Runtime/r0drv/darwin/memobj-r0drv-darwin.cpp

@@ -32 +32 @@
 #include <iprt/param.h>
 #include <iprt/string.h>
+#include <iprt/process.h>
 #include "internal/memobj.h"
 
@@ -94 +95 @@
         {
 #ifdef USE_VM_MAP_WIRE
-            vm_map_t Map = pMemDarwin->Core.u.Lock.Process != NIL_RTPROCESS
-                         ? get_task_map((task_t)pMemDarwin->Core.u.Lock.Process)
+            vm_map_t Map = pMemDarwin->Core.u.Lock.R0Process != NIL_RTR0PROCESS
+                         ? get_task_map((task_t)pMemDarwin->Core.u.Lock.R0Process)
                          : kernel_map;
             kern_return_t kr = vm_map_unwire(Map,
@@ -377 +378 @@
         if (pMemDarwin)
         {
-            pMemDarwin->Core.u.Lock.Process = (RTPROCESS)Task;
+            pMemDarwin->Core.u.Lock.R0Process = (RTR0PROCESS)Task;
             *ppMem = &pMemDarwin->Core;
             return VINF_SUCCESS;
@@ -404 +405 @@
             if (pMemDarwin)
             {
-                pMemDarwin->Core.u.Lock.Process = (RTPROCESS)Task;
+                pMemDarwin->Core.u.Lock.R0Process = (RTR0PROCESS)Task;
                 pMemDarwin->pMemDesc = pMemDesc;
                 *ppMem = &pMemDarwin->Core;
@@ -470 +471 @@
                 if (pMemDarwin)
                 {
-                    pMemDarwin->Core.u.Mapping.Process = NIL_RTPROCESS;
+                    pMemDarwin->Core.u.Mapping.R0Process = NIL_RTR0PROCESS;
                     pMemDarwin->pMemMap = pMemMap;
                     *ppMem = &pMemDarwin->Core;
@@ -514 +515 @@
                 if (pMemDarwin)
                 {
-                    pMemDarwin->Core.u.Mapping.Process = /*RTProcSelf()*/(RTPROCESS)current_task();
+                    pMemDarwin->Core.u.Mapping.R0Process = RTR0ProcHandleSelf();
                     pMemDarwin->pMemMap = pMemMap;
                     *ppMem = &pMemDarwin->Core;
@@ -546 +547 @@
     {
         ppnum_t PgNo;
-        if (pMemDarwin->Core.u.Lock.Process == NIL_RTPROCESS)
+        if (pMemDarwin->Core.u.Lock.R0Process == NIL_RTR0PROCESS)
             PgNo = pmap_find_phys(kernel_pmap, (uintptr_t)pMemDarwin->Core.pv + iPage * PAGE_SIZE);
         else
@@ -575 +576 @@
                 AssertReturn(s_offPmap >= 0, NIL_RTHCPHYS);
             }
-            pmap_t Pmap = *(pmap_t *)((uintptr_t)get_task_map((task_t)pMemDarwin->Core.u.Lock.Process) + s_offPmap);
+            pmap_t Pmap = *(pmap_t *)((uintptr_t)get_task_map((task_t)pMemDarwin->Core.u.Lock.R0Process) + s_offPmap);
             PgNo = pmap_find_phys(Pmap, (uintptr_t)pMemDarwin->Core.pv + iPage * PAGE_SIZE);
         }

trunk/src/VBox/Runtime/r0drv/linux/process-r0drv-linux.cpp

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * InnoTek Portable Runtime - Process, Ring-0 Driver, Darwin.
+ * InnoTek Portable Runtime - Process, Ring-0 Driver, Linux.
  */
 
@@ -23 +23 @@
 *   Header Files                                                               *
 *******************************************************************************/
-#include "the-darwin-kernel.h"
+#include "the-linux-kernel.h"
 #include <iprt/process.h>
 
@@ -29 +29 @@
 RTDECL(RTPROCESS) RTProcSelf(void)
 {
-    return proc_selfpid();
+    return (RTPROCESS)current->tgid;
 }
 
@@ -35 +35 @@
 RTR0DECL(RTR0PROCESS) RTR0ProcHandleSelf(void)
 {
-    return (RTR0PROCESS)current_task();
+    return (RTR0PROCESS)current->tgid;
 }
 

trunk/src/VBox/Runtime/r0drv/nt/process-r0drv-nt.cpp

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * InnoTek Portable Runtime - Process, Ring-0 Driver, Darwin.
+ * InnoTek Portable Runtime - Process, Ring-0 Driver, NT.
  */
 
@@ -23 +23 @@
 *   Header Files                                                               *
 *******************************************************************************/
-#include "the-darwin-kernel.h"
+#include "the-nt-kernel.h"
 #include <iprt/process.h>
 
@@ -29 +29 @@
 RTDECL(RTPROCESS) RTProcSelf(void)
 {
-    return proc_selfpid();
+    return (RTPROCESS)PsGetCurrentProcessId();
 }
 
@@ -35 +35 @@
 RTR0DECL(RTR0PROCESS) RTR0ProcHandleSelf(void)
 {
-    return (RTR0PROCESS)current_task();
+    return (RTR0PROCESS)PsGetCurrentProcess();
 }