X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=libgc%2Ffinalize.c;h=39224f94ed695c24bbdedb2d2e1b7693b6be1e54;hb=45d6da52ce69cbd24f5930e1cad88d425e706186;hp=c5068c0a0d6018ca5446e551d271788c40b9434b;hpb=4f021d81ca18b1aca6fd46165becb49bb9c63c25;p=mono.git

diff --git a/libgc/finalize.c b/libgc/finalize.c
index c5068c0a0d6..39224f94ed6 100644
--- a/libgc/finalize.c
+++ b/libgc/finalize.c
@@ -307,6 +307,182 @@ out:
     return(0);
 }
 
+/* toggleref support */
+typedef struct {
+	GC_PTR strong_ref;
+	GC_hidden_pointer weak_ref;
+} GCToggleRef;
+
+static GC_ToggleRefStatus (*GC_toggleref_callback) (GC_PTR obj);
+static GCToggleRef *GC_toggleref_array;
+static int GC_toggleref_array_size;
+static int GC_toggleref_array_capacity;
+
+
+void
+GC_process_togglerefs (void)
+{
+	int i, w;
+	int toggle_ref_counts [3] = { 0, 0, 0 };
+
+	for (i = w = 0; i < GC_toggleref_array_size; ++i) {
+		GC_ToggleRefStatus res;
+		GCToggleRef r = GC_toggleref_array [i];
+
+		GC_PTR obj;
+
+		if (r.strong_ref)
+			obj = r.strong_ref;
+		else if (r.weak_ref)
+			obj = REVEAL_POINTER (r.weak_ref);
+		else
+			continue;
+
+		res = GC_toggleref_callback (obj);
+		++toggle_ref_counts [res];
+		switch (res) {
+		case GC_TOGGLE_REF_DROP:
+			break;
+		case GC_TOGGLE_REF_STRONG:
+			GC_toggleref_array [w].strong_ref = obj;
+			GC_toggleref_array [w].weak_ref = (GC_hidden_pointer)NULL;
+			++w;
+			break;
+		case GC_TOGGLE_REF_WEAK:
+			GC_toggleref_array [w].strong_ref = NULL;
+			GC_toggleref_array [w].weak_ref = HIDE_POINTER (obj);
+			++w;
+			break;
+		default:
+			ABORT("Invalid callback result");
+		}
+	}
+
+	for (i = w; i < GC_toggleref_array_size; ++i) {
+		GC_toggleref_array [w].strong_ref = NULL;
+		GC_toggleref_array [w].weak_ref = (GC_hidden_pointer)NULL;
+	}
+
+	GC_toggleref_array_size = w;
+}
+
+/* Finalizer proc support */
+static void (*GC_object_finalized_proc) (GC_PTR obj);
+
+void
+GC_set_await_finalize_proc (void (*proc) (GC_PTR obj))
+{
+	GC_object_finalized_proc = proc;
+}
+
+
+static void push_and_mark_object (GC_PTR p)
+{
+    hdr * hhdr = HDR(p);
+
+    PUSH_OBJ((word *)p, hhdr, GC_mark_stack_top,
+	     &(GC_mark_stack[GC_mark_stack_size]));
+
+	while (!GC_mark_stack_empty()) MARK_FROM_MARK_STACK();
+	GC_set_mark_bit (p);
+	if (GC_mark_state != MS_NONE)
+        while (!GC_mark_some((ptr_t)0)) {}
+}
+
+static void GC_mark_togglerefs ()
+{
+	int i;
+	if (!GC_toggleref_array)
+		return;
+
+	GC_set_mark_bit ((GC_PTR)GC_toggleref_array);
+	for (i = 0; i < GC_toggleref_array_size; ++i) {
+		if (GC_toggleref_array [i].strong_ref) {
+			GC_PTR object = GC_toggleref_array [i].strong_ref;
+
+			push_and_mark_object (object);
+		}
+	}
+}
+
+static void GC_clear_togglerefs ()
+{
+	int i;
+	for (i = 0; i < GC_toggleref_array_size; ++i) {
+		if (GC_toggleref_array [i].weak_ref) {
+			GC_PTR object = REVEAL_POINTER (GC_toggleref_array [i].weak_ref);
+
+			if (!GC_is_marked (object)) {
+				GC_toggleref_array [i].weak_ref = (GC_hidden_pointer)NULL; /* We defer compaction to only happen on the callback step. */
+			} else {
+				/*No need to copy, boehm is non-moving */
+			}
+		}
+	}
+}
+
+
+
+void GC_set_toggleref_func(GC_ToggleRefStatus (*proccess_toggleref) (GC_PTR obj))
+{
+	GC_toggleref_callback = proccess_toggleref;
+}
+
+static GC_bool
+ensure_toggleref_capacity (int capacity)
+{
+	if (!GC_toggleref_array) {
+		GC_toggleref_array_capacity = 32;
+		GC_toggleref_array = (GCToggleRef *) GC_INTERNAL_MALLOC_IGNORE_OFF_PAGE (GC_toggleref_array_capacity * sizeof (GCToggleRef), NORMAL);
+		if (!GC_toggleref_array)
+			return FALSE;
+	}
+	if (GC_toggleref_array_size + capacity >= GC_toggleref_array_capacity) {
+		GCToggleRef *tmp;
+		int old_capacity = GC_toggleref_array_capacity;
+		while (GC_toggleref_array_capacity < GC_toggleref_array_size + capacity)
+			GC_toggleref_array_capacity *= 2;
+
+		tmp = (GCToggleRef *) GC_INTERNAL_MALLOC_IGNORE_OFF_PAGE (GC_toggleref_array_capacity * sizeof (GCToggleRef), NORMAL);
+		if (!tmp)
+			return FALSE;
+		memcpy (tmp, GC_toggleref_array, GC_toggleref_array_size * sizeof (GCToggleRef));
+		GC_INTERNAL_FREE (GC_toggleref_array);
+		GC_toggleref_array = tmp;
+	}
+	return TRUE;
+}
+
+int
+GC_toggleref_add (GC_PTR object, int strong_ref)
+{
+	int res = GC_SUCCESS;
+    DCL_LOCK_STATE;
+# ifdef THREADS
+	DISABLE_SIGNALS();
+	LOCK();
+# endif
+
+	if (!GC_toggleref_callback)
+		goto end;
+
+	if (!ensure_toggleref_capacity (1)) {
+		res = GC_NO_MEMORY;
+		goto end;
+	}
+	GC_toggleref_array [GC_toggleref_array_size].strong_ref = strong_ref ? object : NULL;
+	GC_toggleref_array [GC_toggleref_array_size].weak_ref = strong_ref ? (GC_hidden_pointer)NULL : HIDE_POINTER (object);
+	++GC_toggleref_array_size;
+
+end:
+# ifdef THREADS
+	UNLOCK();
+	ENABLE_SIGNALS();
+# endif
+	return res;
+}
+
+
 
 # if defined(__STDC__) || defined(__cplusplus)
     int GC_register_long_link(GC_PTR * link, GC_PTR obj)
@@ -679,7 +855,9 @@ void GC_finalize()
     ptr_t real_ptr;
     register int i;
     int fo_size = (log_fo_table_size == -1 ) ? 0 : (1 << log_fo_table_size);
-    
+
+	GC_mark_togglerefs();
+
   /* Make non-tracking disappearing links disappear */
 	GC_make_disappearing_links_disappear(&GC_dl_hashtbl);
 
@@ -718,6 +896,10 @@ void GC_finalize()
                 fo_set_next(prev_fo, next_fo);
               }
               GC_fo_entries--;
+
+			  if (GC_object_finalized_proc)
+				  GC_object_finalized_proc (real_ptr);
+
             /* Add to list of objects awaiting finalization.	*/
               fo_set_next(curr_fo, GC_finalize_now);
               GC_finalize_now = curr_fo;
@@ -755,6 +937,8 @@ void GC_finalize()
   /* Remove dangling disappearing links. */
   GC_remove_dangling_disappearing_links(&GC_dl_hashtbl);
 
+	GC_clear_togglerefs ();
+
   /* Make long links disappear and remove dangling ones. */
   GC_make_disappearing_links_disappear(&GC_ll_hashtbl);
   GC_remove_dangling_disappearing_links(&GC_ll_hashtbl);