mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-05-20 11:40:18 +02:00
Code Activity

Revert "add pthread_atfork helpers to our threading shims"

Browse source 
This reverts commit 2f745b64a1.
This commit is contained in:
Andy Wingo 2012-02-23 14:18:57 +01:00
parent 81b80b9610
commit 2bf0e122f0
3 changed files with 3 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

5
libguile/null-threads.h
View file

@ -3,7 +3,7 @@
#ifndef SCM_NULL_THREADS_H
#define SCM_NULL_THREADS_H
/* Copyright (C) 2005, 2006, 2010, 2012 Free Software Foundation, Inc.
/* Copyright (C) 2005, 2006, 2010 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
@ -102,9 +102,6 @@ SCM_API int scm_i_pthread_key_create (scm_i_pthread_key_t *key,
#define scm_i_scm_pthread_cond_wait scm_i_pthread_cond_wait
#define scm_i_scm_pthread_cond_timedwait scm_i_pthread_cond_timedwait
#define SCM_DEFINE_ATFORK_HANDLERS_FOR_MUTEX(m,lock,unlock) /* noop */
#define scm_i_pthread_atfork(pre,parent,child) do {} while (0)
#endif /* SCM_NULL_THREADS_H */

10
libguile/pthread-threads.h
View file

@ -3,7 +3,7 @@
#ifndef SCM_PTHREADS_THREADS_H
#define SCM_PTHREADS_THREADS_H
/* Copyright (C) 2002, 2005, 2006, 2011, 2012 Free Software Foundation, Inc.
/* Copyright (C) 2002, 2005, 2006, 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
@ -97,14 +97,6 @@ extern pthread_mutexattr_t scm_i_pthread_mutexattr_recursive[1];
#define scm_i_scm_pthread_cond_wait scm_pthread_cond_wait
#define scm_i_scm_pthread_cond_timedwait scm_pthread_cond_timedwait
#define SCM_DEFINE_ATFORK_HANDLERS_FOR_MUTEX(m,lock,unlock) \
static void lock (void) { pthread_mutex_lock (m); } \
static void unlock (void) { pthread_mutex_unlock (m); }
/* noop */
#define scm_i_pthread_atfork(pre,parent,child) \
pthread_atfork (pre, parent, child)
#endif /* SCM_PTHREADS_THREADS_H */
/*

6
libguile/threads.h
View file

@ -3,7 +3,7 @@
#ifndef SCM_THREADS_H
#define SCM_THREADS_H
/* Copyright (C) 1996,1997,1998,2000,2001, 2002, 2003, 2004, 2006, 2007, 2008, 2009, 2011, 2012 Free Software Foundation, Inc.
/* Copyright (C) 1996,1997,1998,2000,2001, 2002, 2003, 2004, 2006, 2007, 2008, 2009, 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
@ -130,10 +130,6 @@ typedef struct scm_i_thread {
#define SCM_VALIDATE_CONDVAR(pos, a) \
scm_assert_smob_type (scm_tc16_condvar, (a))
#define SCM_PTHREAD_ATFORK_LOCK_STATIC_MUTEX(m) \
SCM_SNARF_HERE(SCM_DEFINE_ATFORK_HANDLERS_FOR_MUTEX(&m,lock_##m,unlock_##m))\
SCM_SNARF_INIT(scm_i_pthread_atfork (lock_##m, unlock_##m, unlock_##m);)
SCM_API SCM scm_spawn_thread (scm_t_catch_body body, void *body_data,
scm_t_catch_handler handler, void *handler_data);