Skip to content

[wasm][debugger] Reusing buffer to avoid allocate every debugger message #59480

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 9 commits into from
Sep 29, 2021
Merged

[wasm][debugger] Reusing buffer to avoid allocate every debugger message #59480

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
0206acc
Reusing buffer to avoid allocate every debugger message.
thaystg Sep 22, 2021
3bbdba6
Fixing what was suggested by @radical.
thaystg Sep 22, 2021
b262298
cleaning code.
thaystg Sep 22, 2021
8fd17bb
Changing what was suggested by @radical
thaystg Sep 22, 2021
15463c4
Merge branch 'main' into thays_reuse_buffer_debugger
thaystg Sep 28, 2021
c356045
Implementing again after merge
thaystg Sep 28, 2021
425cebb
Fix spacing before parentheses.
thaystg Sep 28, 2021
5f652fc
Addressing @pavelsavara comments.
thaystg Sep 28, 2021
85d891f
Fix _debugger_buffer type.
thaystg Sep 28, 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
25 changes: 19 additions & 6 deletions src/mono/wasm/runtime/src/mono/debug.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,17 @@ import { mono_wasm_load_bytes_into_heap } from './init'
var commands_received: any;
var _call_function_res_cache: any = {}
var _next_call_function_res_id = 0;
var _debugger_buffer_len = -1;
var _debugger_buffer: number;
var _debugger_heap_bytes : Uint8Array;

export function mono_wasm_runtime_ready() {
MONO.mono_wasm_runtime_is_ready = true;

// FIXME: where should this go?
_next_call_function_res_id = 0;
_call_function_res_cache = {};
_debugger_buffer_len = -1;

// DO NOT REMOVE - magic debugger init function
if ((<any>globalThis).dotnetDebugger)
Expand All @@ -41,10 +45,20 @@ export function mono_wasm_add_dbg_command_received(res_ok: boolean, id: number,
}
commands_received = buffer_obj;
}
function mono_wasm_malloc_and_set_debug_buffer(command_parameters: string) {
if (command_parameters.length > _debugger_buffer_len) {
if (_debugger_buffer)
Module._free(_debugger_buffer);
_debugger_buffer_len = Math.max(command_parameters.length, _debugger_buffer_len, 256);
_debugger_buffer = Module._malloc(_debugger_buffer_len);
_debugger_heap_bytes = new Uint8Array(Module.HEAPU8.buffer, _debugger_buffer, _debugger_buffer_len);
}
_debugger_heap_bytes.set(_base64_to_uint8(command_parameters));
}

export function mono_wasm_send_dbg_command_with_parms(id: number, command_set: number, command: number, command_parameters: any, length: number, valtype: number, newvalue: number) {
const dataHeap = mono_wasm_load_bytes_into_heap(_base64_to_uint8(command_parameters));
cwraps.mono_wasm_send_dbg_command_with_parms(id, command_set, command, dataHeap, length, valtype, newvalue.toString());
mono_wasm_malloc_and_set_debug_buffer(command_parameters);
cwraps.mono_wasm_send_dbg_command_with_parms(id, command_set, command, _debugger_buffer, length, valtype, newvalue.toString());

const { res_ok, res } = commands_received;
if (!res_ok)
Expand All @@ -53,8 +67,8 @@ export function mono_wasm_send_dbg_command_with_parms(id: number, command_set: n
}

export function mono_wasm_send_dbg_command(id: number, command_set: number, command: number, command_parameters: any) {
var dataHeap = mono_wasm_load_bytes_into_heap(_base64_to_uint8(command_parameters));
cwraps.mono_wasm_send_dbg_command(id, command_set, command, dataHeap, command_parameters.length);
mono_wasm_malloc_and_set_debug_buffer(command_parameters);
cwraps.mono_wasm_send_dbg_command(id, command_set, command, _debugger_buffer, command_parameters.length);

const { res_ok, res } = commands_received;
if (!res_ok)
Expand Down Expand Up @@ -159,8 +173,7 @@ export function mono_wasm_call_function_on(request: CallRequest) {
const fn_args = request.arguments != undefined ? request.arguments.map(a => JSON.stringify(a.value)) : [];
const fn_eval_str = `var fn = ${request.functionDeclaration}; fn.call (proxy, ...[${fn_args}]);`;

const local_eval = eval; // https://rollupjs.org/guide/en/#avoiding-eval
const fn_res = local_eval(fn_eval_str);
const fn_res = eval(fn_eval_str);
if (fn_res === undefined)
return { type: "undefined" };

Expand Down