NaCl runtime fixes

[mono.git] / mono / metadata / boehm-gc.c

diff --git a/mono/metadata/boehm-gc.c b/mono/metadata/boehm-gc.c
index 2ff327a8ec82bab0d145e4492db550976157e32e..9e5ab87ac9c09e9f393f4e6f15ed39cf872a75ec 100644 (file)
--- a/mono/metadata/boehm-gc.c
+++ b/mono/metadata/boehm-gc.c
@@ -74,7 +74,7 @@ mono_gc_base_init (void)
         * we used to do this only when running on valgrind,
         * but it happens also in other setups.
         */
-#if defined(HAVE_PTHREAD_GETATTR_NP) && defined(HAVE_PTHREAD_ATTR_GETSTACK)
+#if defined(HAVE_PTHREAD_GETATTR_NP) && defined(HAVE_PTHREAD_ATTR_GETSTACK) && !defined(__native_client__)
        {
                size_t size;
                void *sstart;
@@ -299,26 +299,6 @@ mono_gc_get_heap_size (void)
        return GC_get_heap_size ();
 }
 
-void
-mono_gc_disable (void)
-{
-#ifdef HAVE_GC_ENABLE
-       GC_disable ();
-#else
-       g_assert_not_reached ();
-#endif
-}
-
-void
-mono_gc_enable (void)
-{
-#ifdef HAVE_GC_ENABLE
-       GC_enable ();
-#else
-       g_assert_not_reached ();
-#endif
-}
-
 gboolean
 mono_gc_is_gc_thread (void)
 {
@@ -506,13 +486,19 @@ mono_gc_weak_link_add (void **link_addr, MonoObject *obj, gboolean track)
 {
        /* libgc requires that we use HIDE_POINTER... */
        *link_addr = (void*)HIDE_POINTER (obj);
-       GC_GENERAL_REGISTER_DISAPPEARING_LINK (link_addr, obj);
+       if (track)
+               GC_REGISTER_LONG_LINK (link_addr, obj);
+       else
+               GC_GENERAL_REGISTER_DISAPPEARING_LINK (link_addr, obj);
 }
 
 void
-mono_gc_weak_link_remove (void **link_addr)
+mono_gc_weak_link_remove (void **link_addr, gboolean track)
 {
-       GC_unregister_disappearing_link (link_addr);
+       if (track)
+               GC_unregister_long_link (link_addr);
+       else
+               GC_unregister_disappearing_link (link_addr);
        *link_addr = NULL;
 }
 
@@ -614,112 +600,6 @@ mono_gc_pending_finalizers (void)
        return GC_should_invoke_finalizers ();
 }
 
