Changeset 193 for trunk/nom/src/nomtkinit.c

Timestamp:

Jan 16, 2007, 8:31:25 PM (19 years ago)

Author:

cinc

Message:

Improvements to the GC interface and some more stuff

File:

• trunk/nom/src/nomtkinit.c (modified) (6 diffs)

trunk/nom/src/nomtkinit.c

@@ -48 +48 @@
 #include "nomobj.h"
 #include "nomcls.h"
-/* #include "nomtst.h"
-   #include "nomtst2.h" */
 #include <nomclassmanager.h>
 /* Garbage collector */
@@ -72 +70 @@
  */
 
+/*
+  This function asks the NOMClassMgrObject to search in the internal lists
+  for the mtab of the given object. If that mtab is found the pointer points to a
+  valid object.
+ */
 NOMEXTERN gboolean NOMLINK nomIsObj(gpointer nomObj)
 {
@@ -107 +110 @@
   NOMClassPriv* ncPriv;
   NOMClass* nomCls;
+#if 0
   NOMObject *nomObj;
-#if 0
   NOMTest* nomTst;
   NOMTest* nomTstObj;
@@ -148 +151 @@
      NOMClass in fact. */
   //_nomRegisterClass(NOMClassMgrObject, pGlobalNomEnv->nomObjectMetaClass->mtab, NULLHANDLE); //NOMObject
-  //_nomRegisterClass(NOMClassMgrObject, pGlobalNomEnv->ncpNOMObject->mtab, NULLHANDLE); //NOMObject
   _nomClassReady(_NOMObject, NULLHANDLE); //NOMObject
 
 
 #if 0
-  nomPrintf("\n**** Building NOMTest class...\n");
-  nomTst=NOMTestNewClass(NOMTest_MajorVersion, NOMTest_MinorVersion);
-  nomPrintf("NOMTest class: %x\n", nomTst);
-
-  nomPrintf("Now building a NOMTest object from %x...\n", _NOMTest);
-  nomTstObj=    NOMTestNew();
-  nomPrintf("NOMTest object: %x\n", nomTstObj);
-#endif
-
-#if 0
-  nomPrintf("Calling _nomTestFunc() 1\n", nomTstObj);
-  _nomTestFunc(nomTstObj, NULLHANDLE);
-  nomPrintf("Calling _nomTestFuncString() 1\n", nomTstObj);
-  nomPrintf("--> %s\n",_nomTestFuncString(nomTstObj, NULLHANDLE));
-
-  nomPrintf("Calling _nomTestFunc() 2\n", nomTstObj);
-  _nomTestFunc(nomTstObj, NULLHANDLE);
-  nomPrintf("Calling _nomTestFuncString() 2\n", nomTstObj);
-  nomPrintf("--> %s\n",_nomTestFuncString(nomTstObj, NULLHANDLE));
-#endif
-
-#if 0
-  //#if 0
   nomPrintf("\n**** Building NOMTest2 class...\n");
   nomPrintf("\nNow building a NOMTest2 object...\n");
-  //  NOMTest2NewClass(NOMTest2_MajorVersion, NOMTest2_MinorVersion);
   nomTst2Obj=    NOMTest2New();
   nomPrintf("NOMTest2 object: %x\n", nomTst2Obj);
-  //#endif
-
 
   nomPrintf("\nCalling _nomTestFunc_NOMTest2() 1\n", nomTst2Obj);
@@ -200 +176 @@
 #endif
 
+  return NOMClassMgrObject;
+}
+
+
+
+NOMEXTERN PNOM_ENV NOMLINK nomTkInit(void)
+{
+  PVOID memPtr;
+  //PVOID memPool;
+
+  nomPrintf("Entering %s...\n", __FUNCTION__);
+
+  memPtr=g_malloc(sizeof(NOM_ENV)); /* g_malloc() can't fail... */
+
+  nomPrintf("%s: Got root memory: %x\n", __FUNCTION__, memPtr);
+
+  /* Now init the structure */
+  /* GC memory is zeroed... */
+  ((PNOM_ENV)memPtr)->cbSize=sizeof(NOM_ENV);
+  pGlobalNomEnv=(PNOM_ENV)memPtr;
+  if(NO_ERROR!=DosCreateMutexSem(NULL, &((PNOM_ENV)memPtr)->hmtx, DC_SEM_SHARED, FALSE))
+    {
+      g_free(memPtr);
+      return NULL;
+    }
+
+  return (PNOM_ENV)memPtr;
+
 #if 0
-  _dumpMtab(nomTstObj->mtab);
-  _dumpMtab(nomTst2Obj->mtab);
-  //  _dumpMtab(NOMClassMgrObject->mtab);
-  //  _dumpClasses();
-  _nomTestFunc(nomTstObj, NULLHANDLE);
-  _nomTestFunc(nomTst2Obj, NULLHANDLE);
-  _nomTestFunc(nomTstObj, NULLHANDLE);
-  _nomTestFunc(nomTst2Obj, NULLHANDLE);
-#endif
-
-#if 0
-  nomPrintf("NOMTest object: %x, %x\n", nomTstObj, NOMTestClassData.classObject);
-  nomTstObj=_nomNew((_NOMTest ? _NOMTest : NOMTestNewClass(NOMTest_MajorVersion, NOMTest_MinorVersion)), (void*) 0);
-  nomPrintf("NOMTest object: %x\n", nomTstObj);
-  nomTstObj=    NOMTestNew();
-  nomPrintf("NOMTest object: %x\n", nomTstObj);
-#endif
-
-  return NOMClassMgrObject;
-}
-
-
-
-NOMEXTERN PNOM_ENV NOMLINK nomTkInit(void)
-{
-
-
-  PVOID memPtr;
-  PVOID memPool;
-
-  nomPrintf("Entering %s...\n", __FUNCTION__);
   nomPrintf("*************************************\n");
   nomPrintf("!! This function must be rewritten !!\n");
@@ -288 +261 @@
 
   return (PNOM_ENV)memPtr;
-}
-
-
-
-
-
-
-
-
-
-
-
+#endif
+}
+
+
+
+
+
+
+
+
+
+
+