[Guile-commits] GNU Guile branch, stable-2.0, updated. v2.0.3-48-gb57bf27

[Andy Wingo]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Guile".

http://git.savannah.gnu.org/cgit/guile.git/commit/?id=b57bf2724a254cf73e255b3d2bca0a7dcad6674a

The branch, stable-2.0 has been updated
       via  b57bf2724a254cf73e255b3d2bca0a7dcad6674a (commit)
      from  738c899e4c1ab9d25cfbcd1010f34e0cce400bca (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit b57bf2724a254cf73e255b3d2bca0a7dcad6674a
Author: Andy Wingo <address@hidden>
Date:   Fri Dec 2 11:22:46 2011 +0100

    install gmp memory functions that let libgc know about allocations
    
    * libguile/numbers.c (custom_gmp_malloc, custom_gmp_realloc,
      custom_gmp_free): New static functions used by GMP for allocation.
      These are just wrappers for scm_malloc, scm_realloc, and free.
    
      (scm_init_numbers): If scm_install_gmp_memory_functions is nonzero,
      use mp_set_memory_functions to configure GMP to use
      custom_gmp_{malloc,realloc,free} for memory allocation.
    
      (scm_bigprint): Ask gmp for the function used to deallocate the string
      returned by mpz_get_str.
    
    * libguile/numbers.h: Declare scm_install_gmp_memory_functions.
    
    * libguile/guile.c: When running the Guile binary, install the
      gmp_memory_functions.
    
    Based on a patch by Mark H Weaver <address@hidden>.

-----------------------------------------------------------------------

Summary of changes:
 libguile/guile.c   |    3 ++-
 libguile/numbers.c |   42 ++++++++++++++++++++++++++++++++++++++++--
 libguile/numbers.h |    3 +++
 3 files changed, 45 insertions(+), 3 deletions(-)

diff --git a/libguile/guile.c b/libguile/guile.c
index 6da547b..ac22b83 100644
--- a/libguile/guile.c
+++ b/libguile/guile.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996,1997,2000,2001, 2006, 2008 Free Software Foundation, Inc.
+/* Copyright (C) 1996,1997,2000,2001, 2006, 2008, 2011 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
@@ -67,6 +67,7 @@ inner_main (void *closure SCM_UNUSED, int argc, char **argv)
 int
 main (int argc, char **argv)
 {
+  scm_install_gmp_memory_functions = 1;
   scm_boot_guile (argc, argv, inner_main, 0);
   return 0; /* never reached */
 }
diff --git a/libguile/numbers.c b/libguile/numbers.c
index e34c60e..e5b4ed9 100644
--- a/libguile/numbers.c
+++ b/libguile/numbers.c
@@ -114,6 +114,10 @@ typedef scm_t_signed_bits scm_t_inum;
 /* the macro above will not work as is with fractions */
 
 
+/* Default to 1, because as we used to hard-code `free' as the
+   deallocator, we know that overriding these functions with
+   instrumented `malloc' / `free' is OK.  */
+int scm_install_gmp_memory_functions = 1;
 static SCM flo0;
 static SCM exactly_one_half;
 static SCM flo_log10e;
@@ -172,6 +176,7 @@ scm_from_complex_double (complex double z)
 static mpz_t z_negative_one;
 
 
+
 /* Clear the `mpz_t' embedded in bignum PTR.  */
 static void
 finalize_bignum (GC_PTR ptr, GC_PTR data)
@@ -182,6 +187,31 @@ finalize_bignum (GC_PTR ptr, GC_PTR data)
   mpz_clear (SCM_I_BIG_MPZ (bignum));
 }
 
+/* The next three functions (custom_libgmp_*) are passed to
+   mp_set_memory_functions (in GMP) so that memory used by the digits
+   themselves is known to the garbage collector.  This is needed so
+   that GC will be run at appropriate times.  Otherwise, a program which
+   creates many large bignums would malloc a huge amount of memory
+   before the GC runs. */
+static void *
+custom_gmp_malloc (size_t alloc_size)
+{
+  return scm_malloc (alloc_size);
+}
+
+static void *
+custom_gmp_realloc (void *old_ptr, size_t old_size, size_t new_size)
+{
+  return scm_realloc (old_ptr, new_size);
+}
+
+static void
+custom_gmp_free (void *ptr, size_t size)
+{
+  free (ptr);
+}
+
+
 /* Return a new uninitialized bignum.  */
 static inline SCM
 make_bignum (void)
@@ -5368,9 +5398,12 @@ int
 scm_bigprint (SCM exp, SCM port, scm_print_state *pstate SCM_UNUSED)
 {
   char *str = mpz_get_str (NULL, 10, SCM_I_BIG_MPZ (exp));
+  size_t len = strlen (str);
+  void (*freefunc) (void *, size_t);
+  mp_get_memory_functions (NULL, NULL, &freefunc);
   scm_remember_upto_here_1 (exp);
-  scm_lfwrite (str, (size_t) strlen (str), port);
-  free (str);
+  scm_lfwrite (str, len, port);
+  freefunc (str, len + 1);
   return !0;
 }
 /*** END nums->strs ***/
@@ -9688,6 +9721,11 @@ scm_init_numbers ()
 {
   int i;
 
+  if (scm_install_gmp_memory_functions)
+    mp_set_memory_functions (custom_gmp_malloc,
+                             custom_gmp_realloc,
+                             custom_gmp_free);
+
   mpz_init_set_si (z_negative_one, -1);
 
   /* It may be possible to tune the performance of some algorithms by using
diff --git a/libguile/numbers.h b/libguile/numbers.h
index d3a3444..68f321e 100644
--- a/libguile/numbers.h
+++ b/libguile/numbers.h
@@ -520,6 +520,9 @@ SCM_API double scm_c_angle (SCM z);
 
 SCM_API int scm_is_number (SCM val);
 
+/* If nonzero, tell gmp to use GC_malloc for its allocations.  */
+SCM_API int scm_install_gmp_memory_functions;
+
 SCM_INTERNAL void scm_init_numbers (void);
 
 #endif  /* SCM_NUMBERS_H */


hooks/post-receive
-- 
GNU Guile