diff options
Diffstat (limited to 'src/vm/threads.h')
| -rw-r--r-- | src/vm/threads.h | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/src/vm/threads.h b/src/vm/threads.h index ec047f2ddd..144e17c591 100644 --- a/src/vm/threads.h +++ b/src/vm/threads.h @@ -142,7 +142,7 @@ #include "regdisp.h" #include "mscoree.h" #include "appdomainstack.h" -#include "gc.h" +#include "gcheaputilities.h" #include "gcinfotypes.h" #include <clrhost.h> @@ -1072,7 +1072,7 @@ class Thread: public IUnknown friend DWORD MapWin32FaultToCOMPlusException(EXCEPTION_RECORD *pExceptionRecord); friend void STDCALL OnHijackWorker(HijackArgs * pArgs); #ifdef PLATFORM_UNIX - friend void PALAPI HandleGCSuspensionForInterruptedThread(CONTEXT *interruptedContext); + friend void HandleGCSuspensionForInterruptedThread(CONTEXT *interruptedContext); #endif // PLATFORM_UNIX #endif // FEATURE_HIJACK @@ -1739,9 +1739,9 @@ public: // on MP systems, each thread has its own allocation chunk so we can avoid // lock prefixes and expensive MP cache snooping stuff - alloc_context m_alloc_context; + gc_alloc_context m_alloc_context; - inline alloc_context *GetAllocContext() { LIMITED_METHOD_CONTRACT; return &m_alloc_context; } + inline gc_alloc_context *GetAllocContext() { LIMITED_METHOD_CONTRACT; return &m_alloc_context; } // This is the type handle of the first object in the alloc context at the time // we fire the AllocationTick event. It's only for tooling purpose. @@ -2796,7 +2796,8 @@ public: CONTRACTL_END; return (ObjectFromHandle(m_ExposedObject) != NULL) ; } -#ifndef FEATURE_CORECLR + +#ifdef FEATURE_SYNCHRONIZATIONCONTEXT_WAIT void GetSynchronizationContext(OBJECTREF *pSyncContextObj) { CONTRACTL @@ -2814,7 +2815,8 @@ public: if (ExposedThreadObj != NULL) *pSyncContextObj = ExposedThreadObj->GetSynchronizationContext(); } -#endif //!FEATURE_CORECLR +#endif // FEATURE_SYNCHRONIZATIONCONTEXT_WAIT + #ifdef FEATURE_COMPRESSEDSTACK OBJECTREF GetCompressedStack() { @@ -4884,7 +4886,7 @@ private: private: // When we create an object, or create an OBJECTREF, or create an Interior Pointer, or enter EE from managed // code, we will set this flag. - // Inside GCHeap::StressHeap, we only do GC if this flag is TRUE. Then we reset it to zero. + // Inside GCHeapUtilities::StressHeap, we only do GC if this flag is TRUE. Then we reset it to zero. BOOL m_fStressHeapCount; public: void EnableStressHeap() |