summaryrefslogtreecommitdiff
path: root/libguile/gc-malloc.c
diff options
context:
space:
mode:
authorMikael Djurfeldt <djurfeldt@nada.kth.se>2002-12-11 08:35:22 +0000
committerMikael Djurfeldt <djurfeldt@nada.kth.se>2002-12-11 08:35:22 +0000
commite200ddeeb267cfbf8969c7ad8c644014501586a8 (patch)
treecc93390fd63be91ab1bcd1378a45d19f497c2f25 /libguile/gc-malloc.c
parent392d2833a2dddee61c5e78bc07aca7fc185fe314 (diff)
downloadguile-e200ddeeb267cfbf8969c7ad8c644014501586a8.tar.gz
* gc-malloc.c, gc.h, init.c: Reverted gc-malloc change of
2002-12-10.
Diffstat (limited to 'libguile/gc-malloc.c')
-rw-r--r--libguile/gc-malloc.c16
1 files changed, 0 insertions, 16 deletions
diff --git a/libguile/gc-malloc.c b/libguile/gc-malloc.c
index b2c73a104..dd7e30432 100644
--- a/libguile/gc-malloc.c
+++ b/libguile/gc-malloc.c
@@ -99,14 +99,6 @@ extern unsigned long * __libc_ia64_register_backing_store_base;
static int scm_i_minyield_malloc;
-static scm_t_mutex malloc_mutex;
-
-void
-scm_gc_malloc_prehistory ()
-{
- scm_i_plugin_mutex_init (&malloc_mutex, 0);
-}
-
void
scm_gc_init_malloc (void)
{
@@ -134,9 +126,7 @@ scm_realloc (void *mem, size_t size)
{
void *ptr;
- scm_i_plugin_mutex_lock (&malloc_mutex);
SCM_SYSCALL (ptr = realloc (mem, size));
- scm_i_plugin_mutex_unlock (&malloc_mutex);
if (ptr)
return ptr;
@@ -144,9 +134,7 @@ scm_realloc (void *mem, size_t size)
scm_i_sweep_all_segments ("realloc");
- scm_i_plugin_mutex_lock (&malloc_mutex);
SCM_SYSCALL (ptr = realloc (mem, size));
- scm_i_plugin_mutex_unlock (&malloc_mutex);
if (ptr)
{
scm_i_thread_wake_up ();
@@ -158,9 +146,7 @@ scm_realloc (void *mem, size_t size)
scm_i_thread_wake_up ();
- scm_i_plugin_mutex_lock (&malloc_mutex);
SCM_SYSCALL (ptr = realloc (mem, size));
- scm_i_plugin_mutex_unlock (&malloc_mutex);
if (ptr)
return ptr;
@@ -186,9 +172,7 @@ scm_calloc (size_t sz)
By default, try to use calloc, as it is likely more efficient than
calling memset by hand.
*/
- scm_i_plugin_mutex_lock (&malloc_mutex);
SCM_SYSCALL(ptr= calloc (sz, 1));
- scm_i_plugin_mutex_unlock (&malloc_mutex);
if (ptr)
return ptr;