Skip to content

Commit 411f7e6

Browse files
pavelsavaramaraf
pavelsavara
and
maraf
authored
[browser][MT] dedicated io thread (#99422)
Co-authored-by: Marek Fišera <mara@neptuo.com>
1 parent 713e690 commit 411f7e6

File tree

49 files changed

+487
-171
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+487
-171
lines changed

‎eng/testing/WasmRunnerTemplate.cmd

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,9 @@ if /I [%XHARNESS_COMMAND%] == [test] (
5959
if [%BROWSER_PATH%] == [] if not [%HELIX_CORRELATION_PAYLOAD%] == [] (
6060
set "BROWSER_PATH=--browser-path^=%HELIX_CORRELATION_PAYLOAD%\chrome-win\chrome.exe"
6161
)
62+
if [%JS_ENGINE_ARGS%] == [] (
63+
set "JS_ENGINE_ARGS=--browser-arg^=--js-flags^=--stack-trace-limit^=1000"
64+
)
6265
)
6366

6467
if [%XHARNESS_ARGS%] == [] (

‎eng/testing/WasmRunnerTemplate.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,10 @@ if [[ "$XHARNESS_COMMAND" == "test" ]]; then
5858
fi
5959
fi
6060
fi
61+
else
62+
if [[ -z "$JS_ENGINE_ARGS" ]]; then
63+
JS_ENGINE_ARGS="--browser-arg=--js-flags=--stack-trace-limit=1000"
64+
fi
6165
fi
6266

6367
if [[ -z "$XHARNESS_ARGS" ]]; then

‎eng/testing/tests.browser.targets

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,6 @@
8787
<_AppArgs Condition="'$(IsFunctionalTest)' != 'true' and '$(WasmMainAssemblyFileName)' != ''">--run $(WasmMainAssemblyFileName)</_AppArgs>
8888
<_AppArgs Condition="'$(IsFunctionalTest)' == 'true'">--run $(AssemblyName).dll</_AppArgs>
8989

90-
<_XUnitBackgroundExec Condition="'$(_XUnitBackgroundExec)' == '' and '$(WasmEnableThreads)' == 'true'">true</_XUnitBackgroundExec>
9190
<WasmTestAppArgs Condition="'$(_XUnitBackgroundExec)' == 'true'">$(WasmTestAppArgs) -backgroundExec</WasmTestAppArgs>
9291
<WasmXHarnessMonoArgs Condition="'$(_XUnitBackgroundExec)' == 'true'">$(WasmXHarnessMonoArgs) --setenv=IsWasmBackgroundExec=true</WasmXHarnessMonoArgs>
9392
<_AppArgs Condition="'$(WasmTestAppArgs)' != ''">$(_AppArgs) $(WasmTestAppArgs)</_AppArgs>

‎src/libraries/System.Net.Http/src/System/Net/Http/BrowserHttpHandler/BrowserHttpInterop.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ public static async Task CancellationHelper(Task promise, CancellationToken canc
147147
}
148148
}, (promise, jsController)))
149149
{
150-
await promise.ConfigureAwait(true);
150+
await promise.ConfigureAwait(false);
151151
}
152152
}
153153
catch (OperationCanceledException oce) when (cancellationToken.IsCancellationRequested)

