Changeset 135 for trunk/nom

Timestamp:

Dec 3, 2006, 9:59:44 AM (19 years ago)

Author:

cinc

Message:

Added garbage collection. To use it the GC init function must be called before using any GLib (or GTK) stuff.

Location:

trunk/nom

Files:

• Makefile (modified) (3 diffs)
• exports.def (modified) (1 diff)
• make.inc (modified) (1 diff)
• src/nomtkinit.c (modified) (2 diffs)

trunk/nom/Makefile

@@ -22 +22 @@
 BINDIR          =       ./../../../bin
 TOOLDIR         =       ./../tools
+
+GCLIB           =       ./../../../o/gc.a
 
 # Define objects to build
@@ -69 +71 @@
 
 
-$(BINDIR)/nobjtk.dll:    $(OBJDIR)/o.dep $(NOMOBJECTS) $(OBJECTS) ./exports.def
+$(BINDIR)/nobjtk.dll:    $(OBJDIR)/o.dep $(NOMOBJECTS) $(OBJECTS) $(GCLIB) ./exports.def
         @echo "[33;1;mLinking "$@"...[0;m"
         cmd.exe /C create_vobjtk_def $(OBJDIR)/nobjtk.def
-        $(CC) $(GCCLDFLAGS)  -o $@ $(OBJECTS) $(LIBS) $(OBJDIR)/nobjtk.def
+        $(CC) $(GCCLDFLAGS)  -o $@ $(OBJECTS) $(LIBS) $(GCLIB) $(OBJDIR)/nobjtk.def
         emximp -o $(OBJDIR)/$(basename $(notdir $@)).a $(OBJDIR)/nobjtk.def
         @echo "[32;1;mDone linking "$@"...[0;m"
@@ -132 +134 @@
         mkdir -p $(CLASSTEMPLATEDIR)
 
+$(GCLIB):
+        cp $(GCPATH)/.libs/gc.a $(GCLIB)
+
 clean:
         @cd $(OBJDIR) && rm *

trunk/nom/exports.def

@@ -9 +9 @@
         NOMFree         
 ;       somIsObj               
+
+        nomInitGarbageCollection
 
         nomPrintf               

trunk/nom/make.inc

@@ -36 +36 @@
 IDLCOMP         =       L:\svn-sources\nom\trunk\ORBit2-2.14.0\src\idl-compiler\.libs\orbit-idl-2.exe
 #IDLCOMP                =       L:/ORBit2-2.14.0/src/idl-compiler/.libs/orbit-idl-2.exe
+
+GCPATH          =       L:/svn-sources/nom/trunk/gc6.8

trunk/nom/src/nomtkinit.c

@@ -51 +51 @@
    #include "nomtst2.h" */
 #include <nomclassmanager.h>
+/* Garbage collector */
+#include <gc.h>
 
 /* Undef if you want debugging msg from somEnvironmentNew() */
@@ -65 +67 @@
 /*   Toolkit functions, exported                        */
 /********************************************************/
+
+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__);
+}
 
 /*