') + ')', '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('^' + ".*" + ', '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" + ', '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('^' + ".*" + ', '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); } })(); })(); Remove locks from COM events delegate management. by AaronRobinsonMSFT · Pull Request #75863 · dotnet/runtime · GitHub
Skip to content

Remove locks from COM events delegate management. - #75863

Merged
AaronRobinsonMSFT merged 9 commits into
dotnet:mainfrom
AaronRobinsonMSFT:runtime_73754
Sep 22, 2022
Merged

Remove locks from COM events delegate management.#75863
AaronRobinsonMSFT merged 9 commits into
dotnet:mainfrom
AaronRobinsonMSFT:runtime_73754

Conversation

@AaronRobinsonMSFT

@AaronRobinsonMSFTAaronRobinsonMSFT commented Sep 19, 2022

Copy link
Copy Markdown
Member

This removes locks and instead assumes the collection is immutable.

Fixes#73754

@AaronRobinsonMSFT
Remove locks from COM events delegate management.
2a5c722
This removes locks and instead assumes the collection is immutable.
@AaronRobinsonMSFTAaronRobinsonMSFT added this to the 8.0.0 milestone Sep 19, 2022
@AaronRobinsonMSFT

AaronRobinsonMSFT commented Sep 19, 2022

Copy link
Copy Markdown
MemberAuthor

/cc @dotnet/interop-contrib

stephentoub
stephentoub reviewed Sep 19, 2022
View reviewed changes
Comment threadsrc/libraries/Common/src/System/Runtime/InteropServices/ComEventsMethod.cs Outdated
stephentoub
stephentoub reviewed Sep 19, 2022
View reviewed changes
Comment threadsrc/libraries/Common/src/System/Runtime/InteropServices/ComEventsMethod.cs Outdated
stephentoub
stephentoub reviewed Sep 19, 2022
View reviewed changes
Comment threadsrc/libraries/Common/src/System/Runtime/InteropServices/ComEventsMethod.cs Outdated
@AaronRobinsonMSFT

AaronRobinsonMSFT commented Sep 21, 2022

Copy link
Copy Markdown
MemberAuthor

@stephentoub The CI is green. Any other thoughts?

stephentoub
stephentoub reviewed Sep 21, 2022
View reviewed changes
Comment threadsrc/libraries/Common/src/System/Runtime/InteropServices/ComEventsMethod.cs Outdated
stephentoub
stephentoub reviewed Sep 21, 2022
View reviewed changes
Comment threadsrc/libraries/Common/src/System/Runtime/InteropServices/ComEventsMethod.cs Outdated
@jkotas

jkotas commented Sep 21, 2022

Copy link
Copy Markdown
Member

Use array instead of List
Revert "Use array instead of List"

Was there an actual problem or you did not like the result? (It looks better to me with arrays instead of List.)

@AaronRobinsonMSFT

AaronRobinsonMSFT commented Sep 21, 2022

Copy link
Copy Markdown
MemberAuthor

Use array instead of List
Revert "Use array instead of List"

Was there an actual problem or you did not like the result? (It looks better to me with arrays instead of List.)

It was an option. However, I needed to create a RemoveAll local with annoying logic so deferred to just using List<T>. Either works and appear correct, other than the "Remove" logic you pointed out above. Let me see about simplifying it further.

@AaronRobinsonMSFT
Revert "Revert "Use array instead of List<T>""
93b3891
This reverts commit aa3dddd.
@AaronRobinsonMSFT
Remove usage of Delegate.Combine. Upon deeper inspection there
4ebac6d
doesn't seem to be any value to using that mechanism. An added
bonus is that it simplifies the logic.
@AaronRobinsonMSFT

AaronRobinsonMSFT commented Sep 21, 2022

Copy link
Copy Markdown
MemberAuthor

@jkotas@stephentoub I switched back to using arrays, let me know if you prefer List<T>. I also removed the Delegate.Combine logic. My biggest concern with changing that related to threading since this is a COM code path. Looking through it, I no longer have any concerns so it was removed.

stephentoub
stephentoub reviewed Sep 21, 2022
View reviewed changes
Comment threadsrc/libraries/Common/src/System/Runtime/InteropServices/ComEventsMethod.cs Outdated
Comment threadsrc/libraries/Common/src/System/Runtime/InteropServices/ComEventsMethod.cs Outdated
stephentoub
stephentoub reviewed Sep 22, 2022
View reviewed changes
Comment threadsrc/libraries/Common/src/System/Runtime/InteropServices/ComEventsMethod.cs Outdated
stephentoub
stephentoub reviewed Sep 22, 2022
View reviewed changes
Comment threadsrc/libraries/Common/src/System/Runtime/InteropServices/ComEventsMethod.cs Outdated
stephentoub
stephentoub reviewed Sep 22, 2022
View reviewed changes
Comment threadsrc/libraries/Common/src/System/Runtime/InteropServices/ComEventsMethod.cs Outdated
@AaronRobinsonMSFT
AaronRobinsonMSFT merged commit e4d115a into dotnet:mainSep 22, 2022
@AaronRobinsonMSFT
AaronRobinsonMSFT deleted the runtime_73754 branch September 22, 2022 19:28
@AaronRobinsonMSFT

AaronRobinsonMSFT commented Sep 22, 2022

Copy link
Copy Markdown
MemberAuthor

/backport to release/7.0

@github-actions

github-actionsBot commented Sep 22, 2022

Copy link
Copy Markdown
Contributor

Started backporting to release/7.0: https://github.com/dotnet/runtime/actions/runs/3108191020

@AaronRobinsonMSFT

AaronRobinsonMSFT commented Sep 22, 2022

Copy link
Copy Markdown
MemberAuthor

/backport to release/6.0

@github-actions

github-actionsBot commented Sep 22, 2022

Copy link
Copy Markdown
Contributor

Started backporting to release/6.0: https://github.com/dotnet/runtime/actions/runs/3108193116

This was referenced Sep 22, 2022
Merged
Merged
@ghostghost locked as resolved and limited conversation to collaborators Oct 23, 2022
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@davidfowldavidfowldavidfowl left review comments
@jkoritzinskyjkoritzinskyjkoritzinsky left review comments
@jkotasjkotasjkotas left review comments
@stephentoubstephentoubstephentoub approved these changes

Assignees

@AaronRobinsonMSFTAaronRobinsonMSFT

Labels

area-Interop-coreclr

Projects

None yet

Milestone

8.0.0

Development

Successfully merging this pull request may close these issues.

COM event with recursion .net 6 problem

5 participants

@AaronRobinsonMSFT@jkotas@davidfowl@jkoritzinsky@stephentoub