-/* Copyright (C) 1995,1996,1997,1998,1999,2000,2001, 2002 Free Software Foundation, Inc.
+/* Copyright (C) 1995,1996,1997,1998,1999,2000,2001, 2002, 2003, 2004, 2006 Free Software Foundation, Inc.
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
*
- * This program is distributed in the hope that it will be useful,
+ * This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this software; see the file COPYING. If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307 USA
- *
- * As a special exception, the Free Software Foundation gives permission
- * for additional uses of the text contained in its release of GUILE.
- *
- * The exception is that, if you link the GUILE library with other files
- * to produce an executable, this does not by itself cause the
- * resulting executable to be covered by the GNU General Public License.
- * Your use of that executable is in no way restricted on account of
- * linking the GUILE library code into it.
- *
- * This exception does not however invalidate any other reasons why
- * the executable file might be covered by the GNU General Public License.
- *
- * This exception applies only to the code released by the
- * Free Software Foundation under the name GUILE. If you copy
- * code from other Free Software Foundation releases into a copy of
- * GUILE, as the General Public License permits, the exception does
- * not apply to the code that you add in this way. To avoid misleading
- * anyone as to the status of such modified files, you must delete
- * this exception notice from them.
- *
- * If you write modifications of your own for GUILE, it is your choice
- * whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice. */
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
\f
+#if HAVE_CONFIG_H
+# include <config.h>
+#endif
+
#include <stdio.h>
#include <errno.h>
#include <string.h>
if (ptr)
return ptr;
- scm_i_sweep_all_segments ("realloc");
-
- SCM_SYSCALL (ptr = realloc (mem, size));
- if (ptr)
- return ptr;
+ /* Time is hard: trigger a full, ``stop-the-world'' GC, and try again. */
+ GC_gcollect ();
- scm_igc ("realloc");
- scm_i_sweep_all_segments ("realloc");
-
SCM_SYSCALL (ptr = realloc (mem, size));
if (ptr)
return ptr;
By default, try to use calloc, as it is likely more efficient than
calling memset by hand.
*/
- SCM_SYSCALL(ptr= calloc (sz, 1));
+ SCM_SYSCALL (ptr = calloc (sz, 1));
if (ptr)
return ptr;
-
+
ptr = scm_realloc (NULL, sz);
memset (ptr, 0x0, sz);
return ptr;
char *
scm_strndup (const char *str, size_t n)
{
- char *dst = scm_malloc (n+1);
+ char *dst = scm_malloc (n + 1);
memcpy (dst, str, n);
dst[n] = 0;
return dst;
return scm_strndup (str, strlen (str));
}
+
+
void
scm_gc_register_collectable_memory (void *mem, size_t size, const char *what)
{
- scm_mallocated += size;
-
- /*
- we could finish the full sweep (without mark) here, but in
- practice this turns out to be ineffective.
- */
-
- /*
- A program that uses a lot of malloced collectable memory (vectors,
- strings), will use a lot of memory off the cell-heap; it needs to
- do GC more often (before cells are exhausted), otherwise swapping
- and malloc management will tie it down.
- */
- if (scm_mallocated > scm_mtrigger)
- {
- unsigned long prev_alloced = scm_mallocated;
- float yield;
-
- scm_igc (what);
- scm_i_sweep_all_segments("mtrigger");
-
- yield = ((float)prev_alloced - (float) scm_mallocated)
- / (float) prev_alloced;
-
- scm_gc_malloc_yield_percentage = (int) (100 * yield);
-
-#ifdef DEBUGINFO
- fprintf (stderr, "prev %lud , now %lud, yield %4.2lf, want %d",
- prev_alloced, scm_mallocated, 100.0*yield, scm_i_minyield_malloc);
-#endif
-
- if (yield < scm_i_minyield_malloc / 100.0)
- {
- /*
- We make the trigger a little larger, even; If you have a
- program that builds up a lot of data in strings, then the
- desired yield will never be satisfied.
-
- Instead of getting bogged down, we let the mtrigger grow
- strongly with it.
- */
- float no_overflow_trigger = (float)(scm_mallocated * 110);
-
- no_overflow_trigger /= (float) (100 - scm_i_minyield_malloc);
- scm_mtrigger = (unsigned long) no_overflow_trigger;
-
-#ifdef DEBUGINFO
- fprintf (stderr, "Mtrigger sweep: ineffective. New trigger %d\n", scm_mtrigger);
-#endif
- }
- }
-
#ifdef GUILE_DEBUG_MALLOC
if (mem)
- scm_malloc_register (mem, what);
+ scm_malloc_register (mem);
#endif
+ fprintf (stderr, "%s: nothing done\n", __FUNCTION__); /* FIXME: What to do? */
}
+
void
scm_gc_unregister_collectable_memory (void *mem, size_t size, const char *what)
{
- scm_mallocated -= size;
- scm_gc_malloc_collected += size;
-
#ifdef GUILE_DEBUG_MALLOC
if (mem)
scm_malloc_unregister (mem);
again in scm_gc_register_collectable_memory. We don't really
want the second GC since it will not find new garbage.
-
Note: this is a theoretical peeve. In reality, malloc() never
returns NULL. Usually, memory is overcommitted, and when you try
to write it the program is killed with signal 11. --hwn
*/
- void *ptr = scm_malloc (size);
- scm_gc_register_collectable_memory (ptr, size, what);
+ void *ptr = GC_MALLOC (size);
return ptr;
}
void *
scm_gc_realloc (void *mem, size_t old_size, size_t new_size, const char *what)
{
- /* XXX - see scm_gc_malloc. */
+ void *ptr;
+
+ ptr = GC_REALLOC (mem, new_size);
+
+#ifdef GUILE_DEBUG_MALLOC
+ if (mem)
+ scm_malloc_reregister (mem, ptr, what);
+#endif
- void *ptr = scm_realloc (mem, new_size);
- scm_gc_unregister_collectable_memory (mem, old_size, what);
- scm_gc_register_collectable_memory (ptr, new_size, what);
return ptr;
}
scm_gc_free (void *mem, size_t size, const char *what)
{
scm_gc_unregister_collectable_memory (mem, size, what);
- free (mem);
+ GC_FREE (mem);
}
char *
scm_gc_strndup (const char *str, size_t n, const char *what)
{
- char *dst = scm_gc_malloc (n+1, what);
+ char *dst = GC_MALLOC (n+1);
memcpy (dst, str, n);
dst[n] = 0;
return dst;
("scm_done_malloc is deprecated. "
"Use scm_gc_register_collectable_memory instead.");
- scm_gc_register_collectable_memory (NULL, size, "foreign mallocs");
+ if (size >= 0)
+ scm_gc_register_collectable_memory (NULL, size, "foreign mallocs");
+ else
+ scm_gc_unregister_collectable_memory (NULL, -size, "foreign mallocs");
}
void
("scm_done_free is deprecated. "
"Use scm_gc_unregister_collectable_memory instead.");
- scm_gc_unregister_collectable_memory (NULL, size, "foreign mallocs");
+ if (size >= 0)
+ scm_gc_unregister_collectable_memory (NULL, size, "foreign mallocs");
+ else
+ scm_gc_register_collectable_memory (NULL, -size, "foreign mallocs");
}
#endif /* SCM_ENABLE_DEPRECATED == 1 */
HCoop / bpt / guile.git / blobdiff