Skip to content

[sdb] Add MODULE_APPLY_CHANGES command for hot reload #49043

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
merged 1 commit into from
Mar 3, 2021
Merged

[sdb] Add MODULE_APPLY_CHANGES command for hot reload #49043

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
43 changes: 43 additions & 0 deletions src/mono/mono/mini/debugger-agent.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6390,6 +6390,27 @@ get_types_for_source_file (gpointer key, gpointer value, gpointer user_data)
}
}

static gboolean
module_apply_changes (MonoImage *image, MonoArray *dmeta, MonoArray *dil, MonoArray *dpdb, MonoError *error)
{
#ifdef ENABLE_METADATA_UPDATE
MonoDomain *domain = mono_domain_get ();
/* TODO: use dpdb */
gpointer dmeta_bytes = (gpointer)mono_array_addr_internal (dmeta, char, 0);
int32_t dmeta_len = mono_array_length_internal (dmeta);
gpointer dil_bytes = (gpointer)mono_array_addr_internal (dil, char, 0);
int32_t dil_len = mono_array_length_internal (dil);
gpointer dpdb_bytes = !dpdb ? NULL : (gpointer)mono_array_addr_internal (dpdb, char, 0);
int32_t dpdb_len = !dpdb ? 0 : mono_array_length_internal (dpdb);
mono_image_load_enc_delta (domain, image, dmeta_bytes, dmeta_len, dil_bytes, dil_len, error);
return is_ok (error);
#else
mono_error_set_not_supported (error, "");
return FALSE;
#endif
}


static void
buffer_add_cattr_arg (Buffer *buf, MonoType *t, MonoDomain *domain, MonoObject *val)
{
Expand Down Expand Up @@ -7480,6 +7501,27 @@ module_commands (int command, guint8 *p, guint8 *end, Buffer *buf)
g_free (sourcelink);
break;
}
case MDBGPROT_CMD_MODULE_APPLY_CHANGES: {
MonoImage *image = decode_moduleid (p, &p, end, &domain, &err);
if (err != ERR_NONE)
return err;
int dmeta_id = decode_objid (p, &p, end);
int dil_id = decode_objid (p, &p, end);
int dpdb_id = decode_objid (p, &p, end);
MonoObject *dmeta, *dil, *dpdb;
if ((err = get_object (dmeta_id, &dmeta)) != ERR_NONE)
return err;
if ((err = get_object (dil_id, &dil)) != ERR_NONE)
return err;
if ((err = get_object_allow_null (dpdb_id, &dpdb)) != ERR_NONE)
return err;
ERROR_DECL (error);
if (!module_apply_changes (image, (MonoArray *)dmeta, (MonoArray *)dil, (MonoArray *)dpdb, error)) {
mono_error_cleanup (error);
return ERR_LOADER_ERROR;
}
return ERR_NONE;
}
default:
return ERR_NOT_IMPLEMENTED;
}
Expand Down Expand Up @@ -9458,6 +9500,7 @@ static const char* assembly_cmds_str[] = {

static const char* module_cmds_str[] = {
"GET_INFO",
"APPLY_CHANGES",
};

static const char* field_cmds_str[] = {
Expand Down
3 changes: 2 additions & 1 deletion src/mono/mono/mini/debugger-protocol.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
*/

#define MAJOR_VERSION 2
#define MINOR_VERSION 59
#define MINOR_VERSION 60

typedef enum {
MDBGPROT_CMD_COMPOSITE = 100
Expand Down Expand Up @@ -143,6 +143,7 @@ typedef enum {

typedef enum {
MDBGPROT_CMD_MODULE_GET_INFO = 1,
MDBGPROT_CMD_MODULE_APPLY_CHANGES = 2,
} MdbgProtCmdModule;

typedef enum {
Expand Down