Use reader/writer lock instead of mutex for ComWrappers RCW cache#91120

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AaronRobinsonMSFT merged 1 commit into from
Aug 25, 2023
Merged

Use reader/writer lock instead of mutex for ComWrappers RCW cache #91120

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions src/coreclr/inc/CrstTypes.def
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -394,9 +394,6 @@ End
Crst RCWCleanupList
End

Crst ExternalObjectContextCache
End

Crst Reflection
AcquiredBefore LoaderHeap UnresolvedClassLock
End
Expand Down
173 changes: 85 additions & 88 deletions src/coreclr/inc/crsttypes_generated.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -50,92 +50,91 @@ enum CrstType
CrstException = 32,
CrstExecutableAllocatorLock = 33,
CrstExecuteManRangeLock = 34,
CrstExternalObjectContextCache = 35,
CrstFCall = 36,
CrstFrozenObjectHeap = 37,
CrstFuncPtrStubs = 38,
CrstFusionAppCtx = 39,
CrstGCCover = 40,
CrstGlobalStrLiteralMap = 41,
CrstHandleTable = 42,
CrstIbcProfile = 43,
CrstIJWFixupData = 44,
CrstIJWHash = 45,
CrstILStubGen = 46,
CrstInlineTrackingMap = 47,
CrstInstMethodHashTable = 48,
CrstInterop = 49,
CrstInteropData = 50,
CrstIsJMCMethod = 51,
CrstISymUnmanagedReader = 52,
CrstJit = 53,
CrstJitGenericHandleCache = 54,
CrstJitInlineTrackingMap = 55,
CrstJitPatchpoint = 56,
CrstJitPerf = 57,
CrstJumpStubCache = 58,
CrstLeafLock = 59,
CrstListLock = 60,
CrstLoaderAllocator = 61,
CrstLoaderAllocatorReferences = 62,
CrstLoaderHeap = 63,
CrstManagedObjectWrapperMap = 64,
CrstMethodDescBackpatchInfoTracker = 65,
CrstMethodTableExposedObject = 66,
CrstModule = 67,
CrstModuleFixup = 68,
CrstModuleLookupTable = 69,
CrstMulticoreJitHash = 70,
CrstMulticoreJitManager = 71,
CrstNativeImageEagerFixups = 72,
CrstNativeImageLoad = 73,
CrstNls = 74,
CrstNotifyGdb = 75,
CrstObjectList = 76,
CrstPEImage = 77,
CrstPendingTypeLoadEntry = 78,
CrstPerfMap = 79,
CrstPgoData = 80,
CrstPinnedByrefValidation = 81,
CrstPinnedHeapHandleTable = 82,
CrstProfilerGCRefDataFreeList = 83,
CrstProfilingAPIStatus = 84,
CrstRCWCache = 85,
CrstRCWCleanupList = 86,
CrstReadyToRunEntryPointToMethodDescMap = 87,
CrstReflection = 88,
CrstReJITGlobalRequest = 89,
CrstRetThunkCache = 90,
CrstSavedExceptionInfo = 91,
CrstSaveModuleProfileData = 92,
CrstSecurityStackwalkCache = 93,
CrstSigConvert = 94,
CrstSingleUseLock = 95,
CrstSpecialStatics = 96,
CrstStackSampler = 97,
CrstStaticBoxInit = 98,
CrstStressLog = 99,
CrstStubCache = 100,
CrstStubDispatchCache = 101,
CrstStubUnwindInfoHeapSegments = 102,
CrstSyncBlockCache = 103,
CrstSyncHashLock = 104,
CrstSystemBaseDomain = 105,
CrstSystemDomain = 106,
CrstSystemDomainDelayedUnloadList = 107,
CrstThreadIdDispenser = 108,
CrstThreadStore = 109,
CrstTieredCompilation = 110,
CrstTypeEquivalenceMap = 111,
CrstTypeIDMap = 112,
CrstUMEntryThunkCache = 113,
CrstUMEntryThunkFreeListLock = 114,
CrstUniqueStack = 115,
CrstUnresolvedClassLock = 116,
CrstUnwindInfoTableLock = 117,
CrstVSDIndirectionCellLock = 118,
CrstWrapperTemplate = 119,
kNumberOfCrstTypes = 120
CrstFCall = 35,
CrstFrozenObjectHeap = 36,
CrstFuncPtrStubs = 37,
CrstFusionAppCtx = 38,
CrstGCCover = 39,
CrstGlobalStrLiteralMap = 40,
CrstHandleTable = 41,
CrstIbcProfile = 42,
CrstIJWFixupData = 43,
CrstIJWHash = 44,
CrstILStubGen = 45,
CrstInlineTrackingMap = 46,
CrstInstMethodHashTable = 47,
CrstInterop = 48,
CrstInteropData = 49,
CrstIsJMCMethod = 50,
CrstISymUnmanagedReader = 51,
CrstJit = 52,
CrstJitGenericHandleCache = 53,
CrstJitInlineTrackingMap = 54,
CrstJitPatchpoint = 55,
CrstJitPerf = 56,
CrstJumpStubCache = 57,
CrstLeafLock = 58,
CrstListLock = 59,
CrstLoaderAllocator = 60,
CrstLoaderAllocatorReferences = 61,
CrstLoaderHeap = 62,
CrstManagedObjectWrapperMap = 63,
CrstMethodDescBackpatchInfoTracker = 64,
CrstMethodTableExposedObject = 65,
CrstModule = 66,
CrstModuleFixup = 67,
CrstModuleLookupTable = 68,
CrstMulticoreJitHash = 69,
CrstMulticoreJitManager = 70,
CrstNativeImageEagerFixups = 71,
CrstNativeImageLoad = 72,
CrstNls = 73,
CrstNotifyGdb = 74,
CrstObjectList = 75,
CrstPEImage = 76,
CrstPendingTypeLoadEntry = 77,
CrstPerfMap = 78,
CrstPgoData = 79,
CrstPinnedByrefValidation = 80,
CrstPinnedHeapHandleTable = 81,
CrstProfilerGCRefDataFreeList = 82,
CrstProfilingAPIStatus = 83,
CrstRCWCache = 84,
CrstRCWCleanupList = 85,
CrstReadyToRunEntryPointToMethodDescMap = 86,
CrstReflection = 87,
CrstReJITGlobalRequest = 88,
CrstRetThunkCache = 89,
CrstSavedExceptionInfo = 90,
CrstSaveModuleProfileData = 91,
CrstSecurityStackwalkCache = 92,
CrstSigConvert = 93,
CrstSingleUseLock = 94,
CrstSpecialStatics = 95,
CrstStackSampler = 96,
CrstStaticBoxInit = 97,
CrstStressLog = 98,
CrstStubCache = 99,
CrstStubDispatchCache = 100,
CrstStubUnwindInfoHeapSegments = 101,
CrstSyncBlockCache = 102,
CrstSyncHashLock = 103,
CrstSystemBaseDomain = 104,
CrstSystemDomain = 105,
CrstSystemDomainDelayedUnloadList = 106,
CrstThreadIdDispenser = 107,
CrstThreadStore = 108,
CrstTieredCompilation = 109,
CrstTypeEquivalenceMap = 110,
CrstTypeIDMap = 111,
CrstUMEntryThunkCache = 112,
CrstUMEntryThunkFreeListLock = 113,
CrstUniqueStack = 114,
CrstUnresolvedClassLock = 115,
CrstUnwindInfoTableLock = 116,
CrstVSDIndirectionCellLock = 117,
CrstWrapperTemplate = 118,
kNumberOfCrstTypes = 119
};

#endif // __CRST_TYPES_INCLUDED
Expand DownExpand Up@@ -181,7 +180,6 @@ int g_rgCrstLevelMap[] =
0, // CrstException
0, // CrstExecutableAllocatorLock
0, // CrstExecuteManRangeLock
0, // CrstExternalObjectContextCache
4, // CrstFCall
-1, // CrstFrozenObjectHeap
7, // CrstFuncPtrStubs
Expand DownExpand Up@@ -306,7 +304,6 @@ LPCSTR g_rgCrstNameMap[] =
"CrstException",
"CrstExecutableAllocatorLock",
"CrstExecuteManRangeLock",
"CrstExternalObjectContextCache",
"CrstFCall",
"CrstFrozenObjectHeap",
"CrstFuncPtrStubs",
Expand Down
62 changes: 39 additions & 23 deletions src/coreclr/vm/interoplibinterface_comwrappers.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@

// Runtime headers
#include "common.h"
#include "simplerwlock.hpp"
#include "rcwrefcache.h"
#ifdef FEATURE_COMINTEROP_APARTMENT_SUPPORT
#include "olecontexthelpers.h"
Expand DownExpand Up@@ -257,32 +258,36 @@ namespace
using Element = SHash<Traits>::element_t;
using Iterator = SHash<Traits>::Iterator;

class LockHolder : public CrstHolder
class ReaderLock final
{
SimpleReadLockHolder _lock;
public:
LockHolder(_In_ ExtObjCxtCache *cache)
: CrstHolder(&cache->_lock)
{
// This cache must be locked in Cooperative mode
// since releases of wrappers can occur during a GC.
CONTRACTL
{
NOTHROW;
GC_NOTRIGGER;
MODE_COOPERATIVE;
}
CONTRACTL_END;
}
ReaderLock(_In_ ExtObjCxtCache* cache)
: _lock{ &cache->_lock }
{ }

~ReaderLock() = default;
};

class WriterLock final
{
SimpleWriteLockHolder _lock;
public:
WriterLock(_In_ ExtObjCxtCache* cache)
: _lock{ &cache->_lock }
{ }

~WriterLock() = default;
};

private:
friend struct InteropLibImports::RuntimeCallContext;
SHash<Traits> _hashMap;
Crst _lock;
SimpleRWLock _lock;
ExtObjCxtRefCache* _refCache;

ExtObjCxtCache()
: _lock(CrstExternalObjectContextCache, CRST_UNSAFE_COOPGC)
: _lock(COOPERATIVE, LOCK_TYPE_DEFAULT)
, _refCache(GetAppDomain()->GetRCWRefCache())
{ }
~ExtObjCxtCache() = default;
Expand All@@ -292,7 +297,7 @@ namespace
bool IsLockHeld()
{
WRAPPER_NO_CONTRACT;
return (_lock.OwnedByCurrentThread() != FALSE);
return (_lock.LockTaken() != FALSE);
}
#endif // _DEBUG

