Merge remote-tracking branch 'origin/stable-2.0'

[bpt/guile.git] / libguile / gc-malloc.c

diff --git a/libguile/gc-malloc.c b/libguile/gc-malloc.c
index 839154a..179558f 100644 (file)
--- a/libguile/gc-malloc.c
+++ b/libguile/gc-malloc.c
@@ -1,4 +1,5 @@
-/* Copyright (C) 1995,1996,1997,1998,1999,2000,2001, 2002, 2003, 2004, 2006, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+/* Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
+ *   2004, 2006, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public License
@@ -25,6 +26,7 @@
 #include <stdio.h>
 #include <errno.h>
 #include <string.h>
+#include <stdlib.h>
 
 #ifdef __ia64__
 #include <ucontext.h>
@@ -43,7 +45,6 @@ extern unsigned long * __libc_ia64_register_backing_store_base;
 #include "libguile/root.h"
 #include "libguile/strings.h"
 #include "libguile/vectors.h"
-#include "libguile/weaks.h"
 #include "libguile/hashtab.h"
 #include "libguile/tags.h"
 
@@ -57,10 +58,6 @@ extern unsigned long * __libc_ia64_register_backing_store_base;
 #include "libguile/debug-malloc.h"
 #endif
 
-#ifdef HAVE_MALLOC_H
-#include <malloc.h>
-#endif
-
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
@@ -80,6 +77,49 @@ extern unsigned long * __libc_ia64_register_backing_store_base;
 
 
 \f
+
+static void*
+do_realloc (void *from, size_t new_size)
+{
+  scm_gc_register_allocation (new_size);
+  return realloc (from, new_size);
+}
+
+static void*
+do_calloc (size_t n, size_t size)
+{
+  scm_gc_register_allocation (size);
+  return calloc (n, size);
+}
+
+static void*
+do_gc_malloc (size_t size, const char *what)
+{
+  /* Ensure nonzero size to be compatible with always-nonzero return of
+     glibc malloc.  */
+  return GC_MALLOC (size ? size : sizeof (void *));
+}
+
+static void*
+do_gc_malloc_atomic (size_t size, const char *what)
+{
+  return GC_MALLOC_ATOMIC (size ? size : sizeof (void *));
+}
+
+static void*
+do_gc_realloc (void *from, size_t size, const char *what)
+{
+  return GC_REALLOC (from, size ? size : sizeof (void *));
+}
+
+static void
+do_gc_free (void *ptr)
+{
+  GC_FREE (ptr);
+}
+
+
+\f
 /* Function for non-cell memory management.
  */
 
@@ -88,14 +128,19 @@ scm_realloc (void *mem, size_t size)
 {
   void *ptr;
 
-  SCM_SYSCALL (ptr = realloc (mem, size));
-  if (ptr)
+  ptr = do_realloc (mem, size);
+
+  if (ptr || size == 0)
     return ptr;
 
   /* Time is hard: trigger a full, ``stop-the-world'' GC, and try again.  */
+#ifdef HAVE_GC_GCOLLECT_AND_UNMAP
+  GC_gcollect_and_unmap ();
+#else
   GC_gcollect ();
+#endif
 
-  SCM_SYSCALL (ptr = realloc (mem, size));
+  ptr = do_realloc (mem, size);
   if (ptr)
     return ptr;
 
@@ -121,8 +166,8 @@ scm_calloc (size_t sz)
     By default, try to use calloc, as it is likely more efficient than
     calling memset by hand.
    */
-  SCM_SYSCALL (ptr = calloc (sz, 1));
-  if (ptr)
+  ptr = do_calloc (sz, 1);
+  if (ptr || sz == 0)
     return ptr;
 
   ptr = scm_realloc (NULL, sz);
@@ -151,10 +196,11 @@ scm_strdup (const char *str)
 void
 scm_gc_register_collectable_memory (void *mem, size_t size, const char *what)
 {
-  /* Nothing to do.  */
+  scm_gc_register_allocation (size);
+
 #ifdef GUILE_DEBUG_MALLOC
   if (mem)
-    scm_malloc_register (mem);
+    scm_malloc_register (mem, what);
 #endif
 }
 
@@ -176,57 +222,38 @@ scm_gc_unregister_collectable_memory (void *mem, size_t size, const char *what)
 void *
 scm_gc_malloc_pointerless (size_t size, const char *what)
 {
-  return GC_MALLOC_ATOMIC (size);
+  return do_gc_malloc_atomic (size, what);
 }
 
 void *
 scm_gc_malloc (size_t size, const char *what)
 {
-  void *ptr;
-
-  if (size == 0)
-    /* `GC_MALLOC ()' doesn't handle zero.  */
-    size = sizeof (void *);
-
-  ptr = GC_MALLOC (size);
-
-  return ptr;
+  return do_gc_malloc (size, what);
 }
 
 void *
 scm_gc_calloc (size_t size, const char *what)
 {
   /* `GC_MALLOC ()' always returns a zeroed buffer.  */
-  return scm_gc_malloc (size, what);
+  return do_gc_malloc (size, what);
 }
 
-
 void *
 scm_gc_realloc (void *mem, size_t old_size, size_t new_size, const char *what)
 {
-  void *ptr;
-
-  ptr = GC_REALLOC (mem, new_size);
-
-#ifdef GUILE_DEBUG_MALLOC
-  if (mem)
-    scm_malloc_reregister (mem, ptr, what);
-#endif
-
-  return ptr;
+  return do_gc_realloc (mem, new_size, what);
 }
 
 void
 scm_gc_free (void *mem, size_t size, const char *what)
 {
-  scm_gc_unregister_collectable_memory (mem, size, what);
-  GC_FREE (mem);
+  do_gc_free (mem);
 }
 
 char *
 scm_gc_strndup (const char *str, size_t n, const char *what)
 {
-  char *dst = GC_MALLOC_ATOMIC (n + 1);
+  char *dst = do_gc_malloc_atomic (n + 1, what);
   memcpy (dst, str, n);
   dst[n] = 0;
   return dst;