Skip to content

Improve cancellation handling in GetListofCallStacksAsync #108

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
arvindshmicrosoft merged 1 commit into from
Nov 23, 2022
Merged

Improve cancellation handling in GetListofCallStacksAsync #108

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
1 change: 1 addition & 0 deletions Engine/StackResolver.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -441,6 +441,7 @@ public async Task<List<StackDetails>> GetListofCallStacksAsync(string inputCalls
var validElementNames = new List<string>() { "HistogramTarget", "event" };
this.StatusMessage = "WARNING: XML input was detected but it does not appear to be a known schema!";
while (reader.Read()) {
if (cts.IsCancellationRequested) return null;
if (XmlNodeType.Element == reader.NodeType && validElementNames.Contains(reader.Name)) {
this.StatusMessage = "Input seems to be relevant XML, attempting to process...";
isXMLdoc = true; // assume with reasonable confidence that we have a valid XML doc
Expand Down
27 changes: 17 additions & 10 deletions Tests/Tests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -782,31 +782,38 @@ private string PrepareLargeXEventInput() {
Assert.AreEqual(0, xelFieldsTask.Result.Item1.Count);
Assert.AreEqual(0, xelFieldsTask.Result.Item2.Count);

using var cts3 = new CancellationTokenSource();
Assert.IsTrue(csr.ProcessBaseAddresses(@"c:\mssql\binn\sqldk.dll 00000001`00400000"));
var xeventInput = PrepareLargeXEventInput().ToString();
var xeStacks = await csr.GetListofCallStacksAsync(xeventInput, false, cts3);
var resolveStacksTask = csr.ResolveCallstacksAsync(xeStacks, @"..\..\..\Tests\TestCases\TestOrdinal", false, null, false, false, false, true, false, false, Path.Combine(Path.GetTempPath(), Path.GetRandomFileName()), cts3);
using var cts3 = new CancellationTokenSource();
var xeStacksTask = csr.GetListofCallStacksAsync(xeventInput, false, cts3);
while (true) {
if (resolveStacksTask.Wait(StackResolver.OperationWaitIntervalMilliseconds)) break;
if (xeStacksTask.Wait(StackResolver.OperationWaitIntervalMilliseconds)) break;
cts3.Cancel();
}
Assert.AreEqual(null, xeStacksTask.Result);
using var cts4 = new CancellationTokenSource();
var xeStacks = await csr.GetListofCallStacksAsync(xeventInput, false, cts4);
var resolveStacksTask = csr.ResolveCallstacksAsync(xeStacks, @"..\..\..\Tests\TestCases\TestOrdinal", false, null, false, false, false, true, false, false, Path.Combine(Path.GetTempPath(), Path.GetRandomFileName()), cts4);
while (true) {
if (resolveStacksTask.Wait(StackResolver.OperationWaitIntervalMilliseconds)) break;
cts4.Cancel();
}
Assert.AreEqual(StackResolver.OperationCanceled, resolveStacksTask.Result);

using var cts4 = new CancellationTokenSource();
var parseModuleInfoXMLTask = ModuleInfoHelper.ParseModuleInfoXMLAsync(xeStacks, cts4);
using var cts5 = new CancellationTokenSource();
var parseModuleInfoXMLTask = ModuleInfoHelper.ParseModuleInfoXMLAsync(xeStacks, cts5);
while (true) {
cts4.Cancel(); // because this method is quick, we need to simulate a cancel right away
cts5.Cancel(); // because this method is quick, we need to simulate a cancel right away
if (parseModuleInfoXMLTask.Wait(StackResolver.OperationWaitIntervalMilliseconds)) break;
}
Assert.AreEqual(0, parseModuleInfoXMLTask.Result.Item1.Count);
Assert.AreEqual(0, parseModuleInfoXMLTask.Result.Item2.Count);

using var cts5 = new CancellationTokenSource();
var parseModuleInfoTask = ModuleInfoHelper.ParseModuleInfoAsync(xeStacks, cts5);
using var cts6 = new CancellationTokenSource();
var parseModuleInfoTask = ModuleInfoHelper.ParseModuleInfoAsync(xeStacks, cts6);
while (true) {
if (parseModuleInfoTask.Wait(StackResolver.OperationWaitIntervalMilliseconds)) break;
cts5.Cancel();
cts6.Cancel();
}
Assert.AreEqual(0, parseModuleInfoTask.Result.Count);
Assert.AreEqual(0, parseModuleInfoTask.Result.Count);
Expand Down