[mono] Address comments from PR #50328. (#50462)

* Use g_slist_concat ().
* Add MemoryManagerLock to the lock tracer.
* Remove some dead code.

diff --git a/src/mono/mono/metadata/loader-internals.h b/src/mono/mono/metadata/loader-internals.h
index 34f5576..e964c9b 100644 (file)
--- a/src/mono/mono/metadata/loader-internals.h
+++ b/src/mono/mono/metadata/loader-internals.h
@@ -94,7 +94,6 @@ struct _MonoMemoryManager {
        gboolean freeing;
 
        // If taking this with the loader lock, always take this second
-       // Currently unused, we take the domain lock instead
        MonoCoopMutex lock;
 
        // Private, don't access directly
@@ -182,6 +181,11 @@ mono_alc_assemblies_lock (MonoAssemblyLoadContext *alc);
 void
 mono_alc_assemblies_unlock (MonoAssemblyLoadContext *alc);
 
+/*
+ * This is below the loader lock in the locking hierarcy,
+ * so when taking this with the loader lock, always take
+ * this second.
+ */
 void
 mono_alc_memory_managers_lock (MonoAssemblyLoadContext *alc);
 

diff --git a/src/mono/mono/metadata/lock-tracer.h b/src/mono/mono/metadata/lock-tracer.h
index 8a111ff..301e464 100644 (file)
--- a/src/mono/mono/metadata/lock-tracer.h
+++ b/src/mono/mono/metadata/lock-tracer.h
@@ -15,6 +15,7 @@ typedef enum {
        InvalidLock = 0,
        LoaderLock,
        ImageDataLock,
+       MemoryManagerLock,
        DomainAssembliesLock,
        DomainJitCodeHashLock,
        IcallLock,

diff --git a/src/mono/mono/metadata/memory-manager.c b/src/mono/mono/metadata/memory-manager.c
index 901e945..84fb080 100644 (file)
--- a/src/mono/mono/metadata/memory-manager.c
+++ b/src/mono/mono/metadata/memory-manager.c
@@ -217,13 +217,13 @@ mono_mem_manager_free_singleton (MonoSingletonMemoryManager *memory_manager, gbo
 void
 mono_mem_manager_lock (MonoMemoryManager *memory_manager)
 {
-       mono_coop_mutex_lock (&memory_manager->lock);
+       mono_locks_coop_acquire (&memory_manager->lock, MemoryManagerLock);
 }
 
 void
 mono_mem_manager_unlock (MonoMemoryManager *memory_manager)
 {
-       mono_coop_mutex_unlock (&memory_manager->lock);
+       mono_locks_coop_release (&memory_manager->lock, MemoryManagerLock);
 }
 
 static inline void

diff --git a/src/mono/mono/metadata/object.c b/src/mono/mono/metadata/object.c
index f90bb34..31990ea 100644 (file)
--- a/src/mono/mono/metadata/object.c
+++ b/src/mono/mono/metadata/object.c
@@ -1621,16 +1621,6 @@ build_imt_slots (MonoClass *klass, MonoVTable *vt, gpointer* imt, GSList *extra_
        vt->imt_collisions_bitmap |= imt_collisions_bitmap;
 }
 
-static void
-build_imt (MonoClass *klass, MonoVTable *vt, gpointer* imt, GSList *extra_interfaces)
-{
-       MONO_REQ_GC_NEUTRAL_MODE;
-
-       mono_loader_lock ();
-       build_imt_slots (klass, vt, imt, extra_interfaces, -1);
-       mono_loader_unlock ();
-}
-
 /**
  * mono_vtable_build_imt_slot:
  * \param vtable virtual object table struct

diff --git a/src/mono/mono/mini/interp/interp.c b/src/mono/mono/mini/interp/interp.c
index daaae50..25fcf94 100644 (file)
--- a/src/mono/mono/mini/interp/interp.c
+++ b/src/mono/mono/mini/interp/interp.c
@@ -632,25 +632,6 @@ typedef struct {
        InterpMethod *target_imethod;
 } InterpVTableEntry;
 
-static inline GSList*
-g_slist_append_node (GSList *list, GSList *new_list, gpointer data)
-{
-       GSList *last;
-
-       new_list->data = data;
-       new_list->next = NULL;
-
-       if (list) {
-               last = list;
-               while (last->next)
-                       last = last->next;
-               last->next = new_list;
-
-               return list;
-       } else
-               return new_list;
-}
-
 /* memory manager lock must be held */
 static GSList*
 append_imethod (MonoMemoryManager *memory_manager, GSList *list, InterpMethod *imethod, InterpMethod *target_imethod)
@@ -662,7 +643,8 @@ append_imethod (MonoMemoryManager *memory_manager, GSList *list, InterpMethod *i
        entry->imethod = imethod;
        entry->target_imethod = target_imethod;
        ret = mono_mem_manager_alloc0 (memory_manager, sizeof (GSList));
-       ret = g_slist_append_node (list, ret, entry);
+       ret->data = entry;
+       ret = g_slist_concat (list, ret);
 
        return ret;
 }