guile/libguile/gc-malloc.c

254 lines
5.1 KiB
C
Raw Normal View History

Refactor handling of auxiliary stacks and setjmp/longjmp * libguile/__scm.h (scm_i_jmp_buf): Remove definition, which was a shim for ia64. Instead, always use setjmp/longjmp and jmp_buf. * libguile/_scm.h (SCM_I_SETJMP, SCM_I_LONGJMP): Remove; instead use setjmp and longjmp. * libguile/continuations.c (capture_auxiliary_stack): (restore_auxiliary_stack): New helpers. (scm_i_make_continuation): Use capture_auxiliary_stack. (copy_stack_and_call): Use restore_auxiliary_stack. No need to stash the aux stack on the thread, either. * libguile/continuations.h (scm_t_contregs): Use SCM_HAVE_AUXILIARY_STACK to flag when to have an auxiliary_stack member. * libguile/control.h: * libguile/control.c (reify_partial_continuation, scm_c_abort): (scm_suspendable_continuation_p): Adapt to use setjmp/longjmp directly. * libguile/deprecated.h: Add deprecated scm_i_jmp_buf define. * libguile/dynstack.h: * libguile/dynstack.c (PROMPT_JMPBUF): (scm_dynstack_push_prompt, scm_dynstack_find_prompt): (scm_dynstack_wind_prompt): Adapt to jmp_buf type. * libguile/eval.c (eval): Use jmp_buf and setjmp directly. * libguile/gc-malloc.c: No need for ia64-specific things. * libguile/gc.c: No need for ia64-specific things. * libguile/gc.h: No need to declare scm_ia64_ar_bsp. * libguile/init.c: Remove typedef of setjmp_type for Cray, unused. * libguile/threads.c (guilify_self_1): No more pending_rbs_continuation in scm_i_thread, and register_backing_store_base is handled by libgc. (scm_ia64_ar_bsp): Remove definitions; inlined into continuations.c's capture_auxiliary_stack. * libguile/threads.h (scm_i_thread): jmpbuf member is plain jmp_buf. * libguile/throw.c (catch): Just use jmp_buf and setjmp. * libguile/vm-engine.c (VM_NAME): Adapt prototype to take jmp_buf pointer. * libguile/vm.c (vm_abort): Adapt jmp_buf types. (scm_call_n): Use setjmp.
2018-06-17 13:03:39 +02:00
/* Copyright (C) 1995-2004,2006,2008-2014,2018
* Free Software Foundation, Inc.
2002-08-04 00:18:33 +00:00
*
* 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 3 of
* the License, or (at your option) any later version.
2002-08-04 00:18:33 +00:00
*
* 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
* Lesser General Public License for more details.
2002-08-04 00:18:33 +00:00
*
* 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
*/
2002-08-04 00:18:33 +00:00
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
2002-08-04 00:18:33 +00:00
#include <stdio.h>
#include <errno.h>
#include <string.h>
#include <stdlib.h>
2002-08-04 00:18:33 +00:00
#include "libguile/eval.h"
#include "libguile/stime.h"
#include "libguile/stackchk.h"
#include "libguile/struct.h"
#include "libguile/smob.h"
#include "libguile/arrays.h"
2002-08-04 00:18:33 +00:00
#include "libguile/async.h"
#include "libguile/ports.h"
#include "libguile/strings.h"
#include "libguile/vectors.h"
#include "libguile/hashtab.h"
#include "libguile/tags.h"
#include "libguile/deprecation.h"
#include "libguile/gc.h"
#ifdef GUILE_DEBUG_MALLOC
#include "libguile/debug-malloc.h"
#endif
#include <unistd.h>
/*
INIT_MALLOC_LIMIT is the initial amount of malloc usage which will
trigger a GC.
After startup (at the guile> prompt), we have approximately 100k of
alloced memory, which won't go away on GC. Let's set the init such
that we get a nice yield on the next allocation:
*/
2002-08-04 14:09:14 +00:00
#define SCM_DEFAULT_INIT_MALLOC_LIMIT 200*1024
2002-08-04 00:18:33 +00:00
#define SCM_DEFAULT_MALLOC_MINYIELD 40
2002-09-05 20:43:43 +00:00
/* #define DEBUGINFO */
2002-08-04 00:18:33 +00:00
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);
}
2002-08-04 00:18:33 +00:00
/* Function for non-cell memory management.
*/
void *
scm_realloc (void *mem, size_t size)
{
void *ptr;
ptr = do_realloc (mem, size);
if (ptr || size == 0)
2002-08-04 00:18:33 +00:00
return ptr;
/* Time is hard: trigger a full, ``stop-the-world'' GC, and try again. */
GC_gcollect_and_unmap ();
ptr = do_realloc (mem, size);
2002-08-04 00:18:33 +00:00
if (ptr)
return ptr;
scm_report_out_of_memory ();
/* Not reached. */
return NULL;
2002-08-04 00:18:33 +00:00
}
void *
scm_malloc (size_t sz)
{
return scm_realloc (NULL, sz);
}
/*
Hmm. Should we use the C convention for arguments (i.e. N_ELTS,
SIZEOF_ELT)? --hwn
*/
void *
scm_calloc (size_t sz)
{
void * ptr;
/*
By default, try to use calloc, as it is likely more efficient than
calling memset by hand.
*/
ptr = do_calloc (sz, 1);
if (ptr || sz == 0)
return ptr;
ptr = scm_realloc (NULL, sz);
memset (ptr, 0x0, sz);
return ptr;
}
2002-08-04 00:18:33 +00:00
char *
scm_strndup (const char *str, size_t n)
{
char *dst = scm_malloc (n + 1);
2002-08-04 00:18:33 +00:00
memcpy (dst, str, n);
dst[n] = 0;
return dst;
}
char *
scm_strdup (const char *str)
{
return scm_strndup (str, strlen (str));
}
void
scm_gc_register_collectable_memory (void *mem, size_t size, const char *what)
{
scm_gc_register_allocation (size);
2002-08-04 00:18:33 +00:00
#ifdef GUILE_DEBUG_MALLOC
if (mem)
scm_malloc_register (mem, what);
2002-08-04 00:18:33 +00:00
#endif
}
2002-08-04 00:18:33 +00:00
void
scm_gc_unregister_collectable_memory (void *mem, size_t size, const char *what)
{
/* Nothing to do. */
2002-08-04 00:18:33 +00:00
#ifdef GUILE_DEBUG_MALLOC
if (mem)
scm_malloc_unregister (mem);
#endif
}
/* Allocate SIZE bytes of memory whose contents should not be scanned
for pointers (useful, e.g., for strings). Note though that this
memory is *not* cleared; be sure to initialize it to prevent
information leaks. */
void *
scm_gc_malloc_pointerless (size_t size, const char *what)
{
return do_gc_malloc_atomic (size, what);
}
2002-08-04 00:18:33 +00:00
void *
scm_gc_malloc (size_t size, const char *what)
{
return do_gc_malloc (size, what);
2002-08-04 00:18:33 +00:00
}
void *
scm_gc_calloc (size_t size, const char *what)
{
/* `GC_MALLOC ()' always returns a zeroed buffer. */
return do_gc_malloc (size, what);
}
2002-08-04 00:18:33 +00:00
void *
scm_gc_realloc (void *mem, size_t old_size, size_t new_size, const char *what)
{
return do_gc_realloc (mem, new_size, what);
2002-08-04 00:18:33 +00:00
}
void
scm_gc_free (void *mem, size_t size, const char *what)
{
do_gc_free (mem);
2002-08-04 00:18:33 +00:00
}
char *
scm_gc_strndup (const char *str, size_t n, const char *what)
{
char *dst = do_gc_malloc_atomic (n + 1, what);
2002-08-04 00:18:33 +00:00
memcpy (dst, str, n);
dst[n] = 0;
return dst;
}
char *
scm_gc_strdup (const char *str, const char *what)
{
return scm_gc_strndup (str, strlen (str), what);
}