Changeset 192 for trunk/nom

Timestamp:

Jan 14, 2007, 6:21:52 PM (19 years ago)

Author:

cinc

Message:

Implemented nomIsObj().

Location:

trunk/nom

Files:

• class_c/nomclassmanager.c (modified) (3 diffs)
• idl/nomclassmanager.idl (modified) (1 diff)
• include/exception.h (modified) (1 diff)
• src/nomtkinit.c (modified) (2 diffs)

trunk/nom/class_c/nomclassmanager.c

@@ -116 +116 @@
   mtab=(nomMethodTab*) classMtab;
 
-  if(NULL==_gdataClassList)
-    g_datalist_init(&_gdataClassList);
-
   g_datalist_set_data_full(&_gdataClassList, mtab->nomClassName, classMtab, priv_handleClassRemove);
+  g_tree_insert(_pClassListTree, mtab, mtab->nomClassName); /* key is the mtab because we want to use
+                                                               this tree for fast lookup of mtabs to 
+                                                               check for objects. */
+
   //  g_datalist_set_data_full(&_gdataClassList, mtab->nomClassName, classMtab, priv_handleClassRemove);
   //nomPrintf("%s: registering %lx, %s classList: %lx\n", __FUNCTION__, 
@@ -181 +182 @@
   mtab=(nomMethodTab*) classMtab;
 
-  if(NULL==_gdataMethodList)
-    g_datalist_init(&_gdataMethodList);
-
   g_datalist_set_data_full(&_gdataMethodList, chrMethodName, classMtab, priv_handleMethodRemoveFromList);
   //g_datalist_set_data_full(&_gdataClassList, mtab->nomClassName, classMtab, priv_handleClassRemove);
@@ -190 +188 @@
 }
 
-
-
-
-
+NOM_Scope CORBA_boolean NOMLINK impl_NOMClassMgr_nomIsObject(NOMClassMgr* nomSelf, const PNOMObject nomObject,
+                                                             CORBA_Environment *ev)
+{
+  NOMClassMgrData* nomThis=NOMClassMgrGetData(nomSelf);
+
+  if(NULLHANDLE==nomObject)
+    return FALSE;
+
+  return (g_tree_lookup(_pClassListTree, nomObject->mtab)!= NULLHANDLE); 
+}
+
+static
+int nomClassMgrCompareFunc(gconstpointer a, gconstpointer b)
+{
+  if(a < b )
+    return -1;
+  if(a > b )
+    return 1;
+  return 0;
+}
+NOM_Scope void NOMLINK impl_NOMClassMgr_nomInit(NOMClassMgr* nomSelf, CORBA_Environment *ev)
+{
+  NOMClassMgrData* nomThis=NOMClassMgrGetData(nomSelf);
+
+  NOMClassMgr_nomInit_parent((NOMObject*)nomSelf,  ev);
+
+  g_datalist_init(&_gdataMethodList);
+  g_datalist_init(&_gdataClassList);
+
+  /* This balanced binary tree holds the objects in this folder. We create a tree
+     which may be searched using the name of the file/directory */
+
+  _pClassListTree=g_tree_new((GCompareFunc)nomClassMgrCompareFunc);
+
+}
+
+
+
+
+
+
+
+
+
+
+
+

trunk/nom/idl/nomclassmanager.idl

@@ -56 +56 @@
   gpointer nomGetClassInfoPtrFromName(in string className);
   void nomRegisterMethod(in gpointer classMtab, in string chrMethodName);
+  boolean nomIsObject(in PNOMObject nomObject);
 
+  NOMOVERRIDE(nomInit);
   NOMINSTANCEVAR(PGData gdataClassList); 
   NOMINSTANCEVAR(PGData gdataMethodList); 
-
+  NOMINSTANCEVAR(PGTree pClassListTree); 
   /* nomInit : override;*/
 

trunk/nom/include/exception.h

@@ -61 +61 @@
                       } /* if(1==1) */
 
+#ifdef __OS2__
+#define LOUD DosBeep(1000, 20); DosBeep(2000, 20); DosBeep(3000, 20);
+#else
+#define LOUD
+#endif
 
 #endif /* EXCEPTION_H_INCLUDED */
+
+
+
+
+
+

trunk/nom/src/nomtkinit.c

@@ -61 +61 @@
 PNOM_ENV pGlobalNomEnv;
 /* Global class manager object */
-NOMClassMgr* NOMClassMgrObject; /* Referenced from different files */
+NOMClassMgr* NOMClassMgrObject=NULLHANDLE; /* Referenced from different files */
 
 /********************************************************/
@@ -74 +74 @@
 NOMEXTERN gboolean NOMLINK nomIsObj(gpointer nomObj)
 {
+  if(NOMClassMgrObject)
+    return NOMClassMgr_nomIsObject(NOMClassMgrObject, (PNOMObject)nomObj, NULLHANDLE);
+
   if(!nomObj)
     return FALSE;
 
+  /* We assume that here... */
   return TRUE;
 }