-/*
- * LOCKING: Assumes the domain_finalizers lock is held.
- */
-static void
-add_weak_track_handle_internal (MonoDomain *domain, MonoObject *obj, guint32 gchandle)
-{
-       GSList *refs;
-
-       if (!domain->track_resurrection_objects_hash)
-               domain->track_resurrection_objects_hash = g_hash_table_new (mono_aligned_addr_hash, NULL);
-
-       refs = g_hash_table_lookup (domain->track_resurrection_objects_hash, obj);
-       refs = g_slist_prepend (refs, GUINT_TO_POINTER (gchandle));
-       g_hash_table_insert (domain->track_resurrection_objects_hash, obj, refs);
-}
-
-void
-mono_gc_add_weak_track_handle (MonoObject *obj, guint32 handle)
-{
-       MonoDomain *domain;
-
-       if (!obj)
-               return;
-
-       domain = mono_object_get_domain (obj);
-
-       mono_domain_finalizers_lock (domain);
-
-       add_weak_track_handle_internal (domain, obj, handle);
-
-       g_hash_table_insert (domain->track_resurrection_handles_hash, GUINT_TO_POINTER (handle), obj);
-
-       mono_domain_finalizers_unlock (domain);
-}
-
-/*
- * LOCKING: Assumes the domain_finalizers lock is held.
- */
-static void
-remove_weak_track_handle_internal (MonoDomain *domain, MonoObject *obj, guint32 gchandle)
-{
-       GSList *refs;
-
-       if (!domain->track_resurrection_objects_hash)
-               return;
-
-       refs = g_hash_table_lookup (domain->track_resurrection_objects_hash, obj);
-       refs = g_slist_remove (refs, GUINT_TO_POINTER (gchandle));
-       g_hash_table_insert (domain->track_resurrection_objects_hash, obj, refs);
-}
-
-void
-mono_gc_change_weak_track_handle (MonoObject *old_obj, MonoObject *obj, guint32 gchandle)
-{
-       MonoDomain *domain = mono_domain_get ();
-
-       mono_domain_finalizers_lock (domain);
-
-       if (old_obj)
-               remove_weak_track_handle_internal (domain, old_obj, gchandle);
-       if (obj)
-               add_weak_track_handle_internal (domain, obj, gchandle);
-
-       mono_domain_finalizers_unlock (domain);
-}
-
-void
-mono_gc_remove_weak_track_handle (guint32 gchandle)
-{
-       MonoDomain *domain = mono_domain_get ();
-       MonoObject *obj;
-
-       /* Clean our entries in the two hashes in MonoDomain */
-
-       mono_domain_finalizers_lock (domain);
-
-       /* Get the original object this handle pointed to */
-       obj = g_hash_table_lookup (domain->track_resurrection_handles_hash, GUINT_TO_POINTER (gchandle));
-       if (obj) {
-               g_hash_table_remove (domain->track_resurrection_handles_hash, GUINT_TO_POINTER (gchandle));
-
-               remove_weak_track_handle_internal (domain, obj, gchandle);
-       }
-
-       mono_domain_finalizers_unlock (domain);
-}
-
-GSList*
-mono_gc_remove_weak_track_object (MonoDomain *domain, MonoObject *obj)
-{
-       GSList *refs = NULL;
-
-       if (domain->track_resurrection_objects_hash) {
-               refs = g_hash_table_lookup (domain->track_resurrection_objects_hash, obj);
-
-               if (refs)
-                       /*
-                        * Since we don't run finalizers again for resurrected objects,
-                        * no need to keep these around.
-                        */
-                       g_hash_table_remove (domain->track_resurrection_objects_hash, obj);
-       }
-
-       return refs;
-}
-
 void
 mono_gc_wbarrier_set_field (MonoObject *obj, gpointer field_ptr, MonoObject* value)
 {
@@ -1043,7 +923,7 @@ mono_gc_get_managed_allocator (MonoVTable *vtable, gboolean for_box)
                return NULL;
        if (!SMALL_ENOUGH (klass->instance_size))
                return NULL;
-       if (mono_class_has_finalizer (klass) || klass->marshalbyref || (mono_profiler_get_events () & MONO_PROFILE_ALLOCATIONS))
+       if (mono_class_has_finalizer (klass) || mono_class_is_marshalbyref (klass) || (mono_profiler_get_events () & MONO_PROFILE_ALLOCATIONS))
                return NULL;
        if (klass->rank)
                return NULL;
@@ -1069,7 +949,7 @@ mono_gc_get_managed_allocator (MonoVTable *vtable, gboolean for_box)
 }
 
 MonoMethod*
-mono_gc_get_managed_array_allocator (MonoVTable *vtable, int rank)
+mono_gc_get_managed_array_allocator (MonoClass *klass)
 {
        return NULL;
 }
@@ -1122,7 +1002,7 @@ mono_gc_get_managed_allocator (MonoVTable *vtable, gboolean for_box)
 }
 
 MonoMethod*
-mono_gc_get_managed_array_allocator (MonoVTable *vtable, int rank)
+mono_gc_get_managed_array_allocator (MonoClass *klass)
 {
        return NULL;
 }
@@ -1347,4 +1227,10 @@ mono_gc_make_root_descr_user (MonoGCRootMarkFunc marker)
        return NULL;
 }
 
+gboolean
+mono_gc_set_allow_synchronous_major (gboolean flag)
+{
+       return flag;
+}
+
 #endif /* no Boehm GC */