Changeset 222 for trunk/nom

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.

Location:

trunk/nom

Files:

• class_c/nomclassmanager.c (modified) (2 diffs)
• class_c/nomobj.c (modified) (2 diffs)
• idl/nomclassmanager.idl (modified) (2 diffs)

trunk/nom/class_c/nomclassmanager.c

@@ -89 +89 @@
   mtab=g_datalist_get_data(&_gdataClassList, className);
 
-  nomPrintf("-----> %s %s %x\n", __FUNCTION__, className, mtab);
+  //nomPrintf("-----> %s %s %x\n", __FUNCTION__, className, mtab);
 
   if(mtab){
@@ -225 +225 @@
 }
 
+/**
+   \brief Function which implements the nomSubstituteClass() method of NOMClassMgr.
+ */
+NOM_Scope CORBA_boolean NOMLINK impl_NOMClassMgr_nomSubstituteClass(NOMClassMgr* nomSelf,
+                                                                    const CORBA_char * oldClass, 
+                                                                    const CORBA_char * replacementClass,
+                                                                    CORBA_Environment *ev)
+{
+/* NOMClassMgrData* nomThis=NOMClassMgrGetData(nomSelf); */
+  NOMObject* oClass;
+  NOMObject* rClass;
+
+  if((oClass=_nomFindClassFromName( nomSelf, oldClass, 0, 0, NULLHANDLE))==NULLHANDLE)
+    return FALSE;
+
+  if((rClass=_nomFindClassFromName( nomSelf, replacementClass, 0, 0, NULLHANDLE))==NULLHANDLE)
+    return FALSE;
+
+  /* Save old class object pointer. Hmm, maybe not it's still in the old parentMtab */
+
+  /* Change the class object pointer in the nomClassDataStructure */
+
+  /* Reregister old class with new mtab in the internal list. Make sure we don't get
+     a warning by GLib */
+
+  return FALSE;
+}
+
 static
 int nomClassMgrCompareFunc(gconstpointer a, gconstpointer b)

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 */

trunk/nom/idl/nomclassmanager.idl

@@ -153 +153 @@
 
   /**
+     This method substitutes \e oldClass with \e replacementClass. This means that after
+     replacing whenever class \e oldClass is requested \e replacementClass is returned.
+     \e oldClassNew() will create \e replacementClass objects etc.
+
+     The class \e replacementClass must be a direct subclass of \e oldClass.
+
+     \remark Both classes must already be registered with the class manager when calling this
+     method.
+
+     \par How to override
+     This method is usually not overriden.
+
+     \param oldClass The class to be replaced
+     \param replacementClass The class which will be used instead of \e oldClass 
+     \return TRUE if replacement succeeded.
+
+   */
+  boolean nomSubstituteClass(in string oldClass, in string replacementClass);
+
+  /**
      Override of nomInit(). The list of methods and the list of classes are initialized
      in that method. In addition the balanced binary tree for registering mtabs is created.
@@ -164 +184 @@
 
   /**
-     The list of registered methods.
+     The list of registered methods. The method nomGetClassList() can be used to get it.
+     If doing so be aware that it's the real thing no copy.
    */     
-  NOMINSTANCEVAR(PGData gdataMethodList); 
-  /**
-     Balanced binary tree holding the mtabs of all known classes.
+  NOMINSTANCEVAR(PGData gdataMethodList);
+
+  /**
+     Balanced binary tree holding the mtabs of all known classes. You can't access
+     this from the outside. It's entirely private to NOMClassMgr.
    */
   NOMINSTANCEVAR(PGTree pClassListTree);