Changeset 136 for trunk/nom/src

Timestamp:

Dec 3, 2006, 10:08:56 AM (19 years ago)

Author:

cinc

Message:

Reviewed memory allocation functions.

Location:

trunk/nom/src

Files:

• nommemory.c (modified) (2 diffs)
• nomtkinit.c (modified) (2 diffs)

trunk/nom/src/nommemory.c

@@ -46 +46 @@
 #include <nomtk.h>
 
+/* This tells us if memory allocation is done using the garbage collector */
+extern gboolean bUseGC; /* Set during initialization */
+
 NOMEXTERN nomToken NOMLINK NOMMalloc(ULONG size)
 {
@@ -63 +66 @@
 
   if((memPtr=g_malloc(size*num + sizeof(ULONG)))==NULLHANDLE)
-    return NULLHANDLE;
-  memset(memPtr, 0, size*num + sizeof(ULONG));
+    return NULLHANDLE; /* We won't end here because GLib just terminates the process :-/ 
+                          A really sick idea imho. */
+  if(!bUseGC)
+    memset(memPtr, 0, size*num + sizeof(ULONG)); /* GC always returns zeroed memory */
+
   *memPtr=size;
   memPtr++;

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 */
 
 /********************************************************/
@@ -106 +106 @@
  g_mem_set_vtable(&vtbl);
  fprintf(stderr, "   GC memory functions set for GLIB. (%s: %d)\n", __FILE__, __LINE__);
+ bUseGC=TRUE;
 }