/* make sure the finalizer is not called again if the object is resurrected */
object_register_finalizer (obj, NULL);
- /* delegates that have a native function pointer allocated are
- * registerd for finalization, but they don't have a Finalize
- * method, because in most cases it's not needed and it's just a waste.
- */
- if (o->vtable->klass->delegate) {
- MonoDelegate* del = (MonoDelegate*)o;
- if (del->delegate_trampoline)
- mono_delegate_free_ftnptr ((MonoDelegate*)o);
- return;
- }
if (o->vtable->klass == mono_get_thread_class ())
if (mono_gc_is_finalizer_thread ((MonoThread*)o))
/* Avoid finalizing ourselves */
/* Use _internal here, since this thread can enter a doomed appdomain */
mono_domain_set_internal (mono_object_domain (o));
+ /* delegates that have a native function pointer allocated are
+ * registered for finalization, but they don't have a Finalize
+ * method, because in most cases it's not needed and it's just a waste.
+ */
+ if (o->vtable->klass->delegate) {
+ MonoDelegate* del = (MonoDelegate*)o;
+ if (del->delegate_trampoline)
+ mono_delegate_free_ftnptr ((MonoDelegate*)o);
+ return;
+ }
+
mono_runtime_invoke (mono_class_get_finalizer (o->vtable->klass), o, NULL, &exc);
if (exc) {
void
ves_icall_System_GC_InternalCollect (int generation)
{
- MONO_ARCH_SAVE_REGS;
-
-#if HAVE_BOEHM_GC
- GC_gcollect ();
-#endif
+ mono_gc_collect (generation);
}
gint64
default:
g_assert_not_reached ();
}
- return -1;
+ return 0;
}
void
guint32 size;
guint8 type;
guint slot_hint : 24; /* starting slot for search */
+ /* 2^16 appdomains should be enough for everyone (though I know I'll regret this in 20 years) */
+ /* we alloc this only for weak refs, since we can get the domain directly in the other cases */
+ guint16 *domain_ids;
} HandleData;
/* weak and weak-track arrays will be allocated in malloc memory
if (!handles->size) {
handles->size = 32;
if (handles->type > HANDLE_WEAK_TRACK) {
-#ifdef HAVE_BOEHM_GC
- handles->entries = GC_MALLOC (sizeof (gpointer) * handles->size);
-#else
- handles->entries = g_malloc0 (sizeof (gpointer) * handles->size);
-#endif
+ handles->entries = mono_gc_alloc_fixed (sizeof (gpointer) * handles->size, NULL);
} else {
handles->entries = g_malloc0 (sizeof (gpointer) * handles->size);
+ handles->domain_ids = g_malloc0 (sizeof (guint16) * handles->size);
}
handles->bitmap = g_malloc0 (handles->size / 8);
}
/* resize and copy the entries */
if (handles->type > HANDLE_WEAK_TRACK) {
-#ifdef HAVE_BOEHM_GC
gpointer *entries;
- entries = GC_MALLOC (sizeof (gpointer) * new_size);
+ entries = mono_gc_alloc_fixed (sizeof (gpointer) * new_size, NULL);
memcpy (entries, handles->entries, sizeof (gpointer) * handles->size);
handles->entries = entries;
-#else
- handles->entries = g_realloc (handles->entries, sizeof (gpointer) * new_size);
- memset (handles->entries + handles->size, 0, sizeof (gpointer) * handles->size);
-#endif
} else {
gpointer *entries;
+ guint16 *domain_ids;
+ domain_ids = g_malloc0 (sizeof (guint16) * new_size);
entries = g_malloc (sizeof (gpointer) * new_size);
/* we disable GC because we could lose some disappearing link updates */
mono_gc_disable ();
memcpy (entries, handles->entries, sizeof (gpointer) * handles->size);
memset (entries + handles->size, 0, sizeof (gpointer) * handles->size);
+ memcpy (domain_ids, handles->domain_ids, sizeof (guint16) * handles->size);
for (i = 0; i < handles->size; ++i) {
MonoObject *obj = mono_gc_weak_link_get (&(handles->entries [i]));
mono_gc_weak_link_remove (&(handles->entries [i]));
}
}
g_free (handles->entries);
+ g_free (handles->domain_ids);
handles->entries = entries;
+ handles->domain_ids = domain_ids;
mono_gc_enable ();
}
slot = slot * 32 + i;
handles->entries [slot] = obj;
if (handles->type <= HANDLE_WEAK_TRACK) {
- mono_gc_weak_link_add (&(handles->entries [slot]), obj);
+ if (obj)
+ mono_gc_weak_link_add (&(handles->entries [slot]), obj);
}
unlock_handles (handles);
/*g_print ("allocated entry %d of type %d to object %p (in slot: %p)\n", slot, handles->type, obj, handles->entries [slot]);*/
- return (slot << 2) | handles->type;
+ return (slot << 3) | (handles->type + 1);
}
guint32
MonoObject*
mono_gchandle_get_target (guint32 gchandle)
{
- guint slot = gchandle >> 2;
- HandleData *handles = &gc_handles [gchandle & 3];
+ guint slot = gchandle >> 3;
+ guint type = (gchandle & 7) - 1;
+ HandleData *handles = &gc_handles [type];
MonoObject *obj = NULL;
+ if (type > 3)
+ return NULL;
lock_handles (handles);
- if (slot < handles->size) {
+ if (slot < handles->size && (handles->bitmap [slot / 32] & (1 << (slot % 32)))) {
if (handles->type <= HANDLE_WEAK_TRACK) {
obj = mono_gc_weak_link_get (&handles->entries [slot]);
} else {
static void
mono_gchandle_set_target (guint32 gchandle, MonoObject *obj)
{
- guint slot = gchandle >> 2;
- HandleData *handles = &gc_handles [gchandle & 3];
+ guint slot = gchandle >> 3;
+ guint type = (gchandle & 7) - 1;
+ HandleData *handles = &gc_handles [type];
+ if (type > 3)
+ return;
lock_handles (handles);
- if (slot < handles->size) {
+ if (slot < handles->size && (handles->bitmap [slot / 32] & (1 << (slot % 32)))) {
if (handles->type <= HANDLE_WEAK_TRACK) {
mono_gc_weak_link_remove (&handles->entries [slot]);
- mono_gc_weak_link_add (&handles->entries [slot], obj);
+ if (obj)
+ mono_gc_weak_link_add (&handles->entries [slot], obj);
} else {
handles->entries [slot] = obj;
}
} else {
/* print a warning? */
}
- /*g_print ("changed entry %d of type %d to object %p (in slot: %p)\n", slot, gchandle & 3, obj, handles->entries [slot]);*/
+ /*g_print ("changed entry %d of type %d to object %p (in slot: %p)\n", slot, handles->type, obj, handles->entries [slot]);*/
unlock_handles (handles);
}
+gboolean
+mono_gchandle_is_in_domain (guint32 gchandle, MonoDomain *domain)
+{
+ guint slot = gchandle >> 3;
+ guint type = (gchandle & 7) - 1;
+ HandleData *handles = &gc_handles [type];
+ gboolean result = FALSE;
+ if (type > 3)
+ return FALSE;
+ lock_handles (handles);
+ if (slot < handles->size && (handles->bitmap [slot / 32] & (1 << (slot % 32)))) {
+ if (handles->type <= HANDLE_WEAK_TRACK) {
+ result = domain->domain_id == handles->domain_ids [slot];
+ } else {
+ MonoObject *obj;
+ obj = handles->entries [slot];
+ if (obj == NULL)
+ result = TRUE;
+ else
+ result = domain == mono_object_domain (obj);
+ }
+ } else {
+ /* print a warning? */
+ }
+ unlock_handles (handles);
+ return result;
+}
+
void
mono_gchandle_free (guint32 gchandle)
{
- guint slot = gchandle >> 2;
- HandleData *handles = &gc_handles [gchandle & 3];
+ guint slot = gchandle >> 3;
+ guint type = (gchandle & 7) - 1;
+ HandleData *handles = &gc_handles [type];
+ if (type > 3)
+ return;
lock_handles (handles);
- if (slot < handles->size) {
+ if (slot < handles->size && (handles->bitmap [slot / 32] & (1 << (slot % 32)))) {
if (handles->type <= HANDLE_WEAK_TRACK)
mono_gc_weak_link_remove (&handles->entries [slot]);
handles->entries [slot] = NULL;
} else {
/* print a warning? */
}
- /*g_print ("freed entry %d of type %d\n", slot, gchandle & 3);*/
+ /*g_print ("freed entry %d of type %d\n", slot, handles->type);*/
unlock_handles (handles);
}
finalize_notify ();
/* Finishing the finalizer thread, so wait a little bit... */
/* MS seems to wait for about 2 seconds */
- if (WaitForSingleObjectEx (shutdown_event, 2000000, FALSE) == WAIT_TIMEOUT) {
+ if (WaitForSingleObjectEx (shutdown_event, 2000, FALSE) == WAIT_TIMEOUT) {
mono_thread_stop (gc_thread);
}
}
projects / mono.git / blobdiff