summaryrefslogtreecommitdiff
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
parent392d2833a2dddee61c5e78bc07aca7fc185fe314 (diff)
downloadguile-e200ddeeb267cfbf8969c7ad8c644014501586a8.tar.gz
* gc-malloc.c, gc.h, init.c: Reverted gc-malloc change of
2002-12-10.
-rw-r--r--libguile/ChangeLog3
-rw-r--r--libguile/gc-malloc.c16
-rw-r--r--libguile/gc.h1
-rw-r--r--libguile/init.c1
4 files changed, 3 insertions, 18 deletions
diff --git a/libguile/ChangeLog b/libguile/ChangeLog
index b8350c626..05b526fe8 100644
--- a/libguile/ChangeLog
+++ b/libguile/ChangeLog
@@ -1,5 +1,8 @@
2002-12-11 Mikael Djurfeldt <mdj@kvast.blakulla.net>
+ * gc-malloc.c, gc.h, init.c: Reverted gc-malloc change of
+ 2002-12-10.
+
* gc.c (scm_igc): Don't call scm_i_thread_invalidate_freelists.
* gc.c (scm_gc_sweep): Call it here instead, which is a more
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;
diff --git a/libguile/gc.h b/libguile/gc.h
index 73c06cd6d..ebb7ff6e9 100644
--- a/libguile/gc.h
+++ b/libguile/gc.h
@@ -372,7 +372,6 @@ SCM_API void scm_gc_register_root (SCM *p);
SCM_API void scm_gc_unregister_root (SCM *p);
SCM_API void scm_gc_register_roots (SCM *b, unsigned long n);
SCM_API void scm_gc_unregister_roots (SCM *b, unsigned long n);
-SCM_API void scm_gc_malloc_prehistory (void);
SCM_API int scm_init_storage (void);
SCM_API void *scm_get_stack_base (void);
SCM_API void scm_init_gc (void);
diff --git a/libguile/init.c b/libguile/init.c
index 2051fdb92..c9dec664b 100644
--- a/libguile/init.c
+++ b/libguile/init.c
@@ -444,7 +444,6 @@ scm_init_guile_1 (SCM_STACKITEM *base)
scm_block_gc = 1;
- scm_gc_malloc_prehistory ();
scm_threads_prehistory ();
scm_ports_prehistory ();
scm_smob_prehistory ();