Changeset 558 for trunk/src

Timestamp:

Aug 18, 1999, 11:54:27 PM (26 years ago)

Author:

phaller

Message:

Fix: Interlocked Functions, Profile fix

Location:

trunk/src/kernel32

Files:

• KERNEL32.CPP (modified) (3 diffs)
• KERNEL32.DEF (modified) (2 diffs)
• profile.cpp (modified) (2 diffs)

trunk/src/kernel32/KERNEL32.CPP

@@ -1 @@
-/* $Id: KERNEL32.CPP,v 1.15 1999-08-18 17:17:59 sandervl Exp $ */
+/* $Id: KERNEL32.CPP,v 1.16 1999-08-18 21:54:26 phaller Exp $ */
 
 /*
@@ -62 +62 @@
   return HMCloseHandle(hHandle);
 }
+
+
 //******************************************************************************
 HANDLE WIN32API GetStdHandle(DWORD fdwDevice)
@@ -191 +193 @@
     return O32_InterlockedExchange(arg1, arg2);
 }
+
+
+/************************************************************************
+ *           InterlockedCompareExchange     [KERNEL32.879]
+ *
+ * Atomically compares Destination and Comperand, and if found equal exchanges
+ * the value of Destination with Exchange
+ *
+ * RETURNS
+ * Prior value of value pointed to by Destination
+ */
+PVOID WIN32API InterlockedCompareExchange(
+       PVOID *Destination, /* Address of 32-bit value to exchange */
+       PVOID Exchange,      /* change value, 32 bits */
+            PVOID Comperand      /* value to compare, 32 bits */
+) {
+   PVOID ret;
+   /* StopAllThreadsAndProcesses() */
+
+   ret=*Destination;
+        if(*Destination==Comperand) *Destination=Exchange;
+
+   /* ResumeAllThreadsAndProcesses() */
+   return ret;
+}
+
+/************************************************************************
+ *           InterlockedExchangeAdd            [KERNEL32.880]
+ *
+ * Atomically adds Increment to Addend and returns the previous value of
+ * Addend
+ *
+ * RETURNS
+ * Prior value of value pointed to by cwAddendTarget
+ */
+LONG WIN32API InterlockedExchangeAdd(
+       PLONG Addend, /* Address of 32-bit value to exchange */
+       LONG Increment /* Value to add */
+) {
+   LONG ret;
+   /* StopAllThreadsAndProcesses() */
+
+   ret = *Addend;
+   *Addend += Increment;
+
+   /* ResumeAllThreadsAndProcesses() */
+   return ret;
+}
+
+
 //******************************************************************************
 //******************************************************************************

trunk/src/kernel32/KERNEL32.DEF

@@ -1 @@
-; $Id: KERNEL32.DEF,v 1.22 1999-08-18 17:18:00 sandervl Exp $
+; $Id: KERNEL32.DEF,v 1.23 1999-08-18 21:54:27 phaller Exp $
 
 ;Created by BLAST for IBM's compiler
@@ -557 +557 @@
     InitializeCriticalSection  = _InitializeCriticalSection@4 @472
 ;   InitializeCriticialSectionAndSpinCount = _InitializeCriticalSectionAndSpinCount@?? ;NT
-;   InterlockedCompareExchange = _InterlockedCompareExchange@??         ;NT
+    InterlockedCompareExchange = _InterlockedCompareExchange@12 @785        ;NT
     InterlockedDecrement       = _InterlockedDecrement@4     @473
     InterlockedExchange        = _InterlockedExchange@8      @474
-;   InterlockedExchangeAdd     = _InterlockedExchangeAdd@??             ;NT
+    InterlockedExchangeAdd     = _InterlockedExchangeAdd@8      @786        ;NT
     InterlockedIncrement       = _InterlockedIncrement@4     @475
 ;   InvalidateNLSCache         = _InvalidateNLSCache@??      @476       ;W95

trunk/src/kernel32/profile.cpp

@@ -1 @@
-/* $Id: profile.cpp,v 1.15 1999-08-18 17:26:44 sandervl Exp $ */
+/* $Id: profile.cpp,v 1.16 1999-08-18 21:54:27 phaller Exp $ */
 
 /*
@@ -1399 +1399 @@
 
     EnterCriticalSection(&PROFILE_CritSect);
-    if (MRUProfile && CurProfile->filename)
-    {
+
+    if (CurProfile && CurProfile->filename)
       PROFILE_FlushFile(); //flash current
+
+    if (MRUProfile)
+    {
       lastCurProfile = CurProfile;
       for(x = 1;x < N_CACHED_PROFILES;x++)