diff options
author | Andy Wingo <wingo@pobox.com> | 2012-02-08 11:48:08 +0100 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2012-02-08 11:48:08 +0100 |
commit | 0858753e829fd399b55700688b4b2cb9c3ea6908 (patch) | |
tree | 55f97b3c1db7a33a181314663cb4e4750077fc3f /libguile/gc-malloc.c | |
parent | 0aed71aa51e89e714de2392c2a5f44694dca77ea (diff) | |
parent | 817307ccac5027fd784798bbbf6ffb52e0a5d751 (diff) | |
download | guile-0858753e829fd399b55700688b4b2cb9c3ea6908.tar.gz |
Merge remote-tracking branch 'origin/stable-2.0'
Conflicts:
GUILE-VERSION
libguile/gc-malloc.c
libguile/ports.c
Diffstat (limited to 'libguile/gc-malloc.c')
-rw-r--r-- | libguile/gc-malloc.c | 87 |
1 files changed, 55 insertions, 32 deletions
diff --git a/libguile/gc-malloc.c b/libguile/gc-malloc.c index 5c230dd1f..179558fe1 100644 --- a/libguile/gc-malloc.c +++ b/libguile/gc-malloc.c @@ -1,5 +1,5 @@ /* Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, - * 2004, 2006, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. + * 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 @@ -77,6 +77,49 @@ extern unsigned long * __libc_ia64_register_backing_store_base; + +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); +} + + + /* Function for non-cell memory management. */ @@ -85,10 +128,9 @@ scm_realloc (void *mem, size_t size) { void *ptr; - scm_gc_register_allocation (size); + ptr = do_realloc (mem, size); - SCM_SYSCALL (ptr = realloc (mem, size)); - if (ptr) + if (ptr || size == 0) return ptr; /* Time is hard: trigger a full, ``stop-the-world'' GC, and try again. */ @@ -98,7 +140,7 @@ scm_realloc (void *mem, size_t size) GC_gcollect (); #endif - SCM_SYSCALL (ptr = realloc (mem, size)); + ptr = do_realloc (mem, size); if (ptr) return ptr; @@ -124,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); @@ -180,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; |