Changeset 210 for trunk/nom/class_c/nomcls.c

Timestamp:

Jan 21, 2007, 4:58:25 PM (19 years ago)

Author:

cinc

Message:

Integration of nomUnInit() with the garbage collector using finalizers.

File:

• trunk/nom/class_c/nomcls.c (modified) (10 diffs)

trunk/nom/class_c/nomcls.c

@@ -49 +49 @@
 #include "nomclassmanager.h"
 
+#include "gc.h"
+
 extern NOMClassMgr* NOMClassMgrObject;
 
+static void nomObjectFinalizer(GC_PTR obj, GC_PTR client_data)
+{
+  NOMObject* nObj;
+  nObj=(NOMObject*)obj;
+
+  if(nomIsObj(nObj)){
+    //nomPrintf("Finalizing 0x%x: %s \n", nObj, nObj->mtab->nomClassName);
+    _nomUnInit(nObj, NULLHANDLE);
+  }
+  //else
+  //nomPrintf("Finalizing 0x%x: no object! \n", nObj);
+}
 
 NOM_Scope CORBA_Object NOMLINK impl_NOMClass_nomNew(NOMClass* nomSelf, CORBA_Environment *ev)
@@ -56 +70 @@
   NOMClassData* nomThis=NOMClassGetData(nomSelf);
   NOMClassPriv *ncp;
-  string nObj;
-  
-  //nomPrintf("    Entering %s (%x) with nomSelf: 0x%x. nomSelf is: %s.\n",
-  //        __FUNCTION__, impl_NOMClass_nomNew, nomSelf, nomSelf->mtab->nomClassName);
+  gchar* nObj;
 
   if(!nomSelf)
     return NULLHANDLE;
-
 
   if(!_ncpObject)
@@ -83 +93 @@
   NOMClassPriv *ncp;
   NOMClassData *nomThis = NOMClassGetData(nomSelf);
+  GC_PTR oldData;
+  GC_finalization_proc oldFinalizerFunc;
 
   ncp=(NOMClassPriv*)_ncpObject;
@@ -92 +104 @@
   ((NOMObject*)nomObj)->mtab=ncp->mtab;
 
+  /* Register finalizer if the class uses nomUnInit */
+  ncp=(NOMClassPriv*)ncp->mtab->nomClsInfo;
+  if(ncp->ulClassFlags & NOM_FLG_NOMUNINIT_OVERRIDEN){
+    //nomPrintf("Registering finalizer for %s\n", ((NOMObject*)nomObj)->mtab->nomClassName);
+    GC_register_finalizer(nomObj,  nomObjectFinalizer, NULL, &oldFinalizerFunc, &oldData);
+  }
   /* NO call to _nomInit() */
 
@@ -98 +116 @@
 }
 
-NOM_Scope CORBA_Object NOMLINK impl_NOMClass_nomRenew(NOMClass* nomSelf, const CORBA_Object nomObj, CORBA_Environment *ev)
+NOM_Scope CORBA_Object NOMLINK impl_NOMClass_nomRenew(NOMClass* nomSelf, const CORBA_Object nomObj,
+                                                      CORBA_Environment *ev)
 {
   _nomRenewNoInit(nomSelf, nomObj, NULLHANDLE);
@@ -109 +128 @@
 
 
-NOM_Scope CORBA_string NOMLINK impl_NOMClass_nomAllocate(NOMClass* nomSelf, const CORBA_long ulSize, CORBA_Environment *ev)
-{
-  NOMClassPriv *ncp;
-  NOMClassData *nomThis = NOMClassGetData(nomSelf);
-
-  ncp=(NOMClassPriv*)_ncpObject;
-  //  nomPrintf("%s: size %d\n", __FUNCTION__, ulSize);
+NOM_Scope CORBA_string NOMLINK impl_NOMClass_nomAllocate(NOMClass* nomSelf, const CORBA_long ulSize,
+                                                         CORBA_Environment *ev)
+{
+  /* NOMClassData *nomThis = NOMClassGetData(nomSelf); */
+
   return NOMMalloc(ulSize);
 }
@@ -131 +148 @@
 
 
-NOM_Scope void NOMLINK impl_NOMClass_nomSetObjectCreateInfo(NOMClass* nomSelf, const gpointer ncpObject, CORBA_Environment *ev)
+NOM_Scope void NOMLINK impl_NOMClass_nomSetObjectCreateInfo(NOMClass* nomSelf, const gpointer ncpObject,
+                                                            CORBA_Environment *ev)
 {
   NOMClassData* nomThis=NOMClassGetData(nomSelf);
@@ -178 +196 @@
           /* No, not in the list, so register it */
           ncPriv=(NOMClassPriv*)nomSelf->mtab->nomClsInfo;
-          ncPriv->ulIsMetaClass=1; /* Mark that we are a metaclass */
+          //ncPriv->ulIsMetaClass=1; /* Mark that we are a metaclass */
+          ncPriv->ulClassFlags|=NOM_FLG_IS_METACLASS; /* Mark that we are a metaclass */
           _nomRegisterClass(NOMClassMgrObject, nomSelf->mtab, NULLHANDLE);
           /* Register all the methods this class introduces */
@@ -193 +212 @@
           if(ncPriv){
 #warning !!!!! NOMClass does not have this pointer, this is a bug !!!!!
-            ncPriv->ulIsMetaClass=0; /* Mark that we are not a metaclass (should be 0 already) */
+            //ncPriv->ulIsMetaClass=0; /* Mark that we are not a metaclass (should be 0 already) */
+            ncPriv->ulClassFlags&=~NOM_FLG_IS_METACLASS; /* Mark that we are not a metaclass (should be 0 already) */
             _nomRegisterClass(NOMClassMgrObject, ncPriv->mtab, NULLHANDLE);
 
@@ -214 +234 @@
 
         ncPriv=(NOMClassPriv*)_nomGetObjectCreateInfo(nomSelf, NULLHANDLE);//nomSelf->mtab->nomClsInfo;
-        ncPriv->ulIsMetaClass=0; /* Mark that we are not a metaclass (should be 0 already) */
+        // ncPriv->ulIsMetaClass=0; /* Mark that we are not a metaclass (should be 0 already) */
+        ncPriv->ulClassFlags&=~NOM_FLG_IS_METACLASS; /* Mark that we are not a metaclass (should be 0 already) */
         if(ncPriv){
           gulong a, ulNumIntroducedMethods;