-
Notifications
You must be signed in to change notification settings - Fork 5.3k
Fix gcc warnings during mono linux-x64 build #60675
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.
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
Changes from 1 commit
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2541,7 +2541,6 @@ try_process_suspend (void *the_tls, MonoContext *ctx, gboolean from_breakpoint) | |
| static void | ||
| suspend_vm (void) | ||
| { | ||
| gboolean tp_suspend = FALSE; | ||
| mono_loader_lock (); | ||
|
|
||
| mono_coop_mutex_lock (&suspend_mutex); | ||
|
|
@@ -2557,12 +2556,6 @@ suspend_vm (void) | |
| } | ||
|
|
||
| mono_coop_mutex_unlock (&suspend_mutex); | ||
|
|
||
| if (suspend_count == 1) | ||
| /* | ||
| * Suspend creation of new threadpool threads, since they cannot run | ||
| */ | ||
| tp_suspend = TRUE; | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. this is no longer used because this code from mono/mono was undefined in ENABLE_NETCORE and removed in dotnet/runtime: https://github.com/mono/mono/blob/8b3b6666a858e02137b192c923727bcfd00ef620/mono/mini/debugger-agent.c#L2873-L2876 @lambdageek @vargaz do you know if that is intentional, i.e. do we no longer need to suspend creating threadpool threads? or is this just something that was missed while porting to dotnet/runtime now that the threadpool works differently?
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Maybe @vargaz remembers. I think we don't need it anymore - the old threadpool had a native Monitor thread that was responsible for monitoring workers. So the debugger stopped all the managed worker threads, but it didn't have any idea about the monitor thread. In netcore, we don't have a native monitor thread - everything is done by managed threads. So when the debugger suspends the runtime, it will suspend the thread pool worker creation, too.
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Ok sounds good then :) |
||
| mono_loader_unlock (); | ||
| } | ||
|
|
||
|
|
@@ -2576,7 +2569,6 @@ static void | |
| resume_vm (void) | ||
| { | ||
| g_assert (is_debugger_thread ()); | ||
| gboolean tp_resume = FALSE; | ||
|
|
||
| mono_loader_lock (); | ||
|
|
||
|
|
@@ -2599,8 +2591,6 @@ resume_vm (void) | |
| mono_coop_mutex_unlock (&suspend_mutex); | ||
| //g_assert (err == 0); | ||
|
|
||
| if (suspend_count == 0) | ||
| tp_resume = TRUE; | ||
| mono_loader_unlock (); | ||
| } | ||
|
|
||
|
|
@@ -5257,15 +5247,15 @@ decode_vtype (MonoType *t, MonoDomain *domain, gpointer void_addr, gpointer void | |
| { | ||
| guint8 *addr = (guint8*)void_addr; | ||
| guint8 *buf = (guint8*)void_buf; | ||
| gboolean is_enum; | ||
| MonoClass *klass; | ||
| MonoClassField *f; | ||
| int nfields; | ||
| gpointer iter = NULL; | ||
| MonoDomain *d; | ||
| ErrorCode err; | ||
|
|
||
| is_enum = decode_byte (buf, &buf, limit); | ||
| /* is_enum, ignored */ | ||
| decode_byte (buf, &buf, limit); | ||
am11 marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| if (CHECK_PROTOCOL_VERSION(2, 61)) | ||
| decode_byte (buf, &buf, limit); | ||
| klass = decode_typeid (buf, &buf, limit, &d, &err); | ||
|
|
@@ -5487,7 +5477,6 @@ decode_value_internal (MonoType *t, int type, MonoDomain *domain, guint8 *addr, | |
| } else if (type == MONO_TYPE_VALUETYPE) { | ||
| ERROR_DECL (error); | ||
| guint8 *buf2; | ||
| gboolean is_enum; | ||
| MonoClass *klass; | ||
| MonoDomain *d; | ||
| guint8 *vtype_buf; | ||
|
|
@@ -5499,7 +5488,7 @@ decode_value_internal (MonoType *t, int type, MonoDomain *domain, guint8 *addr, | |
| * Same as the beginning of the handle_vtype case above. | ||
| */ | ||
| buf2 = buf; | ||
| is_enum = decode_byte (buf, &buf, limit); | ||
| decode_byte (buf, &buf, limit); | ||
| decode_byte (buf, &buf, limit); //ignore is boxed | ||
| klass = decode_typeid (buf, &buf, limit, &d, &err); | ||
| if (err != ERR_NONE) | ||
|
|
@@ -8927,7 +8916,7 @@ thread_commands (int command, guint8 *p, guint8 *end, Buffer *buf) | |
|
|
||
| for (int i = 0; i < tls->frame_count; i++) | ||
| { | ||
| PRINT_DEBUG_MSG(1, "[dbg] Searching Context [%d] - [%lld] - [%lld]\n", i, (uint64_t) MONO_CONTEXT_GET_SP (&tls->frames [i]->ctx), sp_received); | ||
| PRINT_DEBUG_MSG(1, "[dbg] Searching Context [%d] - [%" PRIu64 "] - [%" PRId64 "]\n", i, (uint64_t) MONO_CONTEXT_GET_SP (&tls->frames [i]->ctx), sp_received); | ||
| if (sp_received == (uint64_t)MONO_CONTEXT_GET_SP (&tls->frames [i]->ctx)) { | ||
| buffer_add_int(buf, i); | ||
| break; | ||
|
|
@@ -9625,8 +9614,6 @@ object_commands (int command, guint8 *p, guint8 *end, Buffer *buf) | |
| buffer_add_typeid (buf, obj->vtable->domain, mono_class_from_mono_type_internal (((MonoReflectionType*)obj->vtable->type)->type)); | ||
| break; | ||
| case CMD_OBJECT_REF_GET_VALUES_ICORDBG: { | ||
| gpointer iter; | ||
| iter = NULL; | ||
| len = 1; | ||
| MonoClass *dummy_class; | ||
| int field_token = decode_int (p, &p, end); | ||
|
|
||
Uh oh!
There was an error while loading. Please reload this page.