Changeset 9910 for trunk/src/kernel32/critsection.cpp

Timestamp:

Mar 6, 2003, 11:22:27 AM (22 years ago)

Author:

sandervl

Message:

KSO: logging changes; fast PID & TID retrieval; added functions to set/clear the odin environment (fs, exception handler)

File:

• trunk/src/kernel32/critsection.cpp (modified) (11 diffs)

trunk/src/kernel32/critsection.cpp

@@ -1 @@
-/* $Id: critsection.cpp,v 1.8 2002-02-09 17:27:30 sandervl Exp $ */
+/* $Id: critsection.cpp,v 1.9 2003-03-06 10:22:26 sandervl Exp $ */
 /*
  * Win32 critical sections
@@ -14 +14 @@
 #include <assert.h>
 #include <stdio.h>
-#include "debugtools.h"
-#include <misc.h>
+#include <dbglog.h>
+#include <debugtools.h>
 #include <odinwrap.h>
+#include <wprocess.h>
 
 #define DBG_LOCALLOG    DBG_critsection
@@ -22 +23 @@
 
 DECLARE_DEBUG_CHANNEL(relay)
+
 
 
@@ -34 +36 @@
     crit->OwningThread   = 0;
     crit->LockSemaphore  = CreateSemaphoreA( NULL, 0, 1, NULL );
-    crit->Reserved       = GetCurrentProcessId();
+    crit->Reserved       = ODIN_GetCurrentProcessId();
 }
 
@@ -75 +77 @@
     if (InterlockedIncrement( &crit->LockCount ))
     {
-        if (crit->OwningThread == GetCurrentThreadId())
+        if (crit->OwningThread == ODIN_GetCurrentThreadId())
         {
             crit->RecursionCount++;
@@ -112 +114 @@
         }
     }
-    crit->OwningThread   = GetCurrentThreadId();
+    crit->OwningThread   = ODIN_GetCurrentThreadId();
     crit->RecursionCount = 1;
 }
@@ -125 +127 @@
     if (InterlockedIncrement( &crit->LockCount ))
     {
-        if (crit->OwningThread == GetCurrentThreadId())
+        if (crit->OwningThread == ODIN_GetCurrentThreadId())
         {
             crit->RecursionCount++;
@@ -134 +136 @@
         return FALSE;
     }
-    crit->OwningThread   = GetCurrentThreadId();
+    crit->OwningThread   = ODIN_GetCurrentThreadId();
     crit->RecursionCount = 1;
     return TRUE;
@@ -146 +148 @@
 {
     dprintf2(("LeaveCriticalSection %x", crit));
-    if (crit->OwningThread != GetCurrentThreadId()) return;
+    if (crit->OwningThread != ODIN_GetCurrentThreadId()) return;
        
     if (--crit->RecursionCount)
@@ -183 +185 @@
         InitializeCriticalSection( crit );
 
-    else if ( crit->Reserved && crit->Reserved != GetCurrentProcessId() )
+    else if ( crit->Reserved && crit->Reserved != ODIN_GetCurrentProcessId() )
     {
         dprintf(("(%p) called for %08lx first, %08lx now: making global\n", 
-               crit, crit->Reserved, GetCurrentProcessId() ));
+               crit, crit->Reserved, ODIN_GetCurrentProcessId() ));
 
         MakeCriticalSectionGlobal( crit );
@@ -205 +207 @@
         else
             dprintf(("(%p) for %08lx: Crst is global, don't know whether to delete\n", 
-                     crit, GetCurrentProcessId() ));
-    }
-}
-
+                     crit, ODIN_GetCurrentProcessId() ));
+    }
+}
+