Skip to content

[wasm][debugger] Fix loading a non wasm page and then returning to a wasm page. #60688

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
thaystg merged 5 commits into from
Oct 22, 2021
Merged

[wasm][debugger] Fix loading a non wasm page and then returning to a wasm page. #60688

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4aa04f8
Fix loading a non wasm page and then returning to a wasm page.
thaystg Oct 20, 2021
c9dbc34
Adding non-wasm-page.html
thaystg Oct 20, 2021
118f1a3
fixing other method
thaystg Oct 20, 2021
dd3a6cf
addressing @radical comments
thaystg Oct 20, 2021
329ace1
adding last empty line
thaystg Oct 20, 2021
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
Prev Previous commit
Next Next commit
fixing other method
  • Loading branch information
@thaystg
thaystg committed Oct 20, 2021
commit 118f1a32369e3c340d1896d43d1e927f2263b4f3
6 changes: 1 addition & 5 deletions src/mono/wasm/debugger/BrowserDebugProxy/MonoProxy.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1217,11 +1217,7 @@ private async Task<DebugStore> RuntimeReady(SessionId sessionId, CancellationTok
return await context.ready.Task;

var commandParams = new MemoryStream();
var retDebuggerCmdReader = await SdbHelper.SendDebuggerAgentCommand<CmdEventRequest>(sessionId, CmdEventRequest.ClearAllBreakpoints, commandParams, token);
if (retDebuggerCmdReader == null)
{
Log("verbose", $"Failed to clear breakpoints");
}
await SdbHelper.SendDebuggerAgentCommand<CmdEventRequest>(sessionId, CmdEventRequest.ClearAllBreakpoints, commandParams, token);

if (context.PauseOnExceptions != PauseOnExceptionsKind.None && context.PauseOnExceptions != PauseOnExceptionsKind.Unset)
await SdbHelper.EnableExceptions(sessionId, context.PauseOnExceptions, token);
Expand Down
6 changes: 3 additions & 3 deletions src/mono/wasm/debugger/BrowserDebugProxy/MonoSDBHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -857,10 +857,10 @@ internal Task<MonoBinaryReader> SendDebuggerAgentCommandWithParms<T>(SessionId s
internal async Task<MonoBinaryReader> SendDebuggerAgentCommandWithParmsInternal(SessionId sessionId, int command_set, int command, MemoryStream parms, int type, string extraParm, CancellationToken token)
{
Result res = await proxy.SendMonoCommand(sessionId, MonoCommands.SendDebuggerAgentCommandWithParms(GetId(), command_set, command, Convert.ToBase64String(parms.ToArray()), parms.ToArray().Length, type, extraParm), token);
if (res.IsErr) {
throw new Exception("SendDebuggerAgentCommandWithParms Error");
byte[] newBytes = Array.Empty<byte>();
if (!res.IsErr) {
newBytes = Convert.FromBase64String(res.Value?["result"]?["value"]?["value"]?.Value<string>());
}
byte[] newBytes = Convert.FromBase64String(res.Value?["result"]?["value"]?["value"]?.Value<string>());
var retDebuggerCmd = new MemoryStream(newBytes);
var retDebuggerCmdReader = new MonoBinaryReader(retDebuggerCmd);
return retDebuggerCmdReader;
Expand Down