Skip to content

Commit f02db51

Browse files
thaystglewing
andauthored
[wasm][debugger] Support sending Assembly_Load events on wasm (#100941)
* Support sending Assembly_Load events on wasm * Update debugger-agent.c update other assembly_load reference --------- Co-authored-by: Larry Ewing <lewing@microsoft.com>
1 parent be3ad0d commit f02db51

File tree

3 files changed

+8
-6
lines changed

3 files changed

+8
-6
lines changed

src/mono/mono/component/debugger-agent.c

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -470,8 +470,6 @@ static void emit_thread_start (gpointer key, gpointer value, gpointer user_data)
470470

471471
static void invalidate_each_thread (gpointer key, gpointer value, gpointer user_data);
472472

473-
static void assembly_load (MonoProfiler *prof, MonoAssembly *assembly);
474-
475473
static void assembly_unload (MonoProfiler *prof, MonoAssembly *assembly);
476474

477475
static void gc_finalizing (MonoProfiler *prof);
@@ -804,7 +802,7 @@ mono_debugger_agent_init_internal (void)
804802
mono_profiler_set_domain_loaded_callback (prof, appdomain_load);
805803
mono_profiler_set_domain_unloading_callback (prof, appdomain_start_unload);
806804
mono_profiler_set_domain_unloaded_callback (prof, appdomain_unload);
807-
mono_profiler_set_assembly_loaded_callback (prof, assembly_load);
805+
mono_profiler_set_assembly_loaded_callback (prof, mono_dbg_assembly_load);
808806
mono_profiler_set_assembly_unloading_callback (prof, assembly_unload);
809807
mono_profiler_set_jit_failed_callback (prof, jit_failed);
810808
mono_profiler_set_gc_finalizing_callback (prof, gc_finalizing);
@@ -4005,8 +4003,8 @@ invalidate_each_thread (gpointer key, gpointer value, gpointer user_data)
40054003
invalidate_frames ((DebuggerTlsData *)value);
40064004
}
40074005

4008-
static void
4009-
assembly_load (MonoProfiler *prof, MonoAssembly *assembly)
4006+
void
4007+
mono_dbg_assembly_load (MonoProfiler *prof, MonoAssembly *assembly)
40104008
{
40114009
/* Sent later in jit_end () */
40124010
dbg_lock ();
@@ -4127,7 +4125,7 @@ jit_end (MonoProfiler *prof, MonoMethod *method, MonoJitInfo *jinfo)
41274125
if (!CHECK_ICORDBG (TRUE) || tls->invoke == NULL) {
41284126
process_profiler_event (EVENT_KIND_ASSEMBLY_LOAD, assembly);
41294127
} else {
4130-
assembly_load(prof, assembly); //send later
4128+
mono_dbg_assembly_load (prof, assembly); //send later
41314129
break;
41324130
}
41334131
} else {

src/mono/mono/component/debugger-agent.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,4 +75,7 @@ mono_debugger_agent_receive_and_process_command (void);
7575

7676
bool
7777
mono_begin_breakpoint_processing (void *the_tls, MonoContext *ctx, MonoJitInfo *ji, gboolean from_signal);
78+
79+
void
80+
mono_dbg_assembly_load (MonoProfiler *prof, MonoAssembly *assembly);
7881
#endif

src/mono/mono/component/mini-wasm-debugger.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -191,6 +191,7 @@ static void
191191
assembly_loaded (MonoProfiler *prof, MonoAssembly *assembly)
192192
{
193193
PRINT_DEBUG_MSG (2, "assembly_loaded callback called for %s\n", assembly->aname.name);
194+
mono_dbg_assembly_load (prof, assembly);
194195
MonoImage *assembly_image = assembly->image;
195196
MonoImage *pdb_image = NULL;
196197

0 commit comments

Comments
 (0)