Changeset 158 for trunk/nom

Timestamp:

Dec 31, 2006, 10:28:58 AM (19 years ago)

Author:

cinc

Message:

Moved garbage collector functions to a separate source file.

Location:

trunk/nom

Files:

• Makefile (modified) (1 diff)
• exports.def (modified) (1 diff)
• idl/nombase.idl (modified) (1 diff)
• include/nom.h (modified) (1 diff)
• src/nomgc.c (added)
• src/nomtkinit.c (modified) (2 diffs)

trunk/nom/Makefile

@@ -33 +33 @@
                         $(OBJDIR)/nombuildnomobj.o \
                         $(OBJDIR)/nombuildnomcls.o \
-                        $(OBJDIR)/nomid.o
+                        $(OBJDIR)/nomid.o \
+                        $(OBJDIR)/nomgc.o
 
 #                       $(OBJDIR)/nomlistmgr.o \

trunk/nom/exports.def

@@ -11 +11 @@
 
         nomInitGarbageCollection
+        nomRegisterDataAreaForGC
+        nomPrintf               
 
-        nomPrintf               
 ;       somDataResolve  @11
 ;       somStringFromId @12

trunk/nom/idl/nombase.idl

@@ -64 +64 @@
 
 /* Native types we want to use in the IDL */
+native  gulong;
 native  gpointer;
 native  PGData;
-
+native  nomId; /* This is a typedef for a GQuark */
 #endif /* NOMBASE_IDL_INCLUDED */

trunk/nom/include/nom.h

@@ -111 +111 @@
 typedef GData* PGData;
 
-typedef gchar **nomID;                  
-typedef void *nomToken;                /* Use a gpointer instead of void* here?  */
+typedef gchar **nomID;                 /* This will be reomoved later. Don't use anymore */ 
+typedef void *nomToken;                /* Use a gpointer instead of void* here?          */
 
 #ifndef NOM_BOOLEAN

trunk/nom/src/nomtkinit.c

@@ -62 +62 @@
 /* Global class manager object */
 NOMClassMgr* NOMClassMgrObject; /* Referenced from different files */
-gboolean bUseGC=FALSE; /* MArk if we use the garbage collector */
 
 /********************************************************/
@@ -68 +67 @@
 /********************************************************/
 
-static gpointer  gcMalloc(gulong ulBytes)
-{
-  //printf("Hi there...\n");
-  // return malloc(ulBytes);
-  return (gpointer) GC_malloc(ulBytes);
-}
-
-static gpointer  gcRealloc(gpointer mem, gulong ulBytes)
-{
-  // printf("...and here\n");
-  //  return realloc(mem, ulBytes);
-  return (gpointer) GC_realloc(mem, ulBytes); 
-}
-
-static void  gcFree(gpointer mem)
-{
-  //  printf("free(): %x\n", mem);
-  return;
-  GC_free(mem); 
-}
-
-/*
-  This is called from the EMX wrapper to set the garbage collector
-  memory functions as the GLIB default allocation function.
- */
-void _System  nomInitGarbageCollection()
-{
- GMemVTable vtbl={0};
-
- /* Init the garbage collector */
- GC_init();
-
- vtbl.malloc=(gpointer)gcMalloc;
- vtbl.realloc=(gpointer)gcRealloc;
- vtbl.free=(gpointer)gcFree; 
-
- g_mem_set_vtable(&vtbl);
- fprintf(stderr, "   GC memory functions set for GLIB. (%s: %d)\n", __FILE__, __LINE__);
- bUseGC=TRUE;
-}
 
 /*