summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2012-02-23 14:18:56 +0100
committerAndy Wingo <wingo@pobox.com>2012-02-23 14:18:56 +0100
commit44b76a785ce075df07e6af1c2bf7d5ad3f4e3d4f (patch)
treec7c17dcb8bb3bfb823ab55c8cf8a08f8e0635992
parentbab917c9a37d8f69ccd9af1d5c37a53637fd0fdf (diff)
downloadguile-44b76a785ce075df07e6af1c2bf7d5ad3f4e3d4f.tar.gz
Revert "install pthread_atfork handlers for guile's static mutexen"
This reverts commit 6a97b1f93aace5c7c976aef51d36b3ae9cfd5630.
-rw-r--r--libguile/async.c3
-rw-r--r--libguile/deprecation.c3
-rw-r--r--libguile/fluids.c1
-rw-r--r--libguile/gc.c3
-rw-r--r--libguile/instructions.c3
-rw-r--r--libguile/ports.c1
-rw-r--r--libguile/posix.c3
-rw-r--r--libguile/strings.c1
-rw-r--r--libguile/threads.c3
9 files changed, 5 insertions, 16 deletions
diff --git a/libguile/async.c b/libguile/async.c
index e8739979c..80f561d10 100644
--- a/libguile/async.c
+++ b/libguile/async.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1995,1996,1997,1998,2000,2001, 2002, 2004, 2006, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
+/* Copyright (C) 1995,1996,1997,1998,2000,2001, 2002, 2004, 2006, 2008, 2009, 2010, 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
@@ -133,7 +133,6 @@ SCM_DEFINE (scm_run_asyncs, "run-asyncs", 1, 0, 0,
static scm_i_pthread_mutex_t async_mutex = SCM_I_PTHREAD_MUTEX_INITIALIZER;
-SCM_PTHREAD_ATFORK_LOCK_STATIC_MUTEX (async_mutex);
/* System asyncs. */
diff --git a/libguile/deprecation.c b/libguile/deprecation.c
index cb5377a19..5c1a246c2 100644
--- a/libguile/deprecation.c
+++ b/libguile/deprecation.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2001, 2006, 2010, 2011, 2012 Free Software Foundation, Inc.
+/* Copyright (C) 2001, 2006, 2010, 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
@@ -48,7 +48,6 @@ struct issued_warning {
};
static scm_i_pthread_mutex_t warn_lock = SCM_I_PTHREAD_MUTEX_INITIALIZER;
-SCM_PTHREAD_ATFORK_LOCK_STATIC_MUTEX (warn_lock);
static struct issued_warning *issued_warnings;
static int print_summary = 0;
diff --git a/libguile/fluids.c b/libguile/fluids.c
index e4906a418..282718e65 100644
--- a/libguile/fluids.c
+++ b/libguile/fluids.c
@@ -44,7 +44,6 @@ static void **allocated_fluids = NULL;
static size_t allocated_fluids_len = 0;
static scm_i_pthread_mutex_t fluid_admin_mutex = SCM_I_PTHREAD_MUTEX_INITIALIZER;
-SCM_PTHREAD_ATFORK_LOCK_STATIC_MUTEX (fluid_admin_mutex);
#define IS_FLUID(x) SCM_FLUID_P (x)
#define FLUID_NUM(x) SCM_I_FLUID_NUM (x)
diff --git a/libguile/gc.c b/libguile/gc.c
index 2c026b7fd..6d44f5e38 100644
--- a/libguile/gc.c
+++ b/libguile/gc.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1995,1996,1997,1998,1999,2000,2001, 2002, 2003, 2006, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
+/* Copyright (C) 1995,1996,1997,1998,1999,2000,2001, 2002, 2003, 2006, 2008, 2009, 2010, 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
@@ -647,7 +647,6 @@ scm_storage_prehistory ()
}
scm_i_pthread_mutex_t scm_i_gc_admin_mutex = SCM_I_PTHREAD_MUTEX_INITIALIZER;
-SCM_PTHREAD_ATFORK_LOCK_STATIC_MUTEX (scm_i_gc_admin_mutex);
void
scm_init_gc_protect_object ()
diff --git a/libguile/instructions.c b/libguile/instructions.c
index 2646f9029..f3b8963d2 100644
--- a/libguile/instructions.c
+++ b/libguile/instructions.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2001, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
+/* Copyright (C) 2001, 2009, 2010, 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
@@ -48,7 +48,6 @@ struct scm_instruction {
static scm_i_pthread_mutex_t itable_lock = SCM_I_PTHREAD_MUTEX_INITIALIZER;
-SCM_PTHREAD_ATFORK_LOCK_STATIC_MUTEX (itable_lock);
static struct scm_instruction*
diff --git a/libguile/ports.c b/libguile/ports.c
index 10bfce81e..5b98bf9f7 100644
--- a/libguile/ports.c
+++ b/libguile/ports.c
@@ -103,7 +103,6 @@ static long scm_numptob = 0; /* Number of port types. */
static long scm_ptobs_size = 0; /* Number of slots in the port type
table. */
static scm_i_pthread_mutex_t scm_ptobs_lock = SCM_I_PTHREAD_MUTEX_INITIALIZER;
-SCM_PTHREAD_ATFORK_LOCK_STATIC_MUTEX (scm_ptobs_lock);
long
scm_c_num_port_types (void)
diff --git a/libguile/posix.c b/libguile/posix.c
index abb1a92dd..4f8b8ac7a 100644
--- a/libguile/posix.c
+++ b/libguile/posix.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1995,1996,1997,1998,1999,2000,2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
+/* Copyright (C) 1995,1996,1997,1998,1999,2000,2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 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
@@ -1688,7 +1688,6 @@ SCM_DEFINE (scm_putenv, "putenv", 1, 0, 0,
is also acquired before calls to `nl_langinfo ()'. See `i18n.c' for
details. */
scm_i_pthread_mutex_t scm_i_locale_mutex = SCM_I_PTHREAD_MUTEX_INITIALIZER;
-SCM_PTHREAD_ATFORK_LOCK_STATIC_MUTEX (scm_i_locale_mutex);
#ifdef HAVE_SETLOCALE
diff --git a/libguile/strings.c b/libguile/strings.c
index c2edcd70a..961705782 100644
--- a/libguile/strings.c
+++ b/libguile/strings.c
@@ -226,7 +226,6 @@ narrow_stringbuf (SCM buf)
}
scm_i_pthread_mutex_t stringbuf_write_mutex = SCM_I_PTHREAD_MUTEX_INITIALIZER;
-SCM_PTHREAD_ATFORK_LOCK_STATIC_MUTEX (stringbuf_write_mutex);
/* Copy-on-write strings.
diff --git a/libguile/threads.c b/libguile/threads.c
index f78889b40..d5c51eaf3 100644
--- a/libguile/threads.c
+++ b/libguile/threads.c
@@ -500,7 +500,6 @@ SCM_THREAD_LOCAL scm_i_thread *scm_i_current_thread = NULL;
static scm_i_pthread_mutex_t thread_admin_mutex = SCM_I_PTHREAD_MUTEX_INITIALIZER;
-SCM_PTHREAD_ATFORK_LOCK_STATIC_MUTEX (thread_admin_mutex);
static scm_i_thread *all_threads = NULL;
static int thread_count;
@@ -2135,7 +2134,6 @@ static int threads_initialized_p = 0;
/* This mutex is used by SCM_CRITICAL_SECTION_START/END.
*/
scm_i_pthread_mutex_t scm_i_critical_section_mutex;
-SCM_PTHREAD_ATFORK_LOCK_STATIC_MUTEX (scm_i_critical_section_mutex);
static SCM dynwind_critical_section_mutex;
@@ -2151,7 +2149,6 @@ scm_dynwind_critical_section (SCM mutex)
/*** Initialization */
scm_i_pthread_mutex_t scm_i_misc_mutex;
-SCM_PTHREAD_ATFORK_LOCK_STATIC_MUTEX (scm_i_misc_mutex);
#if SCM_USE_PTHREAD_THREADS
pthread_mutexattr_t scm_i_pthread_mutexattr_recursive[1];