Changeset 222 for trunk/nom/class_c/nomobj.c

Timestamp:

Feb 4, 2007, 10:26:27 AM (19 years ago)

Author:

cinc

Message:

Remove finalizer from object before deleting it using delete(). Some other minor changes.

File:

• trunk/nom/class_c/nomobj.c (modified) (2 diffs)

trunk/nom/class_c/nomobj.c

@@ -45 +45 @@
 
 #include "nomobj.ih"
+
+#include "gc.h"
 
 /**
@@ -95 +97 @@
 {
 /* NOMObjectData* nomThis=NOMObjectGetData(nomSelf); */
+  GC_PTR oldData;
+  GC_finalization_proc oldFinalizerFunc;
+  NOMClassPriv *ncp;
+
+  /* Unregister finalizer if the class uses nomUnInit. This is done so nomUnInit isn't
+     called again when the memory is eventually collected by the GC. */
+  ncp=(NOMClassPriv*)nomSelf->mtab->nomClsInfo;
+  if(ncp->ulClassFlags & NOM_FLG_NOMUNINIT_OVERRIDEN){
+    /* A NULL finalizer function removes the finalizer */
+    GC_register_finalizer(nomSelf,  NULL, NULL, &oldFinalizerFunc, &oldData);
+  }
 
   /* Give object the chance to free resources */