‎src/libraries/System.Private.Xml/tests/XmlSchema/XmlSchemaSet/TC_SchemaSet_AllowXmlAttributes.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@ public void v1(string xmlFile, string xsdFile, bool allowXmlAttributes, int expe
273273
if (xsdFile != null)
274274
xss.Add(null, Path.Combine(testData, xsdFile));
275275

276-
XmlReader vr = CreateReader(Path.Combine(testData, xmlFile), xss, allowXmlAttributes);
276+
using XmlReader vr = CreateReader(Path.Combine(testData, xmlFile), xss, allowXmlAttributes);
277277
while (vr.Read()) ;
278278

279279
Assert.Equal(warningCount, expectedWarningCount);

‎src/libraries/System.Private.Xml/tests/XmlSchema/XmlSchemaSet/TC_SchemaSet_EnableUpaCheck.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ public void v1(object param0, object param1, object param2, int[] expectedErrorL
146146
xss.ValidationEventHandler += new ValidationEventHandler(ValidationCallback);
147147
xss.Add(null, Path.Combine(testData, xsdFile));
148148

149-
XmlReader vr = CreateReader(Path.Combine(testData, xmlFile), xss, false);
149+
using XmlReader vr = CreateReader(Path.Combine(testData, xmlFile), xss, false);
150150
while (vr.Read()) ;
151151

152152
CError.Compare(errorCount, expectedErrorCount, "Error Count mismatch");

‎src/libraries/System.Private.Xml/tests/XmlSchema/XmlSchemaSet/TC_SchemaSet_Misc.cs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ public void v2()
8989
XmlSchemaValidationFlags.ProcessInlineSchema;
9090
settings.ValidationEventHandler += new ValidationEventHandler(ValidationCallback);
9191
settings.Schemas.Add(ss);
92-
XmlReader vr = XmlReader.Create(Path.Combine(TestData._Root, "bug115049.xml"), settings);
92+
using XmlReader vr = XmlReader.Create(Path.Combine(TestData._Root, "bug115049.xml"), settings);
9393
while (vr.Read()) ;
9494
CError.Compare(errorCount, 1, "Error Count mismatch!");
9595
return;
@@ -108,7 +108,7 @@ public void v4()
108108
XmlSchemaValidationFlags.ProcessSchemaLocation |
109109
XmlSchemaValidationFlags.ProcessInlineSchema;
110110
settings.ValidationEventHandler += new ValidationEventHandler(ValidationCallback);
111-
XmlReader vr = XmlReader.Create(new StringReader(xml), settings, (string)null);
111+
using XmlReader vr = XmlReader.Create(new StringReader(xml), settings, (string)null);
112112
while (vr.Read()) ;
113113
CError.Compare(errorCount, 0, "Error Count mismatch!");
114114
CError.Compare(warningCount, 1, "Warning Count mismatch!");
@@ -531,7 +531,7 @@ public void v106()
531531
#pragma warning disable 0618
532532
settings.ProhibitDtd = false;
533533
#pragma warning restore 0618
534-
XmlReader r = XmlReader.Create(Path.Combine(TestData._Root, "XMLSchema.xsd"), settings);
534+
using XmlReader r = XmlReader.Create(Path.Combine(TestData._Root, "XMLSchema.xsd"), settings);
535535
ss1.Add(null, r);
536536
ss1.Compile();
537537

@@ -568,7 +568,7 @@ public void v107()
568568
settings.Schemas.Add(schemaSet);
569569
settings.ValidationEventHandler += new ValidationEventHandler(ValidationCallback);
570570
settings.ValidationType = ValidationType.Schema;
571-
XmlReader vr = XmlReader.Create(new StringReader(strXml), settings);
571+
using XmlReader vr = XmlReader.Create(new StringReader(strXml), settings);
572572

573573
while (vr.Read()) ;
574574

@@ -742,7 +742,7 @@ public void v112()
742742
XmlSchema mainSchema = set.Add(null, Path.Combine(TestData._Root, "bug382035a.xsd"));
743743
set.Compile();
744744

745-
XmlReader r = XmlReader.Create(Path.Combine(TestData._Root, "bug382035a1.xsd"));
745+
using XmlReader r = XmlReader.Create(Path.Combine(TestData._Root, "bug382035a1.xsd"));
746746
XmlSchema reParsedInclude = XmlSchema.Read(r, new ValidationEventHandler(ValidationCallback));
747747

748748
((XmlSchemaExternal)mainSchema.Includes[0]).Schema = reParsedInclude;
@@ -766,7 +766,7 @@ public void v113()
766766
settings.ValidationFlags |= XmlSchemaValidationFlags.ReportValidationWarnings | XmlSchemaValidationFlags.ProcessSchemaLocation;
767767
settings.ValidationEventHandler += new ValidationEventHandler(ValidationCallback);
768768
settings.ValidationType = ValidationType.Schema;
769-
XmlReader vr = XmlReader.Create(new StringReader(strXml), settings);
769+
using XmlReader vr = XmlReader.Create(new StringReader(strXml), settings);
770770

771771
while (vr.Read()) ;
772772

@@ -1056,7 +1056,7 @@ public void Dev10_40509()
10561056
string xsd = Path.Combine(TestData._Root, "bug511217.xsd");
10571057
XmlSchemaSet s = new XmlSchemaSet();
10581058
s.XmlResolver = new XmlUrlResolver();
1059-
XmlReader r = XmlReader.Create(xsd);
1059+
using XmlReader r = XmlReader.Create(xsd);
10601060
s.Add(null, r);
10611061
s.Compile();
10621062
XmlReaderSettings rs = new XmlReaderSettings();

‎src/libraries/System.Private.Xml/tests/XmlSchema/XmlSchemaSet/TC_SchemaSet_NmTokens.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public void TestSchemaCompile(string fileName, bool negative)
3030
Assert.True(negative, args.Message);
3131
numevents++;
3232
};
33-
XmlReader r = XmlReader.Create(xsd);
33+
using XmlReader r = XmlReader.Create(xsd);
3434
s.Add(null, r);
3535
s.Compile();
3636
Assert.False(negative && numevents != 1);

‎src/libraries/System.Private.Xml/tests/XmlSchema/XmlSchemaSet/TC_SchemaSet_ProhibitDTD.cs

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ public void v2()
149149
Initialize();
150150
XmlSchemaSet xss = new XmlSchemaSet();
151151
xss.ValidationEventHandler += ValidationCallback;
152-
XmlReader r = CreateReader(Path.Combine(TestData._Root, "bug356711_a.xsd"));
152+
using XmlReader r = CreateReader(Path.Combine(TestData._Root, "bug356711_a.xsd"));
153153
try
154154
{
155155
xss.Add(null, r);
@@ -190,7 +190,7 @@ public void v4()
190190
XmlSchemaSet xss = new XmlSchemaSet();
191191
xss.XmlResolver = new XmlUrlResolver();
192192
xss.ValidationEventHandler += ValidationCallback;
193-
XmlReader r = CreateReader(Path.Combine(TestData._Root, "bug356711.xsd"));
193+
using XmlReader r = CreateReader(Path.Combine(TestData._Root, "bug356711.xsd"));
194194
try
195195
{
196196
xss.Add(null, r);
@@ -314,7 +314,7 @@ public void v10(object param0)
314314
xss.XmlResolver = new XmlUrlResolver();
315315
xss.ValidationEventHandler += ValidationCallback;
316316

317-
XmlReader r = CreateReader(Path.Combine(TestData._Root, param0.ToString()), false);
317+
using XmlReader r = CreateReader(Path.Combine(TestData._Root, param0.ToString()), false);
318318
try
319319
{
320320
xss.Add(null, r);
@@ -363,8 +363,8 @@ public void v12(object param0)
363363
XmlSchemaSet xss = new XmlSchemaSet();
364364
xss.ValidationEventHandler += ValidationCallback;
365365

366-
XmlReader r = CreateReader(Path.Combine(TestData._Root, param0.ToString()), false);
367-
XmlReader r2 = CreateReader(r, true);
366+
using XmlReader r = CreateReader(Path.Combine(TestData._Root, param0.ToString()), false);
367+
using XmlReader r2 = CreateReader(r, true);
368368
try
369369
{
370370
xss.Add(null, r2);
@@ -387,8 +387,8 @@ public void v13(object param0)
387387
xss.XmlResolver = new XmlUrlResolver();
388388
xss.ValidationEventHandler += ValidationCallback;
389389

390-
XmlReader r = CreateReader(Path.Combine(TestData._Root, param0.ToString()), false);
391-
XmlReader r2 = CreateReader(r, true);
390+
using XmlReader r = CreateReader(Path.Combine(TestData._Root, param0.ToString()), false);
391+
using XmlReader r2 = CreateReader(r, true);
392392

393393
try
394394
{
@@ -413,7 +413,7 @@ public void v14()
413413
xss.XmlResolver = new XmlUrlResolver();
414414
xss.ValidationEventHandler += ValidationCallback;
415415

416-
XmlReader r = CreateReader(Path.Combine(TestData._Root, "bug356711.xsd"), false);
416+
using XmlReader r = CreateReader(Path.Combine(TestData._Root, "bug356711.xsd"), false);
417417

418418
try
419419
{
@@ -437,8 +437,8 @@ public void v15()
437437
XmlSchemaSet xss = new XmlSchemaSet();
438438
xss.ValidationEventHandler += ValidationCallback;
439439

440-
XmlReader r1 = CreateReader(Path.Combine(TestData._Root, "bug356711_a.xsd"));
441-
XmlReader r2 = CreateReader(Path.Combine(TestData._Root, "bug356711_b.xsd"), false);
440+
using XmlReader r1 = CreateReader(Path.Combine(TestData._Root, "bug356711_a.xsd"));
441+
using XmlReader r2 = CreateReader(Path.Combine(TestData._Root, "bug356711_b.xsd"), false);
442442

443443
try
444444
{
@@ -482,7 +482,7 @@ public void v20(object param0)
482482

483483
try
484484
{
485-
XmlReader reader = CreateReader(Path.Combine(TestData._Root, param0.ToString()), xss, true);
485+
using XmlReader reader = CreateReader(Path.Combine(TestData._Root, param0.ToString()), xss, true);
486486
while (reader.Read()) ;
487487
}
488488
catch (XmlException)
@@ -539,7 +539,7 @@ public void v22(object param0)
539539

540540
try
541541
{
542-
XmlReader reader = CreateReader(Path.Combine(TestData._Root, param0.ToString()), xss, false);
542+
using XmlReader reader = CreateReader(Path.Combine(TestData._Root, param0.ToString()), xss, false);
543543
while (reader.Read()) ;
544544
}
545545
catch (XmlException)
@@ -561,8 +561,8 @@ public void v23()
561561

562562
try
563563
{
564-
XmlReader r1 = CreateReader(Path.Combine(TestData._Root, "bug356711_1.xml"), true);
565-
XmlReader r2 = CreateReader(r1, xss, false);
564+
using XmlReader r1 = CreateReader(Path.Combine(TestData._Root, "bug356711_1.xml"), true);
565+
using XmlReader r2 = CreateReader(r1, xss, false);
566566
while (r2.Read()) ;
567567
}
568568
catch (XmlException)

‎src/libraries/System.Private.Xml/tests/XmlSchema/XmlSchemaSet/TC_SchemaSet_Reprocess.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -560,7 +560,7 @@ public void v51(object param0, object param1, object param2, object param3)
560560
settings.ValidationEventHandler += new ValidationEventHandler(ValidationCallback);
561561
settings.ValidationType = ValidationType.Schema;
562562
settings.Schemas = set;
563-
XmlReader reader = XmlReader.Create(xmlFile, settings);
563+
using XmlReader reader = XmlReader.Create(xmlFile, settings);
564564
while (reader.Read()) { }
565565

566566
CError.Compare(bWarningCallback, false, "Warning count mismatch");
@@ -581,8 +581,8 @@ public void v51(object param0, object param1, object param2, object param3)
581581
bErrorCallback = false;
582582
_output.WriteLine("Second validation ***************");
583583
settings.Schemas = set;
584-
reader = XmlReader.Create(xmlFile, settings);
585-
while (reader.Read()) { }
584+
using XmlReader reader2 = XmlReader.Create(xmlFile, settings);
585+
while (reader2.Read()) { }
586586

587587
CError.Compare(bWarningCallback, false, "Warning count mismatch");
588588
CError.Compare(bErrorCallback, false, "Error count mismatch");
@@ -606,8 +606,8 @@ public void v51(object param0, object param1, object param2, object param3)
606606

607607
_output.WriteLine("Third validation, Expecting errors ***************");
608608
settings.Schemas = set;
609-
reader = XmlReader.Create(xmlFile, settings);
610-
while (reader.Read()) { }
609+
using XmlReader reader3 = XmlReader.Create(xmlFile, settings);
610+
while (reader3.Read()) { }
611611

612612
CError.Compare(bWarningCallback, false, "Warning count mismatch");
613613
CError.Compare(bErrorCallback, true, "Error count mismatch");
@@ -623,7 +623,7 @@ public XmlSchema LoadSchema(string path, string baseuri)
623623
_output.WriteLine("Correct uri: " + correctUri);
624624
using (Stream s = new FileStream(Path.GetFullPath(path), FileMode.Open, FileAccess.Read, FileShare.Read, 1))
625625
{
626-
XmlReader r = XmlReader.Create(s, new XmlReaderSettings(), includeUri);
626+
using XmlReader r = XmlReader.Create(s, new XmlReaderSettings(), includeUri);
627627
_output.WriteLine("Reader uri: " + r.BaseURI);
628628
using (r)
629629
{

0 commit comments

Comments
 (0)