Expand DownExpand Up@@ -343,7 +348,7 @@ namespace
// Determine the count of objects to return.
SIZE_T objCountMax = 0;
{
LockHolder lock(this);
ReaderLock lock(this);
Iterator end = _hashMap.End();
for (Iterator curr = _hashMap.Begin(); curr != end; ++curr)
{
Expand All@@ -365,7 +370,7 @@ namespace
SIZE_T objCount = 0;
if (0 < objCountMax)
{
LockHolder lock(this);
ReaderLock lock(this);
Iterator end = _hashMap.End();
for (Iterator curr = _hashMap.Begin(); curr != end; ++curr)
{
Expand DownExpand Up@@ -823,11 +828,22 @@ namespace
if (!uniqueInstance)
{
bool objectFound = false;
bool tryRemove = false;
{
// Query the external object cache
ExtObjCxtCache::LockHolder lock(cache);
// Perform a quick look up to determine if we know of the object and if
// we need to perform a more expensive cleanup operation below.
ExtObjCxtCache::ReaderLock lock(cache);
extObjCxt = cache->Find(cacheKey);
objectFound = extObjCxt != NULL;
tryRemove = objectFound && extObjCxt->IsSet(ExternalObjectContext::Flags_Detached);
}

if (tryRemove)
{
// Perform the slower cleanup operation that may be appropriate
// if the object still exists and has been detached.
ExtObjCxtCache::WriterLock lock(cache);
extObjCxt = cache->Find(cacheKey);
objectFound = extObjCxt != NULL;
if (objectFound && extObjCxt->IsSet(ExternalObjectContext::Flags_Detached))
{
Expand DownExpand Up@@ -958,7 +974,7 @@ namespace
else
{
// Attempt to insert the new context into the cache.
ExtObjCxtCache::LockHolder lock(cache);
ExtObjCxtCache::WriterLock lock(cache);
extObjCxt = cache->FindOrAdd(cacheKey, resultHolder.GetContext());
}

Expand All@@ -980,7 +996,7 @@ namespace
{
// Failed to set the context; one must already exist.
// Remove from the cache above as well.
ExtObjCxtCache::LockHolder lock(cache);
ExtObjCxtCache::WriterLock lock(cache);
cache->Remove(resultHolder.GetContext());

COMPlusThrow(kNotSupportedException);
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Use reader/writer lock instead of mutex for ComWrappers RCW cache#91120

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

AaronRobinsonMSFT
merged 1 commit into

from

Aug 25, 2023
 Merged


Use reader/writer lock instead of mutex for ComWrappers RCW cache
#91120
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


3 changes: 0 additions & 3 deletions
src/coreclr/inc/CrstTypes.def

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -394,9 +394,6 @@ End
Crst RCWCleanupList
End

Crst ExternalObjectContextCache
End

Crst Reflection
 AcquiredBefore LoaderHeap UnresolvedClassLock
End
Expand Down

173 changes: 85 additions & 88 deletions
src/coreclr/inc/crsttypes_generated.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -50,92 +50,91 @@ enum CrstType
 CrstException = 32,
 CrstExecutableAllocatorLock = 33,
 CrstExecuteManRangeLock = 34,
 CrstExternalObjectContextCache = 35,
 CrstFCall = 36,
 CrstFrozenObjectHeap = 37,
 CrstFuncPtrStubs = 38,
 CrstFusionAppCtx = 39,
 CrstGCCover = 40,
 CrstGlobalStrLiteralMap = 41,
 CrstHandleTable = 42,
 CrstIbcProfile = 43,
 CrstIJWFixupData = 44,
 CrstIJWHash = 45,
 CrstILStubGen = 46,
 CrstInlineTrackingMap = 47,
 CrstInstMethodHashTable = 48,
 CrstInterop = 49,
 CrstInteropData = 50,
 CrstIsJMCMethod = 51,
 CrstISymUnmanagedReader = 52,
 CrstJit = 53,
 CrstJitGenericHandleCache = 54,
 CrstJitInlineTrackingMap = 55,
 CrstJitPatchpoint = 56,
 CrstJitPerf = 57,
 CrstJumpStubCache = 58,
 CrstLeafLock = 59,
 CrstListLock = 60,
 CrstLoaderAllocator = 61,
 CrstLoaderAllocatorReferences = 62,
 CrstLoaderHeap = 63,
 CrstManagedObjectWrapperMap = 64,
 CrstMethodDescBackpatchInfoTracker = 65,
 CrstMethodTableExposedObject = 66,
 CrstModule = 67,
 CrstModuleFixup = 68,
 CrstModuleLookupTable = 69,
 CrstMulticoreJitHash = 70,
 CrstMulticoreJitManager = 71,
 CrstNativeImageEagerFixups = 72,
 CrstNativeImageLoad = 73,
 CrstNls = 74,
 CrstNotifyGdb = 75,
 CrstObjectList = 76,
 CrstPEImage = 77,
 CrstPendingTypeLoadEntry = 78,
 CrstPerfMap = 79,
 CrstPgoData = 80,
 CrstPinnedByrefValidation = 81,
 CrstPinnedHeapHandleTable = 82,
 CrstProfilerGCRefDataFreeList = 83,
 CrstProfilingAPIStatus = 84,
 CrstRCWCache = 85,
 CrstRCWCleanupList = 86,
 CrstReadyToRunEntryPointToMethodDescMap = 87,
 CrstReflection = 88,
 CrstReJITGlobalRequest = 89,
 CrstRetThunkCache = 90,
 CrstSavedExceptionInfo = 91,
 CrstSaveModuleProfileData = 92,
 CrstSecurityStackwalkCache = 93,
 CrstSigConvert = 94,
 CrstSingleUseLock = 95,
 CrstSpecialStatics = 96,
 CrstStackSampler = 97,
 CrstStaticBoxInit = 98,
 CrstStressLog = 99,
 CrstStubCache = 100,
 CrstStubDispatchCache = 101,
 CrstStubUnwindInfoHeapSegments = 102,
 CrstSyncBlockCache = 103,
 CrstSyncHashLock = 104,
 CrstSystemBaseDomain = 105,
 CrstSystemDomain = 106,
 CrstSystemDomainDelayedUnloadList = 107,
 CrstThreadIdDispenser = 108,
 CrstThreadStore = 109,
 CrstTieredCompilation = 110,
 CrstTypeEquivalenceMap = 111,
 CrstTypeIDMap = 112,
 CrstUMEntryThunkCache = 113,
 CrstUMEntryThunkFreeListLock = 114,
 CrstUniqueStack = 115,
 CrstUnresolvedClassLock = 116,
 CrstUnwindInfoTableLock = 117,
 CrstVSDIndirectionCellLock = 118,
 CrstWrapperTemplate = 119,
 kNumberOfCrstTypes = 120
 CrstFCall = 35,
 CrstFrozenObjectHeap = 36,
 CrstFuncPtrStubs = 37,
 CrstFusionAppCtx = 38,
 CrstGCCover = 39,
 CrstGlobalStrLiteralMap = 40,
 CrstHandleTable = 41,
 CrstIbcProfile = 42,
 CrstIJWFixupData = 43,
 CrstIJWHash = 44,
 CrstILStubGen = 45,
 CrstInlineTrackingMap = 46,
 CrstInstMethodHashTable = 47,
 CrstInterop = 48,
 CrstInteropData = 49,
 CrstIsJMCMethod = 50,
 CrstISymUnmanagedReader = 51,
 CrstJit = 52,
 CrstJitGenericHandleCache = 53,
 CrstJitInlineTrackingMap = 54,
 CrstJitPatchpoint = 55,
 CrstJitPerf = 56,
 CrstJumpStubCache = 57,
 CrstLeafLock = 58,
 CrstListLock = 59,
 CrstLoaderAllocator = 60,
 CrstLoaderAllocatorReferences = 61,
 CrstLoaderHeap = 62,
 CrstManagedObjectWrapperMap = 63,
 CrstMethodDescBackpatchInfoTracker = 64,
 CrstMethodTableExposedObject = 65,
 CrstModule = 66,
 CrstModuleFixup = 67,
 CrstModuleLookupTable = 68,
 CrstMulticoreJitHash = 69,
 CrstMulticoreJitManager = 70,
 CrstNativeImageEagerFixups = 71,
 CrstNativeImageLoad = 72,
 CrstNls = 73,
 CrstNotifyGdb = 74,
 CrstObjectList = 75,
 CrstPEImage = 76,
 CrstPendingTypeLoadEntry = 77,
 CrstPerfMap = 78,
 CrstPgoData = 79,
 CrstPinnedByrefValidation = 80,
 CrstPinnedHeapHandleTable = 81,
 CrstProfilerGCRefDataFreeList = 82,
 CrstProfilingAPIStatus = 83,
 CrstRCWCache = 84,
 CrstRCWCleanupList = 85,
 CrstReadyToRunEntryPointToMethodDescMap = 86,
 CrstReflection = 87,
 CrstReJITGlobalRequest = 88,
 CrstRetThunkCache = 89,
 CrstSavedExceptionInfo = 90,
 CrstSaveModuleProfileData = 91,
 CrstSecurityStackwalkCache = 92,
 CrstSigConvert = 93,
 CrstSingleUseLock = 94,
 CrstSpecialStatics = 95,
 CrstStackSampler = 96,
 CrstStaticBoxInit = 97,
 CrstStressLog = 98,
 CrstStubCache = 99,
 CrstStubDispatchCache = 100,
 CrstStubUnwindInfoHeapSegments = 101,
 CrstSyncBlockCache = 102,
 CrstSyncHashLock = 103,
 CrstSystemBaseDomain = 104,
 CrstSystemDomain = 105,
 CrstSystemDomainDelayedUnloadList = 106,
 CrstThreadIdDispenser = 107,
 CrstThreadStore = 108,
 CrstTieredCompilation = 109,
 CrstTypeEquivalenceMap = 110,
 CrstTypeIDMap = 111,
 CrstUMEntryThunkCache = 112,
 CrstUMEntryThunkFreeListLock = 113,
 CrstUniqueStack = 114,
 CrstUnresolvedClassLock = 115,
 CrstUnwindInfoTableLock = 116,
 CrstVSDIndirectionCellLock = 117,
 CrstWrapperTemplate = 118,
 kNumberOfCrstTypes = 119
};

#endif // __CRST_TYPES_INCLUDED
Expand DownExpand Up@@ -181,7 +180,6 @@ int g_rgCrstLevelMap[] =
 0, // CrstException
 0, // CrstExecutableAllocatorLock
 0, // CrstExecuteManRangeLock
 0, // CrstExternalObjectContextCache
 4, // CrstFCall
 -1, // CrstFrozenObjectHeap
 7, // CrstFuncPtrStubs
Expand DownExpand Up@@ -306,7 +304,6 @@ LPCSTR g_rgCrstNameMap[] =
 "CrstException",
 "CrstExecutableAllocatorLock",
 "CrstExecuteManRangeLock",
 "CrstExternalObjectContextCache",
 "CrstFCall",
 "CrstFrozenObjectHeap",
 "CrstFuncPtrStubs",
Expand Down

62 changes: 39 additions & 23 deletions
src/coreclr/vm/interoplibinterface_comwrappers.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@

// Runtime headers
#include "common.h"
#include "simplerwlock.hpp"
#include "rcwrefcache.h"
#ifdef FEATURE_COMINTEROP_APARTMENT_SUPPORT
#include "olecontexthelpers.h"
Expand DownExpand Up@@ -257,32 +258,36 @@ namespace
 using Element = SHash<Traits>::element_t;
 using Iterator = SHash<Traits>::Iterator;

 class LockHolder : public CrstHolder
 class ReaderLock final
 {
 SimpleReadLockHolder _lock;
 public:
 LockHolder(_In_ ExtObjCxtCache *cache)
 : CrstHolder(&cache->_lock)
 {
 // This cache must be locked in Cooperative mode
 // since releases of wrappers can occur during a GC.
 CONTRACTL
 {
 NOTHROW;
 GC_NOTRIGGER;
 MODE_COOPERATIVE;
 }
 CONTRACTL_END;
 }
 ReaderLock(_In_ ExtObjCxtCache* cache)
 : _lock{ &cache->_lock }
 { }

 ~ReaderLock() = default;
 };

 class WriterLock final
 {
 SimpleWriteLockHolder _lock;
 public:
 WriterLock(_In_ ExtObjCxtCache* cache)
 : _lock{ &cache->_lock }
 { }

 ~WriterLock() = default;
 };

 private:
 friend struct InteropLibImports::RuntimeCallContext;
 SHash<Traits> _hashMap;
Crst _lock;
SimpleRWLock _lock;
 ExtObjCxtRefCache* _refCache;

 ExtObjCxtCache()
 : _lock(CrstExternalObjectContextCache, CRST_UNSAFE_COOPGC)
 : _lock(COOPERATIVE, LOCK_TYPE_DEFAULT)
 , _refCache(GetAppDomain()->GetRCWRefCache())
 { }
 ~ExtObjCxtCache() = default;
Expand All@@ -292,7 +297,7 @@ namespace
 bool IsLockHeld()
 {
 WRAPPER_NO_CONTRACT;
 return (_lock.OwnedByCurrentThread() != FALSE);
 return (_lock.LockTaken() != FALSE);
 }
#endif // _DEBUG

Expand DownExpand Up@@ -343,7 +348,7 @@ namespace
 // Determine the count of objects to return.
 SIZE_T objCountMax = 0;
 {
LockHolder lock(this);
ReaderLock lock(this);
 Iterator end = _hashMap.End();
 for (Iterator curr = _hashMap.Begin(); curr != end; ++curr)
 {
Expand All@@ -365,7 +370,7 @@ namespace
 SIZE_T objCount = 0;
 if (0 < objCountMax)
 {
LockHolder lock(this);
ReaderLock lock(this);
 Iterator end = _hashMap.End();
 for (Iterator curr = _hashMap.Begin(); curr != end; ++curr)
 {
Expand DownExpand Up@@ -823,11 +828,22 @@ namespace
 if (!uniqueInstance)
 {
 bool objectFound = false;
 bool tryRemove = false;
 {
 // Query the external object cache
 ExtObjCxtCache::LockHolder lock(cache);
 // Perform a quick look up to determine if we know of the object and if
 // we need to perform a more expensive cleanup operation below.
 ExtObjCxtCache::ReaderLock lock(cache);
 extObjCxt = cache->Find(cacheKey);
 objectFound = extObjCxt != NULL;
 tryRemove = objectFound && extObjCxt->IsSet(ExternalObjectContext::Flags_Detached);
 }

 if (tryRemove)
 {
 // Perform the slower cleanup operation that may be appropriate
 // if the object still exists and has been detached.
 ExtObjCxtCache::WriterLock lock(cache);
 extObjCxt = cache->Find(cacheKey);
 objectFound = extObjCxt != NULL;
 if (objectFound && extObjCxt->IsSet(ExternalObjectContext::Flags_Detached))
 {
Expand DownExpand Up@@ -958,7 +974,7 @@ namespace
 else
 {
 // Attempt to insert the new context into the cache.
 ExtObjCxtCache::LockHolder lock(cache);
 ExtObjCxtCache::WriterLock lock(cache);
 extObjCxt = cache->FindOrAdd(cacheKey, resultHolder.GetContext());
 }

Expand All@@ -980,7 +996,7 @@ namespace
 {
 // Failed to set the context; one must already exist.
 // Remove from the cache above as well.
 ExtObjCxtCache::LockHolder lock(cache);
 ExtObjCxtCache::WriterLock lock(cache);
 cache->Remove(resultHolder.GetContext());

 COMPlusThrow(kNotSupportedException);
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Use reader/writer lock instead of mutex for ComWrappers RCW cache#91120

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

AaronRobinsonMSFT
merged 1 commit into

from

Aug 25, 2023
 Merged


Use reader/writer lock instead of mutex for ComWrappers RCW cache
#91120
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


3 changes: 0 additions & 3 deletions
src/coreclr/inc/CrstTypes.def

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -394,9 +394,6 @@ End
Crst RCWCleanupList
End

Crst ExternalObjectContextCache
End

Crst Reflection
 AcquiredBefore LoaderHeap UnresolvedClassLock
End
Expand Down

173 changes: 85 additions & 88 deletions
src/coreclr/inc/crsttypes_generated.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -50,92 +50,91 @@ enum CrstType
 CrstException = 32,
 CrstExecutableAllocatorLock = 33,
 CrstExecuteManRangeLock = 34,
 CrstExternalObjectContextCache = 35,
 CrstFCall = 36,
 CrstFrozenObjectHeap = 37,
 CrstFuncPtrStubs = 38,
 CrstFusionAppCtx = 39,
 CrstGCCover = 40,
 CrstGlobalStrLiteralMap = 41,
 CrstHandleTable = 42,
 CrstIbcProfile = 43,
 CrstIJWFixupData = 44,
 CrstIJWHash = 45,
 CrstILStubGen = 46,
 CrstInlineTrackingMap = 47,
 CrstInstMethodHashTable = 48,
 CrstInterop = 49,
 CrstInteropData = 50,
 CrstIsJMCMethod = 51,
 CrstISymUnmanagedReader = 52,
 CrstJit = 53,
 CrstJitGenericHandleCache = 54,
 CrstJitInlineTrackingMap = 55,
 CrstJitPatchpoint = 56,
 CrstJitPerf = 57,
 CrstJumpStubCache = 58,
 CrstLeafLock = 59,
 CrstListLock = 60,
 CrstLoaderAllocator = 61,
 CrstLoaderAllocatorReferences = 62,
 CrstLoaderHeap = 63,
 CrstManagedObjectWrapperMap = 64,
 CrstMethodDescBackpatchInfoTracker = 65,
 CrstMethodTableExposedObject = 66,
 CrstModule = 67,
 CrstModuleFixup = 68,
 CrstModuleLookupTable = 69,
 CrstMulticoreJitHash = 70,
 CrstMulticoreJitManager = 71,
 CrstNativeImageEagerFixups = 72,
 CrstNativeImageLoad = 73,
 CrstNls = 74,
 CrstNotifyGdb = 75,
 CrstObjectList = 76,
 CrstPEImage = 77,
 CrstPendingTypeLoadEntry = 78,
 CrstPerfMap = 79,
 CrstPgoData = 80,
 CrstPinnedByrefValidation = 81,
 CrstPinnedHeapHandleTable = 82,
 CrstProfilerGCRefDataFreeList = 83,
 CrstProfilingAPIStatus = 84,
 CrstRCWCache = 85,
 CrstRCWCleanupList = 86,
 CrstReadyToRunEntryPointToMethodDescMap = 87,
 CrstReflection = 88,
 CrstReJITGlobalRequest = 89,
 CrstRetThunkCache = 90,
 CrstSavedExceptionInfo = 91,
 CrstSaveModuleProfileData = 92,
 CrstSecurityStackwalkCache = 93,
 CrstSigConvert = 94,
 CrstSingleUseLock = 95,
 CrstSpecialStatics = 96,
 CrstStackSampler = 97,
 CrstStaticBoxInit = 98,
 CrstStressLog = 99,
 CrstStubCache = 100,
 CrstStubDispatchCache = 101,
 CrstStubUnwindInfoHeapSegments = 102,
 CrstSyncBlockCache = 103,
 CrstSyncHashLock = 104,
 CrstSystemBaseDomain = 105,
 CrstSystemDomain = 106,
 CrstSystemDomainDelayedUnloadList = 107,
 CrstThreadIdDispenser = 108,
 CrstThreadStore = 109,
 CrstTieredCompilation = 110,
 CrstTypeEquivalenceMap = 111,
 CrstTypeIDMap = 112,
 CrstUMEntryThunkCache = 113,
 CrstUMEntryThunkFreeListLock = 114,
 CrstUniqueStack = 115,
 CrstUnresolvedClassLock = 116,
 CrstUnwindInfoTableLock = 117,
 CrstVSDIndirectionCellLock = 118,
 CrstWrapperTemplate = 119,
 kNumberOfCrstTypes = 120
 CrstFCall = 35,
 CrstFrozenObjectHeap = 36,
 CrstFuncPtrStubs = 37,
 CrstFusionAppCtx = 38,
 CrstGCCover = 39,
 CrstGlobalStrLiteralMap = 40,
 CrstHandleTable = 41,
 CrstIbcProfile = 42,
 CrstIJWFixupData = 43,
 CrstIJWHash = 44,
 CrstILStubGen = 45,
 CrstInlineTrackingMap = 46,
 CrstInstMethodHashTable = 47,
 CrstInterop = 48,
 CrstInteropData = 49,
 CrstIsJMCMethod = 50,
 CrstISymUnmanagedReader = 51,
 CrstJit = 52,
 CrstJitGenericHandleCache = 53,
 CrstJitInlineTrackingMap = 54,
 CrstJitPatchpoint = 55,
 CrstJitPerf = 56,
 CrstJumpStubCache = 57,
 CrstLeafLock = 58,
 CrstListLock = 59,
 CrstLoaderAllocator = 60,
 CrstLoaderAllocatorReferences = 61,
 CrstLoaderHeap = 62,
 CrstManagedObjectWrapperMap = 63,
 CrstMethodDescBackpatchInfoTracker = 64,
 CrstMethodTableExposedObject = 65,
 CrstModule = 66,
 CrstModuleFixup = 67,
 CrstModuleLookupTable = 68,
 CrstMulticoreJitHash = 69,
 CrstMulticoreJitManager = 70,
 CrstNativeImageEagerFixups = 71,
 CrstNativeImageLoad = 72,
 CrstNls = 73,
 CrstNotifyGdb = 74,
 CrstObjectList = 75,
 CrstPEImage = 76,
 CrstPendingTypeLoadEntry = 77,
 CrstPerfMap = 78,
 CrstPgoData = 79,
 CrstPinnedByrefValidation = 80,
 CrstPinnedHeapHandleTable = 81,
 CrstProfilerGCRefDataFreeList = 82,
 CrstProfilingAPIStatus = 83,
 CrstRCWCache = 84,
 CrstRCWCleanupList = 85,
 CrstReadyToRunEntryPointToMethodDescMap = 86,
 CrstReflection = 87,
 CrstReJITGlobalRequest = 88,
 CrstRetThunkCache = 89,
 CrstSavedExceptionInfo = 90,
 CrstSaveModuleProfileData = 91,
 CrstSecurityStackwalkCache = 92,
 CrstSigConvert = 93,
 CrstSingleUseLock = 94,
 CrstSpecialStatics = 95,
 CrstStackSampler = 96,
 CrstStaticBoxInit = 97,
 CrstStressLog = 98,
 CrstStubCache = 99,
 CrstStubDispatchCache = 100,
 CrstStubUnwindInfoHeapSegments = 101,
 CrstSyncBlockCache = 102,
 CrstSyncHashLock = 103,
 CrstSystemBaseDomain = 104,
 CrstSystemDomain = 105,
 CrstSystemDomainDelayedUnloadList = 106,
 CrstThreadIdDispenser = 107,
 CrstThreadStore = 108,
 CrstTieredCompilation = 109,
 CrstTypeEquivalenceMap = 110,
 CrstTypeIDMap = 111,
 CrstUMEntryThunkCache = 112,
 CrstUMEntryThunkFreeListLock = 113,
 CrstUniqueStack = 114,
 CrstUnresolvedClassLock = 115,
 CrstUnwindInfoTableLock = 116,
 CrstVSDIndirectionCellLock = 117,
 CrstWrapperTemplate = 118,
 kNumberOfCrstTypes = 119
};

#endif // __CRST_TYPES_INCLUDED
Expand DownExpand Up@@ -181,7 +180,6 @@ int g_rgCrstLevelMap[] =
 0, // CrstException
 0, // CrstExecutableAllocatorLock
 0, // CrstExecuteManRangeLock
 0, // CrstExternalObjectContextCache
 4, // CrstFCall
 -1, // CrstFrozenObjectHeap
 7, // CrstFuncPtrStubs
Expand DownExpand Up@@ -306,7 +304,6 @@ LPCSTR g_rgCrstNameMap[] =
 "CrstException",
 "CrstExecutableAllocatorLock",
 "CrstExecuteManRangeLock",
 "CrstExternalObjectContextCache",
 "CrstFCall",
 "CrstFrozenObjectHeap",
 "CrstFuncPtrStubs",
Expand Down

62 changes: 39 additions & 23 deletions
src/coreclr/vm/interoplibinterface_comwrappers.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@

// Runtime headers
#include "common.h"
#include "simplerwlock.hpp"
#include "rcwrefcache.h"
#ifdef FEATURE_COMINTEROP_APARTMENT_SUPPORT
#include "olecontexthelpers.h"
Expand DownExpand Up@@ -257,32 +258,36 @@ namespace
 using Element = SHash<Traits>::element_t;
 using Iterator = SHash<Traits>::Iterator;

 class LockHolder : public CrstHolder
 class ReaderLock final
 {
 SimpleReadLockHolder _lock;
 public:
 LockHolder(_In_ ExtObjCxtCache *cache)
 : CrstHolder(&cache->_lock)
 {
 // This cache must be locked in Cooperative mode
 // since releases of wrappers can occur during a GC.
 CONTRACTL
 {
 NOTHROW;
 GC_NOTRIGGER;
 MODE_COOPERATIVE;
 }
 CONTRACTL_END;
 }
 ReaderLock(_In_ ExtObjCxtCache* cache)
 : _lock{ &cache->_lock }
 { }

 ~ReaderLock() = default;
 };

 class WriterLock final
 {
 SimpleWriteLockHolder _lock;
 public:
 WriterLock(_In_ ExtObjCxtCache* cache)
 : _lock{ &cache->_lock }
 { }

 ~WriterLock() = default;
 };

 private:
 friend struct InteropLibImports::RuntimeCallContext;
 SHash<Traits> _hashMap;
Crst _lock;
SimpleRWLock _lock;
 ExtObjCxtRefCache* _refCache;

 ExtObjCxtCache()
 : _lock(CrstExternalObjectContextCache, CRST_UNSAFE_COOPGC)
 : _lock(COOPERATIVE, LOCK_TYPE_DEFAULT)
 , _refCache(GetAppDomain()->GetRCWRefCache())
 { }
 ~ExtObjCxtCache() = default;
Expand All@@ -292,7 +297,7 @@ namespace
 bool IsLockHeld()
 {
 WRAPPER_NO_CONTRACT;
 return (_lock.OwnedByCurrentThread() != FALSE);
 return (_lock.LockTaken() != FALSE);
 }
#endif // _DEBUG

Expand DownExpand Up@@ -343,7 +348,7 @@ namespace
 // Determine the count of objects to return.
 SIZE_T objCountMax = 0;
 {
LockHolder lock(this);
ReaderLock lock(this);
 Iterator end = _hashMap.End();
 for (Iterator curr = _hashMap.Begin(); curr != end; ++curr)
 {
Expand All@@ -365,7 +370,7 @@ namespace
 SIZE_T objCount = 0;
 if (0 < objCountMax)
 {
LockHolder lock(this);
ReaderLock lock(this);
 Iterator end = _hashMap.End();
 for (Iterator curr = _hashMap.Begin(); curr != end; ++curr)
 {
Expand DownExpand Up@@ -823,11 +828,22 @@ namespace
 if (!uniqueInstance)
 {
 bool objectFound = false;
 bool tryRemove = false;
 {
 // Query the external object cache
 ExtObjCxtCache::LockHolder lock(cache);
 // Perform a quick look up to determine if we know of the object and if
 // we need to perform a more expensive cleanup operation below.
 ExtObjCxtCache::ReaderLock lock(cache);
 extObjCxt = cache->Find(cacheKey);
 objectFound = extObjCxt != NULL;
 tryRemove = objectFound && extObjCxt->IsSet(ExternalObjectContext::Flags_Detached);
 }

 if (tryRemove)
 {
 // Perform the slower cleanup operation that may be appropriate
 // if the object still exists and has been detached.
 ExtObjCxtCache::WriterLock lock(cache);
 extObjCxt = cache->Find(cacheKey);
 objectFound = extObjCxt != NULL;
 if (objectFound && extObjCxt->IsSet(ExternalObjectContext::Flags_Detached))
 {
Expand DownExpand Up@@ -958,7 +974,7 @@ namespace
 else
 {
 // Attempt to insert the new context into the cache.
 ExtObjCxtCache::LockHolder lock(cache);
 ExtObjCxtCache::WriterLock lock(cache);
 extObjCxt = cache->FindOrAdd(cacheKey, resultHolder.GetContext());
 }

Expand All@@ -980,7 +996,7 @@ namespace
 {
 // Failed to set the context; one must already exist.
 // Remove from the cache above as well.
 ExtObjCxtCache::LockHolder lock(cache);
 ExtObjCxtCache::WriterLock lock(cache);
 cache->Remove(resultHolder.GetContext());

 COMPlusThrow(kNotSupportedException);
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Use reader/writer lock instead of mutex for ComWrappers RCW cache#91120

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

AaronRobinsonMSFT
merged 1 commit into

from

Aug 25, 2023
 Merged


Use reader/writer lock instead of mutex for ComWrappers RCW cache
#91120
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


3 changes: 0 additions & 3 deletions
src/coreclr/inc/CrstTypes.def

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -394,9 +394,6 @@ End
Crst RCWCleanupList
End

Crst ExternalObjectContextCache
End

Crst Reflection
 AcquiredBefore LoaderHeap UnresolvedClassLock
End
Expand Down

173 changes: 85 additions & 88 deletions
src/coreclr/inc/crsttypes_generated.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -50,92 +50,91 @@ enum CrstType
 CrstException = 32,
 CrstExecutableAllocatorLock = 33,
 CrstExecuteManRangeLock = 34,
 CrstExternalObjectContextCache = 35,
 CrstFCall = 36,
 CrstFrozenObjectHeap = 37,
 CrstFuncPtrStubs = 38,
 CrstFusionAppCtx = 39,
 CrstGCCover = 40,
 CrstGlobalStrLiteralMap = 41,
 CrstHandleTable = 42,
 CrstIbcProfile = 43,
 CrstIJWFixupData = 44,
 CrstIJWHash = 45,
 CrstILStubGen = 46,
 CrstInlineTrackingMap = 47,
 CrstInstMethodHashTable = 48,
 CrstInterop = 49,
 CrstInteropData = 50,
 CrstIsJMCMethod = 51,
 CrstISymUnmanagedReader = 52,
 CrstJit = 53,
 CrstJitGenericHandleCache = 54,
 CrstJitInlineTrackingMap = 55,
 CrstJitPatchpoint = 56,
 CrstJitPerf = 57,
 CrstJumpStubCache = 58,
 CrstLeafLock = 59,
 CrstListLock = 60,
 CrstLoaderAllocator = 61,
 CrstLoaderAllocatorReferences = 62,
 CrstLoaderHeap = 63,
 CrstManagedObjectWrapperMap = 64,
 CrstMethodDescBackpatchInfoTracker = 65,
 CrstMethodTableExposedObject = 66,
 CrstModule = 67,
 CrstModuleFixup = 68,
 CrstModuleLookupTable = 69,
 CrstMulticoreJitHash = 70,
 CrstMulticoreJitManager = 71,
 CrstNativeImageEagerFixups = 72,
 CrstNativeImageLoad = 73,
 CrstNls = 74,
 CrstNotifyGdb = 75,
 CrstObjectList = 76,
 CrstPEImage = 77,
 CrstPendingTypeLoadEntry = 78,
 CrstPerfMap = 79,
 CrstPgoData = 80,
 CrstPinnedByrefValidation = 81,
 CrstPinnedHeapHandleTable = 82,
 CrstProfilerGCRefDataFreeList = 83,
 CrstProfilingAPIStatus = 84,
 CrstRCWCache = 85,
 CrstRCWCleanupList = 86,
 CrstReadyToRunEntryPointToMethodDescMap = 87,
 CrstReflection = 88,
 CrstReJITGlobalRequest = 89,
 CrstRetThunkCache = 90,
 CrstSavedExceptionInfo = 91,
 CrstSaveModuleProfileData = 92,
 CrstSecurityStackwalkCache = 93,
 CrstSigConvert = 94,
 CrstSingleUseLock = 95,
 CrstSpecialStatics = 96,
 CrstStackSampler = 97,
 CrstStaticBoxInit = 98,
 CrstStressLog = 99,
 CrstStubCache = 100,
 CrstStubDispatchCache = 101,
 CrstStubUnwindInfoHeapSegments = 102,
 CrstSyncBlockCache = 103,
 CrstSyncHashLock = 104,
 CrstSystemBaseDomain = 105,
 CrstSystemDomain = 106,
 CrstSystemDomainDelayedUnloadList = 107,
 CrstThreadIdDispenser = 108,
 CrstThreadStore = 109,
 CrstTieredCompilation = 110,
 CrstTypeEquivalenceMap = 111,
 CrstTypeIDMap = 112,
 CrstUMEntryThunkCache = 113,
 CrstUMEntryThunkFreeListLock = 114,
 CrstUniqueStack = 115,
 CrstUnresolvedClassLock = 116,
 CrstUnwindInfoTableLock = 117,
 CrstVSDIndirectionCellLock = 118,
 CrstWrapperTemplate = 119,
 kNumberOfCrstTypes = 120
 CrstFCall = 35,
 CrstFrozenObjectHeap = 36,
 CrstFuncPtrStubs = 37,
 CrstFusionAppCtx = 38,
 CrstGCCover = 39,
 CrstGlobalStrLiteralMap = 40,
 CrstHandleTable = 41,
 CrstIbcProfile = 42,
 CrstIJWFixupData = 43,
 CrstIJWHash = 44,
 CrstILStubGen = 45,
 CrstInlineTrackingMap = 46,
 CrstInstMethodHashTable = 47,
 CrstInterop = 48,
 CrstInteropData = 49,
 CrstIsJMCMethod = 50,
 CrstISymUnmanagedReader = 51,
 CrstJit = 52,
 CrstJitGenericHandleCache = 53,
 CrstJitInlineTrackingMap = 54,
 CrstJitPatchpoint = 55,
 CrstJitPerf = 56,
 CrstJumpStubCache = 57,
 CrstLeafLock = 58,
 CrstListLock = 59,
 CrstLoaderAllocator = 60,
 CrstLoaderAllocatorReferences = 61,
 CrstLoaderHeap = 62,
 CrstManagedObjectWrapperMap = 63,
 CrstMethodDescBackpatchInfoTracker = 64,
 CrstMethodTableExposedObject = 65,
 CrstModule = 66,
 CrstModuleFixup = 67,
 CrstModuleLookupTable = 68,
 CrstMulticoreJitHash = 69,
 CrstMulticoreJitManager = 70,
 CrstNativeImageEagerFixups = 71,
 CrstNativeImageLoad = 72,
 CrstNls = 73,
 CrstNotifyGdb = 74,
 CrstObjectList = 75,
 CrstPEImage = 76,
 CrstPendingTypeLoadEntry = 77,
 CrstPerfMap = 78,
 CrstPgoData = 79,
 CrstPinnedByrefValidation = 80,
 CrstPinnedHeapHandleTable = 81,
 CrstProfilerGCRefDataFreeList = 82,
 CrstProfilingAPIStatus = 83,
 CrstRCWCache = 84,
 CrstRCWCleanupList = 85,
 CrstReadyToRunEntryPointToMethodDescMap = 86,
 CrstReflection = 87,
 CrstReJITGlobalRequest = 88,
 CrstRetThunkCache = 89,
 CrstSavedExceptionInfo = 90,
 CrstSaveModuleProfileData = 91,
 CrstSecurityStackwalkCache = 92,
 CrstSigConvert = 93,
 CrstSingleUseLock = 94,
 CrstSpecialStatics = 95,
 CrstStackSampler = 96,
 CrstStaticBoxInit = 97,
 CrstStressLog = 98,
 CrstStubCache = 99,
 CrstStubDispatchCache = 100,
 CrstStubUnwindInfoHeapSegments = 101,
 CrstSyncBlockCache = 102,
 CrstSyncHashLock = 103,
 CrstSystemBaseDomain = 104,
 CrstSystemDomain = 105,
 CrstSystemDomainDelayedUnloadList = 106,
 CrstThreadIdDispenser = 107,
 CrstThreadStore = 108,
 CrstTieredCompilation = 109,
 CrstTypeEquivalenceMap = 110,
 CrstTypeIDMap = 111,
 CrstUMEntryThunkCache = 112,
 CrstUMEntryThunkFreeListLock = 113,
 CrstUniqueStack = 114,
 CrstUnresolvedClassLock = 115,
 CrstUnwindInfoTableLock = 116,
 CrstVSDIndirectionCellLock = 117,
 CrstWrapperTemplate = 118,
 kNumberOfCrstTypes = 119
};

#endif // __CRST_TYPES_INCLUDED
Expand DownExpand Up@@ -181,7 +180,6 @@ int g_rgCrstLevelMap[] =
 0, // CrstException
 0, // CrstExecutableAllocatorLock
 0, // CrstExecuteManRangeLock
 0, // CrstExternalObjectContextCache
 4, // CrstFCall
 -1, // CrstFrozenObjectHeap
 7, // CrstFuncPtrStubs
Expand DownExpand Up@@ -306,7 +304,6 @@ LPCSTR g_rgCrstNameMap[] =
 "CrstException",
 "CrstExecutableAllocatorLock",
 "CrstExecuteManRangeLock",
 "CrstExternalObjectContextCache",
 "CrstFCall",
 "CrstFrozenObjectHeap",
 "CrstFuncPtrStubs",
Expand Down

62 changes: 39 additions & 23 deletions
src/coreclr/vm/interoplibinterface_comwrappers.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@

// Runtime headers
#include "common.h"
#include "simplerwlock.hpp"
#include "rcwrefcache.h"
#ifdef FEATURE_COMINTEROP_APARTMENT_SUPPORT
#include "olecontexthelpers.h"
Expand DownExpand Up@@ -257,32 +258,36 @@ namespace
 using Element = SHash<Traits>::element_t;
 using Iterator = SHash<Traits>::Iterator;

 class LockHolder : public CrstHolder
 class ReaderLock final
 {
 SimpleReadLockHolder _lock;
 public:
 LockHolder(_In_ ExtObjCxtCache *cache)
 : CrstHolder(&cache->_lock)
 {
 // This cache must be locked in Cooperative mode
 // since releases of wrappers can occur during a GC.
 CONTRACTL
 {
 NOTHROW;
 GC_NOTRIGGER;
 MODE_COOPERATIVE;
 }
 CONTRACTL_END;
 }
 ReaderLock(_In_ ExtObjCxtCache* cache)
 : _lock{ &cache->_lock }
 { }

 ~ReaderLock() = default;
 };

 class WriterLock final
 {
 SimpleWriteLockHolder _lock;
 public:
 WriterLock(_In_ ExtObjCxtCache* cache)
 : _lock{ &cache->_lock }
 { }

 ~WriterLock() = default;
 };

 private:
 friend struct InteropLibImports::RuntimeCallContext;
 SHash<Traits> _hashMap;
Crst _lock;
SimpleRWLock _lock;
 ExtObjCxtRefCache* _refCache;

 ExtObjCxtCache()
 : _lock(CrstExternalObjectContextCache, CRST_UNSAFE_COOPGC)
 : _lock(COOPERATIVE, LOCK_TYPE_DEFAULT)
 , _refCache(GetAppDomain()->GetRCWRefCache())
 { }
 ~ExtObjCxtCache() = default;
Expand All@@ -292,7 +297,7 @@ namespace
 bool IsLockHeld()
 {
 WRAPPER_NO_CONTRACT;
 return (_lock.OwnedByCurrentThread() != FALSE);
 return (_lock.LockTaken() != FALSE);
 }
#endif // _DEBUG

Expand DownExpand Up@@ -343,7 +348,7 @@ namespace
 // Determine the count of objects to return.
 SIZE_T objCountMax = 0;
 {
LockHolder lock(this);
ReaderLock lock(this);
 Iterator end = _hashMap.End();
 for (Iterator curr = _hashMap.Begin(); curr != end; ++curr)
 {
Expand All@@ -365,7 +370,7 @@ namespace
 SIZE_T objCount = 0;
 if (0 < objCountMax)
 {
LockHolder lock(this);
ReaderLock lock(this);
 Iterator end = _hashMap.End();
 for (Iterator curr = _hashMap.Begin(); curr != end; ++curr)
 {
Expand DownExpand Up@@ -823,11 +828,22 @@ namespace
 if (!uniqueInstance)
 {
 bool objectFound = false;
 bool tryRemove = false;
 {
 // Query the external object cache
 ExtObjCxtCache::LockHolder lock(cache);
 // Perform a quick look up to determine if we know of the object and if
 // we need to perform a more expensive cleanup operation below.
 ExtObjCxtCache::ReaderLock lock(cache);
 extObjCxt = cache->Find(cacheKey);
 objectFound = extObjCxt != NULL;
 tryRemove = objectFound && extObjCxt->IsSet(ExternalObjectContext::Flags_Detached);
 }

 if (tryRemove)
 {
 // Perform the slower cleanup operation that may be appropriate
 // if the object still exists and has been detached.
 ExtObjCxtCache::WriterLock lock(cache);
 extObjCxt = cache->Find(cacheKey);
 objectFound = extObjCxt != NULL;
 if (objectFound && extObjCxt->IsSet(ExternalObjectContext::Flags_Detached))
 {
Expand DownExpand Up@@ -958,7 +974,7 @@ namespace
 else
 {
 // Attempt to insert the new context into the cache.
 ExtObjCxtCache::LockHolder lock(cache);
 ExtObjCxtCache::WriterLock lock(cache);
 extObjCxt = cache->FindOrAdd(cacheKey, resultHolder.GetContext());
 }

Expand All@@ -980,7 +996,7 @@ namespace
 {
 // Failed to set the context; one must already exist.
 // Remove from the cache above as well.
 ExtObjCxtCache::LockHolder lock(cache);
 ExtObjCxtCache::WriterLock lock(cache);
 cache->Remove(resultHolder.GetContext());

 COMPlusThrow(kNotSupportedException);
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Use reader/writer lock instead of mutex for ComWrappers RCW cache#91120

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

AaronRobinsonMSFT
merged 1 commit into

from

Aug 25, 2023
 Merged


Use reader/writer lock instead of mutex for ComWrappers RCW cache
#91120
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


3 changes: 0 additions & 3 deletions
src/coreclr/inc/CrstTypes.def

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -394,9 +394,6 @@ End
Crst RCWCleanupList
End

Crst ExternalObjectContextCache
End

Crst Reflection
 AcquiredBefore LoaderHeap UnresolvedClassLock
End
Expand Down

173 changes: 85 additions & 88 deletions
src/coreclr/inc/crsttypes_generated.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -50,92 +50,91 @@ enum CrstType
 CrstException = 32,
 CrstExecutableAllocatorLock = 33,
 CrstExecuteManRangeLock = 34,
 CrstExternalObjectContextCache = 35,
 CrstFCall = 36,
 CrstFrozenObjectHeap = 37,
 CrstFuncPtrStubs = 38,
 CrstFusionAppCtx = 39,
 CrstGCCover = 40,
 CrstGlobalStrLiteralMap = 41,
 CrstHandleTable = 42,
 CrstIbcProfile = 43,
 CrstIJWFixupData = 44,
 CrstIJWHash = 45,
 CrstILStubGen = 46,
 CrstInlineTrackingMap = 47,
 CrstInstMethodHashTable = 48,
 CrstInterop = 49,
 CrstInteropData = 50,
 CrstIsJMCMethod = 51,
 CrstISymUnmanagedReader = 52,
 CrstJit = 53,
 CrstJitGenericHandleCache = 54,
 CrstJitInlineTrackingMap = 55,
 CrstJitPatchpoint = 56,
 CrstJitPerf = 57,
 CrstJumpStubCache = 58,
 CrstLeafLock = 59,
 CrstListLock = 60,
 CrstLoaderAllocator = 61,
 CrstLoaderAllocatorReferences = 62,
 CrstLoaderHeap = 63,
 CrstManagedObjectWrapperMap = 64,
 CrstMethodDescBackpatchInfoTracker = 65,
 CrstMethodTableExposedObject = 66,
 CrstModule = 67,
 CrstModuleFixup = 68,
 CrstModuleLookupTable = 69,
 CrstMulticoreJitHash = 70,
 CrstMulticoreJitManager = 71,
 CrstNativeImageEagerFixups = 72,
 CrstNativeImageLoad = 73,
 CrstNls = 74,
 CrstNotifyGdb = 75,
 CrstObjectList = 76,
 CrstPEImage = 77,
 CrstPendingTypeLoadEntry = 78,
 CrstPerfMap = 79,
 CrstPgoData = 80,
 CrstPinnedByrefValidation = 81,
 CrstPinnedHeapHandleTable = 82,
 CrstProfilerGCRefDataFreeList = 83,
 CrstProfilingAPIStatus = 84,
 CrstRCWCache = 85,
 CrstRCWCleanupList = 86,
 CrstReadyToRunEntryPointToMethodDescMap = 87,
 CrstReflection = 88,
 CrstReJITGlobalRequest = 89,
 CrstRetThunkCache = 90,
 CrstSavedExceptionInfo = 91,
 CrstSaveModuleProfileData = 92,
 CrstSecurityStackwalkCache = 93,
 CrstSigConvert = 94,
 CrstSingleUseLock = 95,
 CrstSpecialStatics = 96,
 CrstStackSampler = 97,
 CrstStaticBoxInit = 98,
 CrstStressLog = 99,
 CrstStubCache = 100,
 CrstStubDispatchCache = 101,
 CrstStubUnwindInfoHeapSegments = 102,
 CrstSyncBlockCache = 103,
 CrstSyncHashLock = 104,
 CrstSystemBaseDomain = 105,
 CrstSystemDomain = 106,
 CrstSystemDomainDelayedUnloadList = 107,
 CrstThreadIdDispenser = 108,
 CrstThreadStore = 109,
 CrstTieredCompilation = 110,
 CrstTypeEquivalenceMap = 111,
 CrstTypeIDMap = 112,
 CrstUMEntryThunkCache = 113,
 CrstUMEntryThunkFreeListLock = 114,
 CrstUniqueStack = 115,
 CrstUnresolvedClassLock = 116,
 CrstUnwindInfoTableLock = 117,
 CrstVSDIndirectionCellLock = 118,
 CrstWrapperTemplate = 119,
 kNumberOfCrstTypes = 120
 CrstFCall = 35,
 CrstFrozenObjectHeap = 36,
 CrstFuncPtrStubs = 37,
 CrstFusionAppCtx = 38,
 CrstGCCover = 39,
 CrstGlobalStrLiteralMap = 40,
 CrstHandleTable = 41,
 CrstIbcProfile = 42,
 CrstIJWFixupData = 43,
 CrstIJWHash = 44,
 CrstILStubGen = 45,
 CrstInlineTrackingMap = 46,
 CrstInstMethodHashTable = 47,
 CrstInterop = 48,
 CrstInteropData = 49,
 CrstIsJMCMethod = 50,
 CrstISymUnmanagedReader = 51,
 CrstJit = 52,
 CrstJitGenericHandleCache = 53,
 CrstJitInlineTrackingMap = 54,
 CrstJitPatchpoint = 55,
 CrstJitPerf = 56,
 CrstJumpStubCache = 57,
 CrstLeafLock = 58,
 CrstListLock = 59,
 CrstLoaderAllocator = 60,
 CrstLoaderAllocatorReferences = 61,
 CrstLoaderHeap = 62,
 CrstManagedObjectWrapperMap = 63,
 CrstMethodDescBackpatchInfoTracker = 64,
 CrstMethodTableExposedObject = 65,
 CrstModule = 66,
 CrstModuleFixup = 67,
 CrstModuleLookupTable = 68,
 CrstMulticoreJitHash = 69,
 CrstMulticoreJitManager = 70,
 CrstNativeImageEagerFixups = 71,
 CrstNativeImageLoad = 72,
 CrstNls = 73,
 CrstNotifyGdb = 74,
 CrstObjectList = 75,
 CrstPEImage = 76,
 CrstPendingTypeLoadEntry = 77,
 CrstPerfMap = 78,
 CrstPgoData = 79,
 CrstPinnedByrefValidation = 80,
 CrstPinnedHeapHandleTable = 81,
 CrstProfilerGCRefDataFreeList = 82,
 CrstProfilingAPIStatus = 83,
 CrstRCWCache = 84,
 CrstRCWCleanupList = 85,
 CrstReadyToRunEntryPointToMethodDescMap = 86,
 CrstReflection = 87,
 CrstReJITGlobalRequest = 88,
 CrstRetThunkCache = 89,
 CrstSavedExceptionInfo = 90,
 CrstSaveModuleProfileData = 91,
 CrstSecurityStackwalkCache = 92,
 CrstSigConvert = 93,
 CrstSingleUseLock = 94,
 CrstSpecialStatics = 95,
 CrstStackSampler = 96,
 CrstStaticBoxInit = 97,
 CrstStressLog = 98,
 CrstStubCache = 99,
 CrstStubDispatchCache = 100,
 CrstStubUnwindInfoHeapSegments = 101,
 CrstSyncBlockCache = 102,
 CrstSyncHashLock = 103,
 CrstSystemBaseDomain = 104,
 CrstSystemDomain = 105,
 CrstSystemDomainDelayedUnloadList = 106,
 CrstThreadIdDispenser = 107,
 CrstThreadStore = 108,
 CrstTieredCompilation = 109,
 CrstTypeEquivalenceMap = 110,
 CrstTypeIDMap = 111,
 CrstUMEntryThunkCache = 112,
 CrstUMEntryThunkFreeListLock = 113,
 CrstUniqueStack = 114,
 CrstUnresolvedClassLock = 115,
 CrstUnwindInfoTableLock = 116,
 CrstVSDIndirectionCellLock = 117,
 CrstWrapperTemplate = 118,
 kNumberOfCrstTypes = 119
};

#endif // __CRST_TYPES_INCLUDED
Expand DownExpand Up@@ -181,7 +180,6 @@ int g_rgCrstLevelMap[] =
 0, // CrstException
 0, // CrstExecutableAllocatorLock
 0, // CrstExecuteManRangeLock
 0, // CrstExternalObjectContextCache
 4, // CrstFCall
 -1, // CrstFrozenObjectHeap
 7, // CrstFuncPtrStubs
Expand DownExpand Up@@ -306,7 +304,6 @@ LPCSTR g_rgCrstNameMap[] =
 "CrstException",
 "CrstExecutableAllocatorLock",
 "CrstExecuteManRangeLock",
 "CrstExternalObjectContextCache",
 "CrstFCall",
 "CrstFrozenObjectHeap",
 "CrstFuncPtrStubs",
Expand Down

62 changes: 39 additions & 23 deletions
src/coreclr/vm/interoplibinterface_comwrappers.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@

// Runtime headers
#include "common.h"
#include "simplerwlock.hpp"
#include "rcwrefcache.h"
#ifdef FEATURE_COMINTEROP_APARTMENT_SUPPORT
#include "olecontexthelpers.h"
Expand DownExpand Up@@ -257,32 +258,36 @@ namespace
 using Element = SHash<Traits>::element_t;
 using Iterator = SHash<Traits>::Iterator;

 class LockHolder : public CrstHolder
 class ReaderLock final
 {
 SimpleReadLockHolder _lock;
 public:
 LockHolder(_In_ ExtObjCxtCache *cache)
 : CrstHolder(&cache->_lock)
 {
 // This cache must be locked in Cooperative mode
 // since releases of wrappers can occur during a GC.
 CONTRACTL
 {
 NOTHROW;
 GC_NOTRIGGER;
 MODE_COOPERATIVE;
 }
 CONTRACTL_END;
 }
 ReaderLock(_In_ ExtObjCxtCache* cache)
 : _lock{ &cache->_lock }
 { }

 ~ReaderLock() = default;
 };

 class WriterLock final
 {
 SimpleWriteLockHolder _lock;
 public:
 WriterLock(_In_ ExtObjCxtCache* cache)
 : _lock{ &cache->_lock }
 { }

 ~WriterLock() = default;
 };

 private:
 friend struct InteropLibImports::RuntimeCallContext;
 SHash<Traits> _hashMap;
Crst _lock;
SimpleRWLock _lock;
 ExtObjCxtRefCache* _refCache;

 ExtObjCxtCache()
 : _lock(CrstExternalObjectContextCache, CRST_UNSAFE_COOPGC)
 : _lock(COOPERATIVE, LOCK_TYPE_DEFAULT)
 , _refCache(GetAppDomain()->GetRCWRefCache())
 { }
 ~ExtObjCxtCache() = default;
Expand All@@ -292,7 +297,7 @@ namespace
 bool IsLockHeld()
 {
 WRAPPER_NO_CONTRACT;
 return (_lock.OwnedByCurrentThread() != FALSE);
 return (_lock.LockTaken() != FALSE);
 }
#endif // _DEBUG

Expand DownExpand Up@@ -343,7 +348,7 @@ namespace
 // Determine the count of objects to return.
 SIZE_T objCountMax = 0;
 {
LockHolder lock(this);
ReaderLock lock(this);
 Iterator end = _hashMap.End();
 for (Iterator curr = _hashMap.Begin(); curr != end; ++curr)
 {
Expand All@@ -365,7 +370,7 @@ namespace
 SIZE_T objCount = 0;
 if (0 < objCountMax)
 {
LockHolder lock(this);
ReaderLock lock(this);
 Iterator end = _hashMap.End();
 for (Iterator curr = _hashMap.Begin(); curr != end; ++curr)
 {
Expand DownExpand Up@@ -823,11 +828,22 @@ namespace
 if (!uniqueInstance)
 {
 bool objectFound = false;
 bool tryRemove = false;
 {
 // Query the external object cache
 ExtObjCxtCache::LockHolder lock(cache);
 // Perform a quick look up to determine if we know of the object and if
 // we need to perform a more expensive cleanup operation below.
 ExtObjCxtCache::ReaderLock lock(cache);
 extObjCxt = cache->Find(cacheKey);
 objectFound = extObjCxt != NULL;
 tryRemove = objectFound && extObjCxt->IsSet(ExternalObjectContext::Flags_Detached);
 }

 if (tryRemove)
 {
 // Perform the slower cleanup operation that may be appropriate
 // if the object still exists and has been detached.
 ExtObjCxtCache::WriterLock lock(cache);
 extObjCxt = cache->Find(cacheKey);
 objectFound = extObjCxt != NULL;
 if (objectFound && extObjCxt->IsSet(ExternalObjectContext::Flags_Detached))
 {
Expand DownExpand Up@@ -958,7 +974,7 @@ namespace
 else
 {
 // Attempt to insert the new context into the cache.
 ExtObjCxtCache::LockHolder lock(cache);
 ExtObjCxtCache::WriterLock lock(cache);
 extObjCxt = cache->FindOrAdd(cacheKey, resultHolder.GetContext());
 }

Expand All@@ -980,7 +996,7 @@ namespace
 {
 // Failed to set the context; one must already exist.
 // Remove from the cache above as well.
 ExtObjCxtCache::LockHolder lock(cache);
 ExtObjCxtCache::WriterLock lock(cache);
 cache->Remove(resultHolder.GetContext());

 COMPlusThrow(kNotSupportedException);
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Use reader/writer lock instead of mutex for ComWrappers RCW cache#91120

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

AaronRobinsonMSFT
merged 1 commit into

from

Aug 25, 2023
 Merged


Use reader/writer lock instead of mutex for ComWrappers RCW cache
#91120
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


3 changes: 0 additions & 3 deletions
src/coreclr/inc/CrstTypes.def

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -394,9 +394,6 @@ End
Crst RCWCleanupList
End

Crst ExternalObjectContextCache
End

Crst Reflection
 AcquiredBefore LoaderHeap UnresolvedClassLock
End
Expand Down

173 changes: 85 additions & 88 deletions
src/coreclr/inc/crsttypes_generated.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -50,92 +50,91 @@ enum CrstType
 CrstException = 32,
 CrstExecutableAllocatorLock = 33,
 CrstExecuteManRangeLock = 34,
 CrstExternalObjectContextCache = 35,
 CrstFCall = 36,
 CrstFrozenObjectHeap = 37,
 CrstFuncPtrStubs = 38,
 CrstFusionAppCtx = 39,
 CrstGCCover = 40,
 CrstGlobalStrLiteralMap = 41,
 CrstHandleTable = 42,
 CrstIbcProfile = 43,
 CrstIJWFixupData = 44,
 CrstIJWHash = 45,
 CrstILStubGen = 46,
 CrstInlineTrackingMap = 47,
 CrstInstMethodHashTable = 48,
 CrstInterop = 49,
 CrstInteropData = 50,
 CrstIsJMCMethod = 51,
 CrstISymUnmanagedReader = 52,
 CrstJit = 53,
 CrstJitGenericHandleCache = 54,
 CrstJitInlineTrackingMap = 55,
 CrstJitPatchpoint = 56,
 CrstJitPerf = 57,
 CrstJumpStubCache = 58,
 CrstLeafLock = 59,
 CrstListLock = 60,
 CrstLoaderAllocator = 61,
 CrstLoaderAllocatorReferences = 62,
 CrstLoaderHeap = 63,
 CrstManagedObjectWrapperMap = 64,
 CrstMethodDescBackpatchInfoTracker = 65,
 CrstMethodTableExposedObject = 66,
 CrstModule = 67,
 CrstModuleFixup = 68,
 CrstModuleLookupTable = 69,
 CrstMulticoreJitHash = 70,
 CrstMulticoreJitManager = 71,
 CrstNativeImageEagerFixups = 72,
 CrstNativeImageLoad = 73,
 CrstNls = 74,
 CrstNotifyGdb = 75,
 CrstObjectList = 76,
 CrstPEImage = 77,
 CrstPendingTypeLoadEntry = 78,
 CrstPerfMap = 79,
 CrstPgoData = 80,
 CrstPinnedByrefValidation = 81,
 CrstPinnedHeapHandleTable = 82,
 CrstProfilerGCRefDataFreeList = 83,
 CrstProfilingAPIStatus = 84,
 CrstRCWCache = 85,
 CrstRCWCleanupList = 86,
 CrstReadyToRunEntryPointToMethodDescMap = 87,
 CrstReflection = 88,
 CrstReJITGlobalRequest = 89,
 CrstRetThunkCache = 90,
 CrstSavedExceptionInfo = 91,
 CrstSaveModuleProfileData = 92,
 CrstSecurityStackwalkCache = 93,
 CrstSigConvert = 94,
 CrstSingleUseLock = 95,
 CrstSpecialStatics = 96,
 CrstStackSampler = 97,
 CrstStaticBoxInit = 98,
 CrstStressLog = 99,
 CrstStubCache = 100,
 CrstStubDispatchCache = 101,
 CrstStubUnwindInfoHeapSegments = 102,
 CrstSyncBlockCache = 103,
 CrstSyncHashLock = 104,
 CrstSystemBaseDomain = 105,
 CrstSystemDomain = 106,
 CrstSystemDomainDelayedUnloadList = 107,
 CrstThreadIdDispenser = 108,
 CrstThreadStore = 109,
 CrstTieredCompilation = 110,
 CrstTypeEquivalenceMap = 111,
 CrstTypeIDMap = 112,
 CrstUMEntryThunkCache = 113,
 CrstUMEntryThunkFreeListLock = 114,
 CrstUniqueStack = 115,
 CrstUnresolvedClassLock = 116,
 CrstUnwindInfoTableLock = 117,
 CrstVSDIndirectionCellLock = 118,
 CrstWrapperTemplate = 119,
 kNumberOfCrstTypes = 120
 CrstFCall = 35,
 CrstFrozenObjectHeap = 36,
 CrstFuncPtrStubs = 37,
 CrstFusionAppCtx = 38,
 CrstGCCover = 39,
 CrstGlobalStrLiteralMap = 40,
 CrstHandleTable = 41,
 CrstIbcProfile = 42,
 CrstIJWFixupData = 43,
 CrstIJWHash = 44,
 CrstILStubGen = 45,
 CrstInlineTrackingMap = 46,
 CrstInstMethodHashTable = 47,
 CrstInterop = 48,
 CrstInteropData = 49,
 CrstIsJMCMethod = 50,
 CrstISymUnmanagedReader = 51,
 CrstJit = 52,
 CrstJitGenericHandleCache = 53,
 CrstJitInlineTrackingMap = 54,
 CrstJitPatchpoint = 55,
 CrstJitPerf = 56,
 CrstJumpStubCache = 57,
 CrstLeafLock = 58,
 CrstListLock = 59,
 CrstLoaderAllocator = 60,
 CrstLoaderAllocatorReferences = 61,
 CrstLoaderHeap = 62,
 CrstManagedObjectWrapperMap = 63,
 CrstMethodDescBackpatchInfoTracker = 64,
 CrstMethodTableExposedObject = 65,
 CrstModule = 66,
 CrstModuleFixup = 67,
 CrstModuleLookupTable = 68,
 CrstMulticoreJitHash = 69,
 CrstMulticoreJitManager = 70,
 CrstNativeImageEagerFixups = 71,
 CrstNativeImageLoad = 72,
 CrstNls = 73,
 CrstNotifyGdb = 74,
 CrstObjectList = 75,
 CrstPEImage = 76,
 CrstPendingTypeLoadEntry = 77,
 CrstPerfMap = 78,
 CrstPgoData = 79,
 CrstPinnedByrefValidation = 80,
 CrstPinnedHeapHandleTable = 81,
 CrstProfilerGCRefDataFreeList = 82,
 CrstProfilingAPIStatus = 83,
 CrstRCWCache = 84,
 CrstRCWCleanupList = 85,
 CrstReadyToRunEntryPointToMethodDescMap = 86,
 CrstReflection = 87,
 CrstReJITGlobalRequest = 88,
 CrstRetThunkCache = 89,
 CrstSavedExceptionInfo = 90,
 CrstSaveModuleProfileData = 91,
 CrstSecurityStackwalkCache = 92,
 CrstSigConvert = 93,
 CrstSingleUseLock = 94,
 CrstSpecialStatics = 95,
 CrstStackSampler = 96,
 CrstStaticBoxInit = 97,
 CrstStressLog = 98,
 CrstStubCache = 99,
 CrstStubDispatchCache = 100,
 CrstStubUnwindInfoHeapSegments = 101,
 CrstSyncBlockCache = 102,
 CrstSyncHashLock = 103,
 CrstSystemBaseDomain = 104,
 CrstSystemDomain = 105,
 CrstSystemDomainDelayedUnloadList = 106,
 CrstThreadIdDispenser = 107,
 CrstThreadStore = 108,
 CrstTieredCompilation = 109,
 CrstTypeEquivalenceMap = 110,
 CrstTypeIDMap = 111,
 CrstUMEntryThunkCache = 112,
 CrstUMEntryThunkFreeListLock = 113,
 CrstUniqueStack = 114,
 CrstUnresolvedClassLock = 115,
 CrstUnwindInfoTableLock = 116,
 CrstVSDIndirectionCellLock = 117,
 CrstWrapperTemplate = 118,
 kNumberOfCrstTypes = 119
};

#endif // __CRST_TYPES_INCLUDED
Expand DownExpand Up@@ -181,7 +180,6 @@ int g_rgCrstLevelMap[] =
 0, // CrstException
 0, // CrstExecutableAllocatorLock
 0, // CrstExecuteManRangeLock
 0, // CrstExternalObjectContextCache
 4, // CrstFCall
 -1, // CrstFrozenObjectHeap
 7, // CrstFuncPtrStubs
Expand DownExpand Up@@ -306,7 +304,6 @@ LPCSTR g_rgCrstNameMap[] =
 "CrstException",
 "CrstExecutableAllocatorLock",
 "CrstExecuteManRangeLock",
 "CrstExternalObjectContextCache",
 "CrstFCall",
 "CrstFrozenObjectHeap",
 "CrstFuncPtrStubs",
Expand Down

62 changes: 39 additions & 23 deletions
src/coreclr/vm/interoplibinterface_comwrappers.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@

// Runtime headers
#include "common.h"
#include "simplerwlock.hpp"
#include "rcwrefcache.h"
#ifdef FEATURE_COMINTEROP_APARTMENT_SUPPORT
#include "olecontexthelpers.h"
Expand DownExpand Up@@ -257,32 +258,36 @@ namespace
 using Element = SHash<Traits>::element_t;
 using Iterator = SHash<Traits>::Iterator;

 class LockHolder : public CrstHolder
 class ReaderLock final
 {
 SimpleReadLockHolder _lock;
 public:
 LockHolder(_In_ ExtObjCxtCache *cache)
 : CrstHolder(&cache->_lock)
 {
 // This cache must be locked in Cooperative mode
 // since releases of wrappers can occur during a GC.
 CONTRACTL
 {
 NOTHROW;
 GC_NOTRIGGER;
 MODE_COOPERATIVE;
 }
 CONTRACTL_END;
 }
 ReaderLock(_In_ ExtObjCxtCache* cache)
 : _lock{ &cache->_lock }
 { }

 ~ReaderLock() = default;
 };

 class WriterLock final
 {
 SimpleWriteLockHolder _lock;
 public:
 WriterLock(_In_ ExtObjCxtCache* cache)
 : _lock{ &cache->_lock }
 { }

 ~WriterLock() = default;
 };

 private:
 friend struct InteropLibImports::RuntimeCallContext;
 SHash<Traits> _hashMap;
Crst _lock;
SimpleRWLock _lock;
 ExtObjCxtRefCache* _refCache;

 ExtObjCxtCache()
 : _lock(CrstExternalObjectContextCache, CRST_UNSAFE_COOPGC)
 : _lock(COOPERATIVE, LOCK_TYPE_DEFAULT)
 , _refCache(GetAppDomain()->GetRCWRefCache())
 { }
 ~ExtObjCxtCache() = default;
Expand All@@ -292,7 +297,7 @@ namespace
 bool IsLockHeld()
 {
 WRAPPER_NO_CONTRACT;
 return (_lock.OwnedByCurrentThread() != FALSE);
 return (_lock.LockTaken() != FALSE);
 }
#endif // _DEBUG

Expand DownExpand Up@@ -343,7 +348,7 @@ namespace
 // Determine the count of objects to return.
 SIZE_T objCountMax = 0;
 {
LockHolder lock(this);
ReaderLock lock(this);
 Iterator end = _hashMap.End();
 for (Iterator curr = _hashMap.Begin(); curr != end; ++curr)
 {
Expand All@@ -365,7 +370,7 @@ namespace
 SIZE_T objCount = 0;
 if (0 < objCountMax)
 {
LockHolder lock(this);
ReaderLock lock(this);
 Iterator end = _hashMap.End();
 for (Iterator curr = _hashMap.Begin(); curr != end; ++curr)
 {
Expand DownExpand Up@@ -823,11 +828,22 @@ namespace
 if (!uniqueInstance)
 {
 bool objectFound = false;
 bool tryRemove = false;
 {
 // Query the external object cache
 ExtObjCxtCache::LockHolder lock(cache);
 // Perform a quick look up to determine if we know of the object and if
 // we need to perform a more expensive cleanup operation below.
 ExtObjCxtCache::ReaderLock lock(cache);
 extObjCxt = cache->Find(cacheKey);
 objectFound = extObjCxt != NULL;
 tryRemove = objectFound && extObjCxt->IsSet(ExternalObjectContext::Flags_Detached);
 }

 if (tryRemove)
 {
 // Perform the slower cleanup operation that may be appropriate
 // if the object still exists and has been detached.
 ExtObjCxtCache::WriterLock lock(cache);
 extObjCxt = cache->Find(cacheKey);
 objectFound = extObjCxt != NULL;
 if (objectFound && extObjCxt->IsSet(ExternalObjectContext::Flags_Detached))
 {
Expand DownExpand Up@@ -958,7 +974,7 @@ namespace
 else
 {
 // Attempt to insert the new context into the cache.
 ExtObjCxtCache::LockHolder lock(cache);
 ExtObjCxtCache::WriterLock lock(cache);
 extObjCxt = cache->FindOrAdd(cacheKey, resultHolder.GetContext());
 }

Expand All@@ -980,7 +996,7 @@ namespace
 {
 // Failed to set the context; one must already exist.
 // Remove from the cache above as well.
 ExtObjCxtCache::LockHolder lock(cache);
 ExtObjCxtCache::WriterLock lock(cache);
 cache->Remove(resultHolder.GetContext());

 COMPlusThrow(kNotSupportedException);
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Use reader/writer lock instead of mutex for ComWrappers RCW cache#91120

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

AaronRobinsonMSFT
merged 1 commit into

from

Aug 25, 2023
 Merged


Use reader/writer lock instead of mutex for ComWrappers RCW cache
#91120
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


3 changes: 0 additions & 3 deletions
src/coreclr/inc/CrstTypes.def

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -394,9 +394,6 @@ End
Crst RCWCleanupList
End

Crst ExternalObjectContextCache
End

Crst Reflection
 AcquiredBefore LoaderHeap UnresolvedClassLock
End
Expand Down

173 changes: 85 additions & 88 deletions
src/coreclr/inc/crsttypes_generated.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -50,92 +50,91 @@ enum CrstType
 CrstException = 32,
 CrstExecutableAllocatorLock = 33,
 CrstExecuteManRangeLock = 34,
 CrstExternalObjectContextCache = 35,
 CrstFCall = 36,
 CrstFrozenObjectHeap = 37,
 CrstFuncPtrStubs = 38,
 CrstFusionAppCtx = 39,
 CrstGCCover = 40,
 CrstGlobalStrLiteralMap = 41,
 CrstHandleTable = 42,
 CrstIbcProfile = 43,
 CrstIJWFixupData = 44,
 CrstIJWHash = 45,
 CrstILStubGen = 46,
 CrstInlineTrackingMap = 47,
 CrstInstMethodHashTable = 48,
 CrstInterop = 49,
 CrstInteropData = 50,
 CrstIsJMCMethod = 51,
 CrstISymUnmanagedReader = 52,
 CrstJit = 53,
 CrstJitGenericHandleCache = 54,
 CrstJitInlineTrackingMap = 55,
 CrstJitPatchpoint = 56,
 CrstJitPerf = 57,
 CrstJumpStubCache = 58,
 CrstLeafLock = 59,
 CrstListLock = 60,
 CrstLoaderAllocator = 61,
 CrstLoaderAllocatorReferences = 62,
 CrstLoaderHeap = 63,
 CrstManagedObjectWrapperMap = 64,
 CrstMethodDescBackpatchInfoTracker = 65,
 CrstMethodTableExposedObject = 66,
 CrstModule = 67,
 CrstModuleFixup = 68,
 CrstModuleLookupTable = 69,
 CrstMulticoreJitHash = 70,
 CrstMulticoreJitManager = 71,
 CrstNativeImageEagerFixups = 72,
 CrstNativeImageLoad = 73,
 CrstNls = 74,
 CrstNotifyGdb = 75,
 CrstObjectList = 76,
 CrstPEImage = 77,
 CrstPendingTypeLoadEntry = 78,
 CrstPerfMap = 79,
 CrstPgoData = 80,
 CrstPinnedByrefValidation = 81,
 CrstPinnedHeapHandleTable = 82,
 CrstProfilerGCRefDataFreeList = 83,
 CrstProfilingAPIStatus = 84,
 CrstRCWCache = 85,
 CrstRCWCleanupList = 86,
 CrstReadyToRunEntryPointToMethodDescMap = 87,
 CrstReflection = 88,
 CrstReJITGlobalRequest = 89,
 CrstRetThunkCache = 90,
 CrstSavedExceptionInfo = 91,
 CrstSaveModuleProfileData = 92,
 CrstSecurityStackwalkCache = 93,
 CrstSigConvert = 94,
 CrstSingleUseLock = 95,
 CrstSpecialStatics = 96,
 CrstStackSampler = 97,
 CrstStaticBoxInit = 98,
 CrstStressLog = 99,
 CrstStubCache = 100,
 CrstStubDispatchCache = 101,
 CrstStubUnwindInfoHeapSegments = 102,
 CrstSyncBlockCache = 103,
 CrstSyncHashLock = 104,
 CrstSystemBaseDomain = 105,
 CrstSystemDomain = 106,
 CrstSystemDomainDelayedUnloadList = 107,
 CrstThreadIdDispenser = 108,
 CrstThreadStore = 109,
 CrstTieredCompilation = 110,
 CrstTypeEquivalenceMap = 111,
 CrstTypeIDMap = 112,
 CrstUMEntryThunkCache = 113,
 CrstUMEntryThunkFreeListLock = 114,
 CrstUniqueStack = 115,
 CrstUnresolvedClassLock = 116,
 CrstUnwindInfoTableLock = 117,
 CrstVSDIndirectionCellLock = 118,
 CrstWrapperTemplate = 119,
 kNumberOfCrstTypes = 120
 CrstFCall = 35,
 CrstFrozenObjectHeap = 36,
 CrstFuncPtrStubs = 37,
 CrstFusionAppCtx = 38,
 CrstGCCover = 39,
 CrstGlobalStrLiteralMap = 40,
 CrstHandleTable = 41,
 CrstIbcProfile = 42,
 CrstIJWFixupData = 43,
 CrstIJWHash = 44,
 CrstILStubGen = 45,
 CrstInlineTrackingMap = 46,
 CrstInstMethodHashTable = 47,
 CrstInterop = 48,
 CrstInteropData = 49,
 CrstIsJMCMethod = 50,
 CrstISymUnmanagedReader = 51,
 CrstJit = 52,
 CrstJitGenericHandleCache = 53,
 CrstJitInlineTrackingMap = 54,
 CrstJitPatchpoint = 55,
 CrstJitPerf = 56,
 CrstJumpStubCache = 57,
 CrstLeafLock = 58,
 CrstListLock = 59,
 CrstLoaderAllocator = 60,
 CrstLoaderAllocatorReferences = 61,
 CrstLoaderHeap = 62,
 CrstManagedObjectWrapperMap = 63,
 CrstMethodDescBackpatchInfoTracker = 64,
 CrstMethodTableExposedObject = 65,
 CrstModule = 66,
 CrstModuleFixup = 67,
 CrstModuleLookupTable = 68,
 CrstMulticoreJitHash = 69,
 CrstMulticoreJitManager = 70,
 CrstNativeImageEagerFixups = 71,
 CrstNativeImageLoad = 72,
 CrstNls = 73,
 CrstNotifyGdb = 74,
 CrstObjectList = 75,
 CrstPEImage = 76,
 CrstPendingTypeLoadEntry = 77,
 CrstPerfMap = 78,
 CrstPgoData = 79,
 CrstPinnedByrefValidation = 80,
 CrstPinnedHeapHandleTable = 81,
 CrstProfilerGCRefDataFreeList = 82,
 CrstProfilingAPIStatus = 83,
 CrstRCWCache = 84,
 CrstRCWCleanupList = 85,
 CrstReadyToRunEntryPointToMethodDescMap = 86,
 CrstReflection = 87,
 CrstReJITGlobalRequest = 88,
 CrstRetThunkCache = 89,
 CrstSavedExceptionInfo = 90,
 CrstSaveModuleProfileData = 91,
 CrstSecurityStackwalkCache = 92,
 CrstSigConvert = 93,
 CrstSingleUseLock = 94,
 CrstSpecialStatics = 95,
 CrstStackSampler = 96,
 CrstStaticBoxInit = 97,
 CrstStressLog = 98,
 CrstStubCache = 99,
 CrstStubDispatchCache = 100,
 CrstStubUnwindInfoHeapSegments = 101,
 CrstSyncBlockCache = 102,
 CrstSyncHashLock = 103,
 CrstSystemBaseDomain = 104,
 CrstSystemDomain = 105,
 CrstSystemDomainDelayedUnloadList = 106,
 CrstThreadIdDispenser = 107,
 CrstThreadStore = 108,
 CrstTieredCompilation = 109,
 CrstTypeEquivalenceMap = 110,
 CrstTypeIDMap = 111,
 CrstUMEntryThunkCache = 112,
 CrstUMEntryThunkFreeListLock = 113,
 CrstUniqueStack = 114,
 CrstUnresolvedClassLock = 115,
 CrstUnwindInfoTableLock = 116,
 CrstVSDIndirectionCellLock = 117,
 CrstWrapperTemplate = 118,
 kNumberOfCrstTypes = 119
};

#endif // __CRST_TYPES_INCLUDED
Expand DownExpand Up@@ -181,7 +180,6 @@ int g_rgCrstLevelMap[] =
 0, // CrstException
 0, // CrstExecutableAllocatorLock
 0, // CrstExecuteManRangeLock
 0, // CrstExternalObjectContextCache
 4, // CrstFCall
 -1, // CrstFrozenObjectHeap
 7, // CrstFuncPtrStubs
Expand DownExpand Up@@ -306,7 +304,6 @@ LPCSTR g_rgCrstNameMap[] =
 "CrstException",
 "CrstExecutableAllocatorLock",
 "CrstExecuteManRangeLock",
 "CrstExternalObjectContextCache",
 "CrstFCall",
 "CrstFrozenObjectHeap",
 "CrstFuncPtrStubs",
Expand Down

62 changes: 39 additions & 23 deletions
src/coreclr/vm/interoplibinterface_comwrappers.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@

// Runtime headers
#include "common.h"
#include "simplerwlock.hpp"
#include "rcwrefcache.h"
#ifdef FEATURE_COMINTEROP_APARTMENT_SUPPORT
#include "olecontexthelpers.h"
Expand DownExpand Up@@ -257,32 +258,36 @@ namespace
 using Element = SHash<Traits>::element_t;
 using Iterator = SHash<Traits>::Iterator;

 class LockHolder : public CrstHolder
 class ReaderLock final
 {
 SimpleReadLockHolder _lock;
 public:
 LockHolder(_In_ ExtObjCxtCache *cache)
 : CrstHolder(&cache->_lock)
 {
 // This cache must be locked in Cooperative mode
 // since releases of wrappers can occur during a GC.
 CONTRACTL
 {
 NOTHROW;
 GC_NOTRIGGER;
 MODE_COOPERATIVE;
 }
 CONTRACTL_END;
 }
 ReaderLock(_In_ ExtObjCxtCache* cache)
 : _lock{ &cache->_lock }
 { }

 ~ReaderLock() = default;
 };

 class WriterLock final
 {
 SimpleWriteLockHolder _lock;
 public:
 WriterLock(_In_ ExtObjCxtCache* cache)
 : _lock{ &cache->_lock }
 { }

 ~WriterLock() = default;
 };

 private:
 friend struct InteropLibImports::RuntimeCallContext;
 SHash<Traits> _hashMap;
Crst _lock;
SimpleRWLock _lock;
 ExtObjCxtRefCache* _refCache;

 ExtObjCxtCache()
 : _lock(CrstExternalObjectContextCache, CRST_UNSAFE_COOPGC)
 : _lock(COOPERATIVE, LOCK_TYPE_DEFAULT)
 , _refCache(GetAppDomain()->GetRCWRefCache())
 { }
 ~ExtObjCxtCache() = default;
Expand All@@ -292,7 +297,7 @@ namespace
 bool IsLockHeld()
 {
 WRAPPER_NO_CONTRACT;
 return (_lock.OwnedByCurrentThread() != FALSE);
 return (_lock.LockTaken() != FALSE);
 }
#endif // _DEBUG

Expand DownExpand Up@@ -343,7 +348,7 @@ namespace
 // Determine the count of objects to return.
 SIZE_T objCountMax = 0;
 {
LockHolder lock(this);
ReaderLock lock(this);
 Iterator end = _hashMap.End();
 for (Iterator curr = _hashMap.Begin(); curr != end; ++curr)
 {
Expand All@@ -365,7 +370,7 @@ namespace
 SIZE_T objCount = 0;
 if (0 < objCountMax)
 {
LockHolder lock(this);
ReaderLock lock(this);
 Iterator end = _hashMap.End();
 for (Iterator curr = _hashMap.Begin(); curr != end; ++curr)
 {
Expand DownExpand Up@@ -823,11 +828,22 @@ namespace
 if (!uniqueInstance)
 {
 bool objectFound = false;
 bool tryRemove = false;
 {
 // Query the external object cache
 ExtObjCxtCache::LockHolder lock(cache);
 // Perform a quick look up to determine if we know of the object and if
 // we need to perform a more expensive cleanup operation below.
 ExtObjCxtCache::ReaderLock lock(cache);
 extObjCxt = cache->Find(cacheKey);
 objectFound = extObjCxt != NULL;
 tryRemove = objectFound && extObjCxt->IsSet(ExternalObjectContext::Flags_Detached);
 }

 if (tryRemove)
 {
 // Perform the slower cleanup operation that may be appropriate
 // if the object still exists and has been detached.
 ExtObjCxtCache::WriterLock lock(cache);
 extObjCxt = cache->Find(cacheKey);
 objectFound = extObjCxt != NULL;
 if (objectFound && extObjCxt->IsSet(ExternalObjectContext::Flags_Detached))
 {
Expand DownExpand Up@@ -958,7 +974,7 @@ namespace
 else
 {
 // Attempt to insert the new context into the cache.
 ExtObjCxtCache::LockHolder lock(cache);
 ExtObjCxtCache::WriterLock lock(cache);
 extObjCxt = cache->FindOrAdd(cacheKey, resultHolder.GetContext());
 }

Expand All@@ -980,7 +996,7 @@ namespace
 {
 // Failed to set the context; one must already exist.
 // Remove from the cache above as well.
 ExtObjCxtCache::LockHolder lock(cache);
 ExtObjCxtCache::WriterLock lock(cache);
 cache->Remove(resultHolder.GetContext());

 COMPlusThrow(kNotSupportedException);
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Use reader/writer lock instead of mutex for ComWrappers RCW cache#91120

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

AaronRobinsonMSFT
merged 1 commit into

from

Aug 25, 2023
 Merged


Use reader/writer lock instead of mutex for ComWrappers RCW cache
#91120
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


3 changes: 0 additions & 3 deletions
src/coreclr/inc/CrstTypes.def

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -394,9 +394,6 @@ End
Crst RCWCleanupList
End

Crst ExternalObjectContextCache
End

Crst Reflection
 AcquiredBefore LoaderHeap UnresolvedClassLock
End
Expand Down

173 changes: 85 additions & 88 deletions
src/coreclr/inc/crsttypes_generated.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -50,92 +50,91 @@ enum CrstType
 CrstException = 32,
 CrstExecutableAllocatorLock = 33,
 CrstExecuteManRangeLock = 34,
 CrstExternalObjectContextCache = 35,
 CrstFCall = 36,
 CrstFrozenObjectHeap = 37,
 CrstFuncPtrStubs = 38,
 CrstFusionAppCtx = 39,
 CrstGCCover = 40,
 CrstGlobalStrLiteralMap = 41,
 CrstHandleTable = 42,
 CrstIbcProfile = 43,
 CrstIJWFixupData = 44,
 CrstIJWHash = 45,
 CrstILStubGen = 46,
 CrstInlineTrackingMap = 47,
 CrstInstMethodHashTable = 48,
 CrstInterop = 49,
 CrstInteropData = 50,
 CrstIsJMCMethod = 51,
 CrstISymUnmanagedReader = 52,
 CrstJit = 53,
 CrstJitGenericHandleCache = 54,
 CrstJitInlineTrackingMap = 55,
 CrstJitPatchpoint = 56,
 CrstJitPerf = 57,
 CrstJumpStubCache = 58,
 CrstLeafLock = 59,
 CrstListLock = 60,
 CrstLoaderAllocator = 61,
 CrstLoaderAllocatorReferences = 62,
 CrstLoaderHeap = 63,
 CrstManagedObjectWrapperMap = 64,
 CrstMethodDescBackpatchInfoTracker = 65,
 CrstMethodTableExposedObject = 66,
 CrstModule = 67,
 CrstModuleFixup = 68,
 CrstModuleLookupTable = 69,
 CrstMulticoreJitHash = 70,
 CrstMulticoreJitManager = 71,
 CrstNativeImageEagerFixups = 72,
 CrstNativeImageLoad = 73,
 CrstNls = 74,
 CrstNotifyGdb = 75,
 CrstObjectList = 76,
 CrstPEImage = 77,
 CrstPendingTypeLoadEntry = 78,
 CrstPerfMap = 79,
 CrstPgoData = 80,
 CrstPinnedByrefValidation = 81,
 CrstPinnedHeapHandleTable = 82,
 CrstProfilerGCRefDataFreeList = 83,
 CrstProfilingAPIStatus = 84,
 CrstRCWCache = 85,
 CrstRCWCleanupList = 86,
 CrstReadyToRunEntryPointToMethodDescMap = 87,
 CrstReflection = 88,
 CrstReJITGlobalRequest = 89,
 CrstRetThunkCache = 90,
 CrstSavedExceptionInfo = 91,
 CrstSaveModuleProfileData = 92,
 CrstSecurityStackwalkCache = 93,
 CrstSigConvert = 94,
 CrstSingleUseLock = 95,
 CrstSpecialStatics = 96,
 CrstStackSampler = 97,
 CrstStaticBoxInit = 98,
 CrstStressLog = 99,
 CrstStubCache = 100,
 CrstStubDispatchCache = 101,
 CrstStubUnwindInfoHeapSegments = 102,
 CrstSyncBlockCache = 103,
 CrstSyncHashLock = 104,
 CrstSystemBaseDomain = 105,
 CrstSystemDomain = 106,
 CrstSystemDomainDelayedUnloadList = 107,
 CrstThreadIdDispenser = 108,
 CrstThreadStore = 109,
 CrstTieredCompilation = 110,
 CrstTypeEquivalenceMap = 111,
 CrstTypeIDMap = 112,
 CrstUMEntryThunkCache = 113,
 CrstUMEntryThunkFreeListLock = 114,
 CrstUniqueStack = 115,
 CrstUnresolvedClassLock = 116,
 CrstUnwindInfoTableLock = 117,
 CrstVSDIndirectionCellLock = 118,
 CrstWrapperTemplate = 119,
 kNumberOfCrstTypes = 120
 CrstFCall = 35,
 CrstFrozenObjectHeap = 36,
 CrstFuncPtrStubs = 37,
 CrstFusionAppCtx = 38,
 CrstGCCover = 39,
 CrstGlobalStrLiteralMap = 40,
 CrstHandleTable = 41,
 CrstIbcProfile = 42,
 CrstIJWFixupData = 43,
 CrstIJWHash = 44,
 CrstILStubGen = 45,
 CrstInlineTrackingMap = 46,
 CrstInstMethodHashTable = 47,
 CrstInterop = 48,
 CrstInteropData = 49,
 CrstIsJMCMethod = 50,
 CrstISymUnmanagedReader = 51,
 CrstJit = 52,
 CrstJitGenericHandleCache = 53,
 CrstJitInlineTrackingMap = 54,
 CrstJitPatchpoint = 55,
 CrstJitPerf = 56,
 CrstJumpStubCache = 57,
 CrstLeafLock = 58,
 CrstListLock = 59,
 CrstLoaderAllocator = 60,
 CrstLoaderAllocatorReferences = 61,
 CrstLoaderHeap = 62,
 CrstManagedObjectWrapperMap = 63,
 CrstMethodDescBackpatchInfoTracker = 64,
 CrstMethodTableExposedObject = 65,
 CrstModule = 66,
 CrstModuleFixup = 67,
 CrstModuleLookupTable = 68,
 CrstMulticoreJitHash = 69,
 CrstMulticoreJitManager = 70,
 CrstNativeImageEagerFixups = 71,
 CrstNativeImageLoad = 72,
 CrstNls = 73,
 CrstNotifyGdb = 74,
 CrstObjectList = 75,
 CrstPEImage = 76,
 CrstPendingTypeLoadEntry = 77,
 CrstPerfMap = 78,
 CrstPgoData = 79,
 CrstPinnedByrefValidation = 80,
 CrstPinnedHeapHandleTable = 81,
 CrstProfilerGCRefDataFreeList = 82,
 CrstProfilingAPIStatus = 83,
 CrstRCWCache = 84,
 CrstRCWCleanupList = 85,
 CrstReadyToRunEntryPointToMethodDescMap = 86,
 CrstReflection = 87,
 CrstReJITGlobalRequest = 88,
 CrstRetThunkCache = 89,
 CrstSavedExceptionInfo = 90,
 CrstSaveModuleProfileData = 91,
 CrstSecurityStackwalkCache = 92,
 CrstSigConvert = 93,
 CrstSingleUseLock = 94,
 CrstSpecialStatics = 95,
 CrstStackSampler = 96,
 CrstStaticBoxInit = 97,
 CrstStressLog = 98,
 CrstStubCache = 99,
 CrstStubDispatchCache = 100,
 CrstStubUnwindInfoHeapSegments = 101,
 CrstSyncBlockCache = 102,
 CrstSyncHashLock = 103,
 CrstSystemBaseDomain = 104,
 CrstSystemDomain = 105,
 CrstSystemDomainDelayedUnloadList = 106,
 CrstThreadIdDispenser = 107,
 CrstThreadStore = 108,
 CrstTieredCompilation = 109,
 CrstTypeEquivalenceMap = 110,
 CrstTypeIDMap = 111,
 CrstUMEntryThunkCache = 112,
 CrstUMEntryThunkFreeListLock = 113,
 CrstUniqueStack = 114,
 CrstUnresolvedClassLock = 115,
 CrstUnwindInfoTableLock = 116,
 CrstVSDIndirectionCellLock = 117,
 CrstWrapperTemplate = 118,
 kNumberOfCrstTypes = 119
};

#endif // __CRST_TYPES_INCLUDED
Expand DownExpand Up@@ -181,7 +180,6 @@ int g_rgCrstLevelMap[] =
 0, // CrstException
 0, // CrstExecutableAllocatorLock
 0, // CrstExecuteManRangeLock
 0, // CrstExternalObjectContextCache
 4, // CrstFCall
 -1, // CrstFrozenObjectHeap
 7, // CrstFuncPtrStubs
Expand DownExpand Up@@ -306,7 +304,6 @@ LPCSTR g_rgCrstNameMap[] =
 "CrstException",
 "CrstExecutableAllocatorLock",
 "CrstExecuteManRangeLock",
 "CrstExternalObjectContextCache",
 "CrstFCall",
 "CrstFrozenObjectHeap",
 "CrstFuncPtrStubs",
Expand Down

62 changes: 39 additions & 23 deletions
src/coreclr/vm/interoplibinterface_comwrappers.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,7 @@

// Runtime headers
#include "common.h"
#include "simplerwlock.hpp"
#include "rcwrefcache.h"
#ifdef FEATURE_COMINTEROP_APARTMENT_SUPPORT
#include "olecontexthelpers.h"
Expand DownExpand Up@@ -257,32 +258,36 @@ namespace
 using Element = SHash<Traits>::element_t;
 using Iterator = SHash<Traits>::Iterator;

 class LockHolder : public CrstHolder
 class ReaderLock final
 {
 SimpleReadLockHolder _lock;
 public:
 LockHolder(_In_ ExtObjCxtCache *cache)
 : CrstHolder(&cache->_lock)
 {
 // This cache must be locked in Cooperative mode
 // since releases of wrappers can occur during a GC.
 CONTRACTL
 {
 NOTHROW;
 GC_NOTRIGGER;
 MODE_COOPERATIVE;
 }
 CONTRACTL_END;
 }
 ReaderLock(_In_ ExtObjCxtCache* cache)
 : _lock{ &cache->_lock }
 { }

 ~ReaderLock() = default;
 };

 class WriterLock final
 {
 SimpleWriteLockHolder _lock;
 public:
 WriterLock(_In_ ExtObjCxtCache* cache)
 : _lock{ &cache->_lock }
 { }

 ~WriterLock() = default;
 };

 private:
 friend struct InteropLibImports::RuntimeCallContext;
 SHash<Traits> _hashMap;
Crst _lock;
SimpleRWLock _lock;
 ExtObjCxtRefCache* _refCache;

 ExtObjCxtCache()
 : _lock(CrstExternalObjectContextCache, CRST_UNSAFE_COOPGC)
 : _lock(COOPERATIVE, LOCK_TYPE_DEFAULT)
 , _refCache(GetAppDomain()->GetRCWRefCache())
 { }
 ~ExtObjCxtCache() = default;
Expand All@@ -292,7 +297,7 @@ namespace
 bool IsLockHeld()
 {
 WRAPPER_NO_CONTRACT;
 return (_lock.OwnedByCurrentThread() != FALSE);
 return (_lock.LockTaken() != FALSE);
 }
#endif // _DEBUG

Expand DownExpand Up@@ -343,7 +348,7 @@ namespace
 // Determine the count of objects to return.
 SIZE_T objCountMax = 0;
 {
LockHolder lock(this);
ReaderLock lock(this);
 Iterator end = _hashMap.End();
 for (Iterator curr = _hashMap.Begin(); curr != end; ++curr)
 {
Expand All@@ -365,7 +370,7 @@ namespace
 SIZE_T objCount = 0;
 if (0 < objCountMax)
 {
LockHolder lock(this);
ReaderLock lock(this);
 Iterator end = _hashMap.End();
 for (Iterator curr = _hashMap.Begin(); curr != end; ++curr)
 {
Expand DownExpand Up@@ -823,11 +828,22 @@ namespace
 if (!uniqueInstance)
 {
 bool objectFound = false;
 bool tryRemove = false;
 {
 // Query the external object cache
 ExtObjCxtCache::LockHolder lock(cache);
 // Perform a quick look up to determine if we know of the object and if
 // we need to perform a more expensive cleanup operation below.
 ExtObjCxtCache::ReaderLock lock(cache);
 extObjCxt = cache->Find(cacheKey);
 objectFound = extObjCxt != NULL;
 tryRemove = objectFound && extObjCxt->IsSet(ExternalObjectContext::Flags_Detached);
 }

 if (tryRemove)
 {
 // Perform the slower cleanup operation that may be appropriate
 // if the object still exists and has been detached.
 ExtObjCxtCache::WriterLock lock(cache);
 extObjCxt = cache->Find(cacheKey);
 objectFound = extObjCxt != NULL;
 if (objectFound && extObjCxt->IsSet(ExternalObjectContext::Flags_Detached))
 {
Expand DownExpand Up@@ -958,7 +974,7 @@ namespace
 else
 {
 // Attempt to insert the new context into the cache.
 ExtObjCxtCache::LockHolder lock(cache);
 ExtObjCxtCache::WriterLock lock(cache);
 extObjCxt = cache->FindOrAdd(cacheKey, resultHolder.GetContext());
 }

Expand All@@ -980,7 +996,7 @@ namespace
 {
 // Failed to set the context; one must already exist.
 // Remove from the cache above as well.
 ExtObjCxtCache::LockHolder lock(cache);
 ExtObjCxtCache::WriterLock lock(cache);
 cache->Remove(resultHolder.GetContext());

 COMPlusThrow(kNotSupportedException);
Expand Down