') + ')', '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); } })(); })(); Don't re-use XmlSchemaSet - it's not threadsafe. by StephenMolloy · Pull Request #74524 · dotnet/runtime · GitHub
Skip to content

Don't re-use XmlSchemaSet - it's not threadsafe. - #74524

Merged
StephenMolloy merged 1 commit into
dotnet:mainfrom
StephenMolloy:74370_Making-DCS-Import-Tests-More-Robust
Aug 25, 2022
Merged

Don't re-use XmlSchemaSet - it's not threadsafe.#74524
StephenMolloy merged 1 commit into
dotnet:mainfrom
StephenMolloy:74370_Making-DCS-Import-Tests-More-Robust

Conversation

@StephenMolloy

@StephenMolloyStephenMolloy commented Aug 24, 2022

Copy link
Copy Markdown
Member

Fixes#74370

These new tests use a few simple collections of schemas grouped in XmlSchemaSet. They were ported from NetFx, where apparently the test environment ran each test one at a time. (Seems that is also the case "on my machine" and in whatever pipelines were run to allow the tests to get checked in.) But XmlSchemaSet is not thread safe, so parallel execution of tests using a static XmlSchemaSet could be problematic. This change builds a new XmlSchemaSet per test instead of re-using a single instance.

@StephenMolloyStephenMolloy added this to the 7.0.0 milestone Aug 24, 2022
mconnew
mconnew reviewed Aug 25, 2022
View reviewed changes
Comment thread...System.Runtime.Serialization.Schema/tests/System/Runtime/Serialization/Schema/SchemaUtils.cs
internal static XmlSchemaSet PositiveSchemas = SchemaUtils.ReadStringsIntoSchemaSet(
new string[] {
private static string[] _positiveSchemas = new string[] {
@"<?xml version='1.0' encoding='utf-8'?><schema elementFormDefault='qualified' targetNamespace='http://schemas.datacontract.org/2004/07/fooNs' xmlns:tns='http://schemas.datacontract.org/2004/07/fooNs' xmlns:ser='http://schemas.microsoft.com/2003/10/Serialization/' xmlns='http://www.w3.org/2001/XMLSchema'>

@mconnewmconnewAug 25, 2022

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: naming. Statics should start with s_. Other than that, LGTM

@karelzkarelz modified the milestones: 7.0.0, 8.0.0Aug 25, 2022
@karelz

karelz commented Aug 25, 2022

Copy link
Copy Markdown
Member

FYI: This PR is against main, so in 8.0. To get the bug fixed in 7.0, there will need to be backport. It should not affect milestone of this specific PR.

@StephenMolloy
StephenMolloy merged commit 7b0227d into dotnet:mainAug 25, 2022
@StephenMolloy

StephenMolloy commented Aug 25, 2022

Copy link
Copy Markdown
MemberAuthor

@karelz - which 7.0 branch(es) do you need this backported to?

@karelz

karelz commented Aug 25, 2022

Copy link
Copy Markdown
Member

/backport to release/7.0

@github-actions

github-actionsBot commented Aug 25, 2022

Copy link
Copy Markdown
Contributor

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

@github-actionsgithub-actionsBot mentioned this pull request Aug 25, 2022
Merged
@lewinglewing mentioned this pull request Sep 2, 2022
Open
@ghostghost locked as resolved and limited conversation to collaborators Sep 24, 2022
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@mconnewmconnewmconnew approved these changes
@HongGitHongGitAwaiting requested review from HongGit
@karelzkarelzAwaiting requested review from karelz

Assignees

@StephenMolloyStephenMolloy

Labels

area-Serialization

Projects

None yet

Milestone

8.0.0

Development

Successfully merging this pull request may close these issues.

System.Runtime.Serialization.Schema.Tests failures

3 participants

@StephenMolloy@karelz@mconnew