Merge pull request #564 from janvorli/gc-os-interface

GC to OS interface refactoring

Author: janvorli

src/Native/Runtime/Crst.cpp

@@ -10,20 +10,13 @@
 #include "holder.h"
 #include "Crst.h"
 
-#ifndef DACCESS_COMPILE
-bool EEThreadId::IsSameThread()
-{
-    return PalGetCurrentThreadId() == m_uiId;
-}
-#endif // DACCESS_COMPILE
-
 void CrstStatic::Init(CrstType eType, CrstFlags eFlags)
 {
     UNREFERENCED_PARAMETER(eType);
     UNREFERENCED_PARAMETER(eFlags);
 #ifndef DACCESS_COMPILE
 #if defined(_DEBUG)
-    m_uiOwnerId = UNOWNED;
+    m_uiOwnerId.Clear();
 #endif // _DEBUG
     PalInitializeCriticalSectionEx(&m_sCritSec, 0, 0);
 #endif // !DACCESS_COMPILE
@@ -42,7 +35,7 @@ void CrstStatic::Enter(CrstStatic *pCrst)
 #ifndef DACCESS_COMPILE
     PalEnterCriticalSection(&pCrst->m_sCritSec);
 #if defined(_DEBUG)
-    pCrst->m_uiOwnerId = PalGetCurrentThreadId();
+    pCrst->m_uiOwnerId.SetToCurrentThread();
 #endif // _DEBUG
 #else
     UNREFERENCED_PARAMETER(pCrst);
@@ -54,7 +47,7 @@ void CrstStatic::Leave(CrstStatic *pCrst)
 {
 #ifndef DACCESS_COMPILE
 #if defined(_DEBUG)
-    pCrst->m_uiOwnerId = UNOWNED;
+    pCrst->m_uiOwnerId.Clear();
 #endif // _DEBUG
     PalLeaveCriticalSection(&pCrst->m_sCritSec);
 #else
@@ -66,14 +59,14 @@ void CrstStatic::Leave(CrstStatic *pCrst)
 bool CrstStatic::OwnedByCurrentThread()
 {
 #ifndef DACCESS_COMPILE
-    return m_uiOwnerId == PalGetCurrentThreadId();
+    return m_uiOwnerId.IsCurrentThread();
 #else
     return false;
 #endif
 }
 
 EEThreadId CrstStatic::GetHolderThreadId()
 {
-    return EEThreadId(m_uiOwnerId);
+    return m_uiOwnerId;
 }
 #endif // _DEBUG

src/Native/Runtime/Crst.h

@@ -3,21 +3,6 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 
-// Abstracted thread ID.  This doesn't really belong in this file, but there is not currently any better place
-// for it.  
-class EEThreadId
-{
-public:
-    EEThreadId(uint32_t uiId) : m_uiId(uiId) {}
-#ifndef DACCESS_COMPILE
-    bool IsSameThread();
-#endif
-
-private:
-    uint32_t m_uiId;
-};
-
-
 //
 // -----------------------------------------------------------------------------------------------------------
 //
@@ -67,8 +52,7 @@ class CrstStatic
 private:
     CRITICAL_SECTION    m_sCritSec;
 #if defined(_DEBUG)
-    uint32_t            m_uiOwnerId;
-    static const uint32_t UNOWNED = 0;
+    EEThreadId          m_uiOwnerId;
 #endif // _DEBUG
 };
 

src/Native/Runtime/PalRedhawk.h

@@ -651,6 +651,7 @@ extern GCSystemInfo g_SystemInfo;
 #define REDHAWK_PALAPI __stdcall
 #endif // GCENV_INCLUDED
 
+bool InitializeSystemInfo();
 
 #ifndef DACCESS_COMPILE
 
@@ -773,18 +774,13 @@ REDHAWK_PALIMPORT int __cdecl PalVSprintf(_Out_writes_z_(cchBuffer) char * szBuf
 #define ALLOW_CONSTANT_EXPR_BEGIN __pragma(warning(push)) __pragma(warning(disable:4127))
 #define ALLOW_CONSTANT_EXPR_END __pragma(warning(pop))
 
-struct GCMemoryStatus;
-REDHAWK_PALIMPORT UInt32_BOOL REDHAWK_PALAPI PalGlobalMemoryStatusEx(_Out_ GCMemoryStatus* pBuffer);
 REDHAWK_PALIMPORT _Ret_maybenull_ _Post_writable_byte_size_(size) void* REDHAWK_PALAPI PalVirtualAlloc(_In_opt_ void* pAddress, UIntNative size, UInt32 allocationType, UInt32 protect);
 REDHAWK_PALIMPORT UInt32_BOOL REDHAWK_PALAPI PalVirtualFree(_In_ void* pAddress, UIntNative size, UInt32 freeType);
 REDHAWK_PALIMPORT void REDHAWK_PALAPI PalSleep(UInt32 milliseconds);
 REDHAWK_PALIMPORT UInt32_BOOL REDHAWK_PALAPI PalSwitchToThread();
-REDHAWK_PALIMPORT HANDLE REDHAWK_PALAPI PalCreateMutexW(_In_opt_ LPSECURITY_ATTRIBUTES pMutexAttributes, UInt32_BOOL initialOwner, _In_opt_z_ LPCWSTR pName);
 REDHAWK_PALIMPORT HANDLE REDHAWK_PALAPI PalCreateEventW(_In_opt_ LPSECURITY_ATTRIBUTES pEventAttributes, UInt32_BOOL manualReset, UInt32_BOOL initialState, _In_opt_z_ LPCWSTR pName);
 REDHAWK_PALIMPORT UInt32 REDHAWK_PALAPI PalGetTickCount();
 REDHAWK_PALIMPORT HANDLE REDHAWK_PALAPI PalCreateFileW(_In_z_ LPCWSTR pFileName, uint32_t desiredAccess, uint32_t shareMode, _In_opt_ void* pSecurityAttributes, uint32_t creationDisposition, uint32_t flagsAndAttributes, HANDLE hTemplateFile);
-REDHAWK_PALIMPORT UInt32 REDHAWK_PALAPI PalGetWriteWatch(UInt32 flags, _In_ void* pBaseAddress, UIntNative regionSize, _Out_writes_to_opt_(*pCount, *pCount) void** pAddresses, _Inout_opt_ UIntNative* pCount, _Inout_opt_ UInt32* pGranularity);
-REDHAWK_PALIMPORT UInt32 REDHAWK_PALAPI PalResetWriteWatch(_In_ void* pBaseAddress, UIntNative regionSize);
 REDHAWK_PALIMPORT HANDLE REDHAWK_PALAPI PalCreateLowMemoryNotification();
 REDHAWK_PALIMPORT void REDHAWK_PALAPI PalTerminateCurrentProcess(UInt32 exitCode);
 REDHAWK_PALIMPORT HANDLE REDHAWK_PALAPI PalGetModuleHandleFromPointer(_In_ void* pointer);

src/Native/Runtime/PalRedhawkFunctions.h

@@ -196,12 +196,6 @@ inline UInt32_BOOL PalSetEvent(HANDLE arg1)
     return SetEvent(arg1);
 }
 
-extern "C" UInt32_BOOL __stdcall SetFilePointerEx(HANDLE, LARGE_INTEGER, LARGE_INTEGER *, UInt32);
-inline UInt32_BOOL PalSetFilePointerEx(HANDLE arg1, LARGE_INTEGER arg2, LARGE_INTEGER * arg3, UInt32 arg4)
-{
-    return SetFilePointerEx(arg1, arg2, arg3, arg4);
-}
-
 extern "C" void __stdcall TerminateProcess(HANDLE, UInt32);
 inline void PalTerminateProcess(HANDLE arg1, UInt32 arg2)
 {

src/Native/Runtime/gcenv.h

@@ -9,9 +9,15 @@
 #pragma warning( disable: 4127 )  // conditional expression is constant -- common in GC
 #endif
 
+typedef wchar_t WCHAR;
+#define W(str) L##str
+
 #include "sal.h"
 #include "gcenv.structs.h"
+#include "gcenv.os.h"
+#include "gcenv.interlocked.h"
 #include "gcenv.base.h"
+#include "gcenv.ee.h"
 
 #include "Crst.h"
 #include "event.h"
@@ -25,6 +31,7 @@
 #include "PalRedhawkCommon.h"
 #include "PalRedhawk.h"
 #include "gcrhinterface.h"
+#include "gcenv.interlocked.inl"
 
 #ifdef FEATURE_ETW
 
@@ -53,6 +60,12 @@
 
 #endif // FEATURE_ETW
 
+#define MAX_LONGPATH 1024
+
+#ifndef YieldProcessor
+#define YieldProcessor PalYieldProcessor
+#endif
+
 // Adapter for GC's view of Array
 class ArrayBase : Array
 {

src/Native/Runtime/gcrhenv.cpp

@@ -169,7 +169,10 @@ bool RedhawkGCInterface::InitializeSubsystems(GCType gcType)
     MICROSOFT_WINDOWS_REDHAWK_GC_PUBLIC_PROVIDER_Context.RegistrationHandle = Microsoft_Windows_Redhawk_GC_PublicHandle;
 #endif // FEATURE_ETW
 
-    InitializeSystemInfo();
+    if (!InitializeSystemInfo())
+    {
+        return false;
+    }
 
     // Initialize the special EEType used to mark free list entries in the GC heap.
     g_FreeObjectEEType.InitializeAsGcFreeType();
@@ -479,7 +482,7 @@ void RedhawkGCInterface::ScanHeap(GcScanObjectFunction pfnScanCallback, void *pC
     // Carefully attempt to set the global callback function (careful in that we won't overwrite another scan
     // that's being scheduled or in-progress). If someone beat us to it back off and wait for the
     // corresponding GC to complete.
-    while (FastInterlockCompareExchangePointer(&g_pfnHeapScan, pfnScanCallback, NULL) != NULL)
+    while (Interlocked::CompareExchangePointer(&g_pfnHeapScan, pfnScanCallback, NULL) != NULL)
     {
         // Wait in pre-emptive mode to avoid stalling another thread that's attempting a collection.
         Thread * pCurThread = GetThread();
@@ -509,7 +512,7 @@ void RedhawkGCInterface::ScanHeap(GcScanObjectFunction pfnScanCallback, void *pC
 
     // Release our hold on the global scanning pointers.
     g_pvHeapScanContext = NULL;
-    FastInterlockExchangePointer(&g_pfnHeapScan, NULL);
+    Interlocked::ExchangePointer(&g_pfnHeapScan, NULL);
 #else
     UNREFERENCED_PARAMETER(pfnScanCallback);
     UNREFERENCED_PARAMETER(pContext);
@@ -992,12 +995,12 @@ bool StartFinalizerThread()
     //
     static volatile Int32 fFinalizerThreadCreated;
 
-    if (FastInterlockExchange(&fFinalizerThreadCreated, 1) != 1)
+    if (Interlocked::Exchange(&fFinalizerThreadCreated, 1) != 1)
     {
         if (!PalStartFinalizerThread(FinalizerStart, (void*)FinalizerThread::GetFinalizerEvent()))
         {
             // Need to try again another time...
-            FastInterlockExchange(&fFinalizerThreadCreated, 0);
+            Interlocked::Exchange(&fFinalizerThreadCreated, 0);
         }
     }
 
@@ -1095,9 +1098,9 @@ bool FinalizerThread::WatchDog()
 
         // Wait for any outstanding finalization run to complete. Time this initial operation so that it forms
         // part of the overall timeout budget.
-        DWORD dwStartTime = GetTickCount();
+        DWORD dwStartTime = PalGetTickCount();
         Wait(dwTimeout);
-        DWORD dwEndTime = GetTickCount();
+        DWORD dwEndTime = PalGetTickCount();
 
         // In the exceedingly rare case that the tick count wrapped then we'll just reset the timeout to its
         // initial value. Otherwise we'll subtract the time we waited from the timeout budget (being mindful
@@ -1156,60 +1159,14 @@ void FinalizerThread::Wait(DWORD timeout, bool allowReentrantWait)
 #endif // FEATURE_PREMORTEM_FINALIZATION
 
 #ifndef DACCESS_COMPILE
-void GetProcessMemoryLoad(GCMemoryStatus* pGCMemStatus)
-{
-    // @TODO: no way to communicate failure
-    PalGlobalMemoryStatusEx(pGCMemStatus);
-}
 
 bool __SwitchToThread(uint32_t /*dwSleepMSec*/, uint32_t /*dwSwitchCount*/)
 {
     return !!PalSwitchToThread();
 }
 
-void * ClrVirtualAlloc(
-    void * lpAddress,
-    size_t dwSize,
-    uint32_t flAllocationType,
-    uint32_t flProtect)
-{
-    return PalVirtualAlloc(lpAddress, dwSize, flAllocationType, flProtect);
-}
-
-void * ClrVirtualAllocAligned(
-    void * lpAddress,
-    size_t dwSize,
-    uint32_t flAllocationType,
-    uint32_t flProtect,
-    size_t /*dwAlignment*/)
-{
-    return PalVirtualAlloc(lpAddress, dwSize, flAllocationType, flProtect);
-}
-
-bool ClrVirtualFree(
-    void * lpAddress,
-    size_t dwSize,
-    uint32_t dwFreeType)
-{
-    return !!PalVirtualFree(lpAddress, dwSize, dwFreeType);
-}
 #endif // DACCESS_COMPILE
 
-bool
-ClrVirtualProtect(
-    void * lpAddress,
-    size_t dwSize,
-    uint32_t flNewProtect,
-    uint32_t * lpflOldProtect)
-{
-    UNREFERENCED_PARAMETER(lpAddress);
-    UNREFERENCED_PARAMETER(dwSize);
-    UNREFERENCED_PARAMETER(flNewProtect);
-    UNREFERENCED_PARAMETER(lpflOldProtect);
-    ASSERT(!"ClrVirtualProtect");
-    return false;
-}
-
 MethodTable * g_pFreeObjectMethodTable;
 int32_t g_TrapReturningThreads;
 bool g_fFinalizerRunOnShutDown;
@@ -1230,38 +1187,6 @@ VOID LogSpewAlways(const char * /*fmt*/, ...)
 {
 }
 
-CLR_MUTEX_COOKIE ClrCreateMutex(CLR_MUTEX_ATTRIBUTES lpMutexAttributes, bool bInitialOwner, LPCWSTR lpName)
-{
-    UNREFERENCED_PARAMETER(lpMutexAttributes);
-    UNREFERENCED_PARAMETER(bInitialOwner);
-    UNREFERENCED_PARAMETER(lpName);
-    ASSERT(!"ClrCreateMutex");
-    return NULL;
-}
-
-void ClrCloseMutex(CLR_MUTEX_COOKIE mutex)
-{
-    UNREFERENCED_PARAMETER(mutex);
-    ASSERT(!"ClrCloseMutex");
-}
-
-bool ClrReleaseMutex(CLR_MUTEX_COOKIE mutex)
-{
-    UNREFERENCED_PARAMETER(mutex);
-    ASSERT(!"ClrReleaseMutex");
-    return true;
-}
-
-uint32_t ClrWaitForMutex(CLR_MUTEX_COOKIE mutex, uint32_t dwMilliseconds, bool bAlertable)
-{
-    UNREFERENCED_PARAMETER(mutex);
-    UNREFERENCED_PARAMETER(dwMilliseconds);
-    UNREFERENCED_PARAMETER(bAlertable);
-    ASSERT(!"ClrWaitForMutex");
-    return WAIT_OBJECT_0;
-}
-
-
 uint32_t CLRConfig::GetConfigValue(ConfigDWORDInfo eType)
 {
     switch (eType)

src/Native/Runtime/unix/PalRedhawkInline.h

@@ -17,12 +17,12 @@ FORCEINLINE Int32 PalInterlockedDecrement(_Inout_ _Interlocked_operand_ Int32 vo
 
 FORCEINLINE UInt32 PalInterlockedOr(_Inout_ _Interlocked_operand_ UInt32 volatile *pDst, UInt32 iValue)
 {
-    return __sync_fetch_and_or(pDst, iValue);
+    return __sync_or_and_fetch(pDst, iValue);
 }
 
 FORCEINLINE UInt32 PalInterlockedAnd(_Inout_ _Interlocked_operand_ UInt32 volatile *pDst, UInt32 iValue)
 {
-    return __sync_fetch_and_and(pDst, iValue);
+    return __sync_and_and_fetch(pDst, iValue);
 }
 
 FORCEINLINE Int32 PalInterlockedExchange(_Inout_ _Interlocked_operand_ Int32 volatile *pDst, Int32 iValue)