mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-04-30 11:50:28 +02:00
Code Activity

Merge branch 'master' into strftime-gnulib

Browse source 
Conflicts:
	libguile/ChangeLog
	srfi/ChangeLog
	test-suite/ChangeLog
This commit is contained in:
Ludovic Courtès 2008-09-09 22:03:42 +02:00
commit 53f4876abc
17 changed files with 73 additions and 357 deletions
Download patch file Download diff file Expand all files Collapse all files

18
NEWS
View file

@ -32,6 +32,11 @@ See `cancel-thread', `set-thread-cleanup!', and `thread-cleanup'.
* Changes to the C interface * Changes to the C interface
** Internal `scm_i_' functions now have "hidden" linkage with GCC/ELF
This makes these internal functions technically not callable from
application code.
** Functions for handling `scm_option' now no longer require an argument ** Functions for handling `scm_option' now no longer require an argument
indicating length of the `scm_t_option' array. indicating length of the `scm_t_option' array.
@ -49,15 +54,18 @@ When you use GDS to evaluate Scheme code from Emacs, you can now use
`C-u' to indicate that you want to single step through that code. See `C-u' to indicate that you want to single step through that code. See
`Evaluating Scheme Code' in the manual for more details. `Evaluating Scheme Code' in the manual for more details.
* Changes to the distribution
** Automake's `AM_MAINTAINER_MODE' is no longer used
Thus, the `--enable-maintainer-mode' configure option is no longer
available: Guile is now always configured in "maintainer mode".
* Bugs fixed * Bugs fixed
** Internal `scm_i_' functions now have "hidden" linkage with GCC/ELF
This makes these internal functions technically not callable from
application code.
** `guile-config link' now prints `-L$libdir' before `-lguile' ** `guile-config link' now prints `-L$libdir' before `-lguile'
** Fix memory corruption involving GOOPS' `class-redefinition' ** Fix memory corruption involving GOOPS' `class-redefinition'
** Fix possible deadlock in `mutex-lock'
** Fix build issue on Tru64 and ia64-hp-hpux11.23 (`SCM_UNPACK' macro) ** Fix build issue on Tru64 and ia64-hp-hpux11.23 (`SCM_UNPACK' macro)
** Fix build issue on mips, mipsel, powerpc and ia64 (stack direction) ** Fix build issue on mips, mipsel, powerpc and ia64 (stack direction)
** Fix build issue on hppa2.0w-hp-hpux11.11 (`dirent64' and `readdir64_r') ** Fix build issue on hppa2.0w-hp-hpux11.11 (`dirent64' and `readdir64_r')

1
configure.in
View file

@ -48,7 +48,6 @@ AC_CONFIG_SRCDIR([GUILE-VERSION])
. $srcdir/GUILE-VERSION . $srcdir/GUILE-VERSION
AM_MAINTAINER_MODE
AC_CONFIG_HEADERS([config.h]) AC_CONFIG_HEADERS([config.h])
AH_TOP(/*GUILE_CONFIGURE_COPYRIGHT*/) AH_TOP(/*GUILE_CONFIGURE_COPYRIGHT*/)

3
doc/Makefile.am
View file

@ -43,9 +43,8 @@ EXTRA_DIST = groupings.alist # guile-api.alist
# pending the papers from Robert Merkel # pending the papers from Robert Merkel
# EXTRA_DIST = guile.1 # EXTRA_DIST = guile.1
if MAINTAINER_MODE
include $(top_srcdir)/am/maintainer-dirs include $(top_srcdir)/am/maintainer-dirs
guile-api.alist: guile-api.alist-FORCE guile-api.alist: guile-api.alist-FORCE
( cd $(top_builddir) ; $(mscripts)/update-guile-api.alist ) ( cd $(top_builddir) ; $(mscripts)/update-guile-api.alist )
guile-api.alist-FORCE: guile-api.alist-FORCE:
endif

5
ice-9/Makefile.am
View file

@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in. ## Process this file with automake to produce Makefile.in.
## ##
## Copyright (C) 1998,1999,2000,2001,2003, 2004, 2006 Free Software Foundation, Inc. ## Copyright (C) 1998,1999,2000,2001,2003, 2004, 2006, 2008 Free Software Foundation, Inc.
## ##
## This file is part of GUILE. ## This file is part of GUILE.
## ##
@ -46,7 +46,6 @@ TAGS_FILES = $(subpkgdata_DATA)
## test.scm is not currently installed. ## test.scm is not currently installed.
EXTRA_DIST = $(ice9_sources) test.scm compile-psyntax.scm EXTRA_DIST = $(ice9_sources) test.scm compile-psyntax.scm
if MAINTAINER_MODE
# We expect this to never be invoked when there is not already # We expect this to never be invoked when there is not already
# ice-9/psyntax.pp in %load-path, since compile-psyntax.scm depends # ice-9/psyntax.pp in %load-path, since compile-psyntax.scm depends
# on ice-9/syncase.scm, which does `(load-from-path "ice-9/psyntax.pp")'. # on ice-9/syncase.scm, which does `(load-from-path "ice-9/psyntax.pp")'.
@ -56,4 +55,4 @@ include $(top_srcdir)/am/pre-inst-guile
psyntax.pp: psyntax.ss psyntax.pp: psyntax.ss
$(preinstguile) -s $(srcdir)/compile-psyntax.scm \ $(preinstguile) -s $(srcdir)/compile-psyntax.scm \
$(srcdir)/psyntax.ss $(srcdir)/psyntax.pp $(srcdir)/psyntax.ss $(srcdir)/psyntax.pp
endif

14
libguile/ChangeLog
View file

@ -1,3 +1,17 @@
2008-08-29 Julian Graham <joolean@gmail.com>
* threads.c (fat_mutex_lock): Resolve a deadlock caused by not
checking mutex state after calling `SCM_TICK'.
2008-08-27 Ludovic Courtès <ludo@gnu.org>
Fix builds `--without-threads'. Reported by Han-Wen Nienhuys
<hanwen@xs4all.nl>.
* scmsigs.c (scm_i_close_signal_pipe): Don't refer to
`signal_pipe' unless `SCM_USE_PTHREAD_THREADS' is true.
* threads.c (scm_leave_guile_cleanup): Mark as `SCM_UNUSED'.
2008-08-25 Ludovic Courtès <ludo@gnu.org> 2008-08-25 Ludovic Courtès <ludo@gnu.org>
* Makefile.am (AM_CFLAGS): New. * Makefile.am (AM_CFLAGS): New.

221
libguile/coop-defs.h
View file

@ -1,221 +0,0 @@
/* classes: h_files */
#ifndef SCM_COOP_DEFS_H
#define SCM_COOP_DEFS_H
/* Copyright (C) 1996,1997,1998,1999,2000,2001, 2002, 2006 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 as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* 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.
*
* 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
*/
#include "libguile/__scm.h"
#include "libguile/iselect.h"
#if SCM_HAVE_WINSOCK2_H
# include <winsock2.h>
#endif
#ifdef GUILE_PTHREAD_COMPAT
#include <pthread.h>
#endif
/* This file is included by threads.h, which, in turn, is included by
libguile.h while coop-threads.h only is included by
coop-threads.c. */
/* The coop_t struct must be declared here, since macros in this file
refer to the data member. */
/* The notion of a thread is merged with the notion of a queue.
Thread stuff: thread status (sp) and stuff to use during
(re)initialization. Queue stuff: next thread in the queue
(next). */
struct qt_t;
typedef struct coop_t {
struct qt_t *sp; /* QuickThreads handle. */
void *sto; /* `malloc'-allocated stack. */
struct coop_t *next; /* Next thread in the queue. */
struct coop_t *all_next;
struct coop_t *all_prev;
void *data; /* Thread local data */
void **specific; /* Data associated with keys */
int n_keys; /* Upper limit for keys on this thread */
void *base; /* Base of stack */
void *top; /* Top of stack */
void *joining; /* A queue of threads waiting to join this
thread */
SCM handle; /* SCM handle, protected via scm_all_threads. */
int nfds;
SELECT_TYPE *readfds;
SELECT_TYPE *writefds;
SELECT_TYPE *exceptfds;
int timeoutp;
struct timeval wakeup_time; /* Time to stop sleeping */
int _errno;
int retval;
#ifdef GUILE_PTHREAD_COMPAT
pthread_t dummy_thread;
pthread_mutex_t dummy_mutex;
#endif
} coop_t;
/* A queue is a circular list of threads. The queue head is a
designated list element. If this is a uniprocessor-only
implementation we can store the `main' thread in this, but in a
multiprocessor there are several `heavy' threads but only one run
queue. A fancier implementation might have private run queues,
which would lead to a simpler (trivial) implementation */
typedef struct coop_q_t {
coop_t t;
coop_t *tail;
} coop_q_t;
/* A Mutex variable is made up of a owner thread, and a queue of threads
waiting on the mutex */
typedef struct coop_m {
coop_t *owner; /* Mutex owner */
int level; /* for recursive locks. */
coop_q_t waiting; /* Queue of waiting threads */
} coop_m;
typedef int coop_mattr;
SCM_API int coop_mutex_init (coop_m*);
SCM_API int coop_new_mutex_init (coop_m*, coop_mattr*);
SCM_API int coop_mutex_lock (coop_m*);
SCM_API int coop_mutex_trylock (coop_m*);
SCM_API int coop_mutex_unlock (coop_m*);
SCM_API int coop_mutex_destroy (coop_m*);
/* A Condition variable is made up of a list of threads waiting on the
condition. */
typedef struct coop_c {
coop_q_t waiting; /* Queue of waiting threads */
} coop_c;
typedef int coop_cattr;
SCM_API int coop_condition_variable_init (coop_c*);
SCM_API int coop_new_condition_variable_init (coop_c*, coop_cattr*);
SCM_API int coop_condition_variable_wait_mutex (coop_c*, coop_m*);
SCM_API int coop_condition_variable_timed_wait_mutex (coop_c*,
coop_m*,
const scm_t_timespec *abstime);
SCM_API int coop_condition_variable_signal (coop_c*);
SCM_API int coop_condition_variable_broadcast (coop_c*);
SCM_API int coop_condition_variable_destroy (coop_c*);
typedef int coop_k;
typedef coop_k scm_t_key;
SCM_API int coop_key_create (coop_k *keyp, void (*destruktor) (void *value));
SCM_API int coop_setspecific (coop_k key, const void *value);
SCM_API void *coop_getspecific (coop_k key);
SCM_API int coop_key_delete (coop_k);
#define scm_key_create coop_key_create
#define scm_setspecific coop_setspecific
#define scm_getspecific coop_getspecific
#define scm_key_delete coop_key_delete
SCM_API coop_t *coop_global_curr; /* Currently-executing thread. */
SCM_API void coop_join (coop_t *t);
SCM_API void coop_yield (void);
SCM_API size_t scm_switch_counter;
SCM_API size_t scm_thread_count;
/* Some iselect functions. */
/* I'm not sure whether these three declarations should be here.
They're really defined in iselect.c, so you'd think they'd go in
iselect.h, but they use coop_t, defined above, which uses things
defined in iselect.h. Basically, we're making at best a flailing
(and failing) attempt at modularity here, and I don't have time to
rethink this at the moment. This code awaits a Hero. --JimB
*/
SCM_API void coop_timeout_qinsert (coop_q_t *, coop_t *);
SCM_API coop_t *coop_next_runnable_thread (void);
SCM_API coop_t *coop_wait_for_runnable_thread_now (struct timeval *);
SCM_API coop_t *coop_wait_for_runnable_thread (void);
/* Cooperative threads don't need to have these defined */
#define SCM_CRITICAL_SECTION_START
#define SCM_CRITICAL_SECTION_END
#define SCM_NO_CRITICAL_SECTION_OWNER 0
#define SCM_THREAD_SWITCH_COUNT 50 /* was 10 /mdj */
#if 0
#define SCM_THREAD_SWITCHING_CODE \
do { \
if (scm_thread_count > 1) \
coop_yield(); \
} while (0)
#else
#define SCM_THREAD_SWITCHING_CODE \
do { \
if (scm_thread_count > 1) \
{ \
scm_switch_counter--; \
if (scm_switch_counter == 0) \
{ \
scm_switch_counter = SCM_THREAD_SWITCH_COUNT; \
coop_yield(); \
} \
} \
} while (0)
#endif
/* For pthreads, this is a value associated with a specific key.
* For coop, we use a special field for increased efficiency.
*/
#define SCM_THREAD_LOCAL_DATA (coop_global_curr->data)
#define SCM_SET_THREAD_LOCAL_DATA(ptr) (coop_global_curr->data = (ptr))
#endif /* SCM_COOP_DEFS_H */
/*
Local Variables:
c-file-style: "gnu"
End:
*/

105
libguile/coop-threads.h
View file

@ -1,105 +0,0 @@
/* classes: h_files */
#ifndef SCM_COOP_THREADS_H
#define SCM_COOP_THREADS_H
/* Copyright (C) 1996,1997,1998,2000, 2002, 2006 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 as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* 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.
*
* 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
*/
/* This file is only included by coop-threads.c while coop-defs.h is
included by threads.h, which, in turn, is included by
libguile.h. */
/* The coop_t struct is declared in coop-defs.h. */
#include "libguile/__scm.h"
#include <time.h>
#include "libguile/coop-defs.h"
#include "qt/qt.h"
/* This code is based on a sample thread libraru by David Keppel.
Portions of this file fall under the following copyright: */
/*
* QuickThreads -- Threads-building toolkit.
* Copyright (c) 1993 by David Keppel
*
* Permission to use, copy, modify and distribute this software and
* its documentation for any purpose and without fee is hereby
* granted, provided that the above copyright notice and this notice
* appear in all copies. This software is provided as a
* proof-of-concept and for demonstration purposes; there is no
* representation about the suitability of this software for any
* purpose.
*/
/* Each thread starts by calling a user-supplied function of this
type. */
typedef void (coop_userf_t)(void *p0);
/* Call this before any other primitives. */
SCM_API void coop_init (void);
/* When one or more threads are created by the main thread,
the system goes multithread when this is called. It is done
(no more runable threads) when this returns. */
SCM_API void coop_start (void);
/* Create a thread and make it runable. When the thread starts
running it will call `f' with arguments `p0' and `p1'. */
SCM_API coop_t *coop_create (coop_userf_t *f, void *p0);
/* The current thread stops running but stays runable.
It is an error to call `coop_yield' before `coop_start'
is called or after `coop_start' returns. */
SCM_API void coop_yield (void);
/* Like `coop_yield' but the thread is discarded. Any intermediate
state is lost. The thread can also terminate by simply
returning. */
SCM_API void coop_abort (void);
/* The following are needed in iselect.c */
SCM_API coop_t *coop_qget (coop_q_t *);
SCM_API void coop_qput (coop_q_t *, coop_t *);
SCM_API void *coop_sleephelp (qt_t *, void *, void *);
SCM_API coop_t *coop_wait_for_runnable_thread ();
SCM_API coop_q_t coop_global_runq; /* A queue of runable threads. */
SCM_API coop_q_t coop_global_sleepq;
SCM_API coop_q_t coop_tmp_queue;
SCM_API coop_q_t coop_global_allq; /* A queue of all threads. */
SCM_API coop_t *coop_global_curr; /* Currently-executing thread. */
#endif /* SCM_COOP_THREADS_H */
/*
Local Variables:
c-file-style: "gnu"
End:
*/

2
libguile/eval.c
View file

@ -2121,7 +2121,7 @@ unmemoize_future (const SCM expr, const SCM env)
return scm_list_2 (scm_sym_future, unmemoize_expression (thunk_expr, env)); return scm_list_2 (scm_sym_future, unmemoize_expression (thunk_expr, env));
} }
#endif #endif /* futures disabled. */
SCM_SYNTAX (s_gset_x, "set!", scm_i_makbimacro, scm_m_generalized_set_x); SCM_SYNTAX (s_gset_x, "set!", scm_i_makbimacro, scm_m_generalized_set_x);
SCM_SYMBOL (scm_sym_setter, "setter"); SCM_SYMBOL (scm_sym_setter, "setter");

6
libguile/gc.c
View file

@ -597,8 +597,9 @@ scm_i_gc (const char *what)
scm_i_sweep_all_segments ("GC", &scm_i_gc_sweep_stats); scm_i_sweep_all_segments ("GC", &scm_i_gc_sweep_stats);
scm_check_deprecated_memory_return (); scm_check_deprecated_memory_return ();
#if (SCM_DEBUG_CELL_ACCESSES == 0 && SCM_SIZEOF_UNSIGNED_LONG ==4)
/* Sanity check our numbers. */ /* Sanity check our numbers. */
/* TODO(hanwen): figure out why the stats are off on x64_64. */
/* If this was not true, someone touched mark bits outside of the /* If this was not true, someone touched mark bits outside of the
mark phase. */ mark phase. */
assert (scm_cells_allocated == scm_i_marked_count ()); assert (scm_cells_allocated == scm_i_marked_count ());
@ -607,7 +608,8 @@ scm_i_gc (const char *what)
+ scm_i_master_freelist2.heap_total_cells)); + scm_i_master_freelist2.heap_total_cells));
assert (scm_i_gc_sweep_stats.collected + scm_cells_allocated assert (scm_i_gc_sweep_stats.collected + scm_cells_allocated
== scm_i_gc_sweep_stats.swept); == scm_i_gc_sweep_stats.swept);
#endif /* SCM_DEBUG_CELL_ACCESSES */
/* Mark */ /* Mark */
scm_c_hook_run (&scm_before_mark_c_hook, 0); scm_c_hook_run (&scm_before_mark_c_hook, 0);

18
libguile/i18n.c
View file

@ -1,4 +1,4 @@
/* Copyright (C) 2006, 2007 Free Software Foundation, Inc. /* Copyright (C) 2006, 2007, 2008 Free Software Foundation, Inc.
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public * modify it under the terms of the GNU Lesser General Public
@ -769,7 +769,7 @@ static inline void
str_upcase (register char *dst, register const char *src) str_upcase (register char *dst, register const char *src)
{ {
for (; *src != '\0'; src++, dst++) for (; *src != '\0'; src++, dst++)
*dst = toupper (*src); *dst = toupper ((int) *src);
*dst = '\0'; *dst = '\0';
} }
@ -777,7 +777,7 @@ static inline void
str_downcase (register char *dst, register const char *src) str_downcase (register char *dst, register const char *src)
{ {
for (; *src != '\0'; src++, dst++) for (; *src != '\0'; src++, dst++)
*dst = tolower (*src); *dst = tolower ((int) *src);
*dst = '\0'; *dst = '\0';
} }
@ -1120,13 +1120,13 @@ SCM_DEFINE (scm_char_locale_downcase, "char-locale-downcase", 1, 1, 0,
if (c_locale != NULL) if (c_locale != NULL)
{ {
#ifdef USE_GNU_LOCALE_API #ifdef USE_GNU_LOCALE_API
c_result = tolower_l (c_chr, c_locale); c_result = tolower_l ((int) c_chr, c_locale);
#else #else
RUN_IN_LOCALE_SECTION (c_locale, c_result = tolower (c_chr)); RUN_IN_LOCALE_SECTION (c_locale, c_result = tolower ((int) c_chr));
#endif #endif
} }
else else
c_result = tolower (c_chr); c_result = tolower ((int) c_chr);
return (SCM_MAKE_CHAR (c_result)); return (SCM_MAKE_CHAR (c_result));
} }
@ -1150,13 +1150,13 @@ SCM_DEFINE (scm_char_locale_upcase, "char-locale-upcase", 1, 1, 0,
if (c_locale != NULL) if (c_locale != NULL)
{ {
#ifdef USE_GNU_LOCALE_API #ifdef USE_GNU_LOCALE_API
c_result = toupper_l (c_chr, c_locale); c_result = toupper_l ((int) c_chr, c_locale);
#else #else
RUN_IN_LOCALE_SECTION (c_locale, c_result = toupper (c_chr)); RUN_IN_LOCALE_SECTION (c_locale, c_result = toupper ((int) c_chr));
#endif #endif
} }
else else
c_result = toupper (c_chr); c_result = toupper ((int) c_chr);
return (SCM_MAKE_CHAR (c_result)); return (SCM_MAKE_CHAR (c_result));
} }

4
libguile/scmsigs.c
View file

@ -1,4 +1,4 @@
/* Copyright (C) 1995,1996,1997,1998,1999,2000,2001, 2002, 2004, 2006, 2007 Free Software Foundation, Inc. /* Copyright (C) 1995,1996,1997,1998,1999,2000,2001, 2002, 2004, 2006, 2007, 2008 Free Software Foundation, Inc.
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public * modify it under the terms of the GNU Lesser General Public
@ -680,8 +680,10 @@ scm_i_close_signal_pipe()
been launched at this point, it never will be before shutdown. */ been launched at this point, it never will be before shutdown. */
scm_i_pthread_mutex_lock (&signal_delivery_thread_mutex); scm_i_pthread_mutex_lock (&signal_delivery_thread_mutex);
#if SCM_USE_PTHREAD_THREADS
if (scm_i_signal_delivery_thread != NULL) if (scm_i_signal_delivery_thread != NULL)
close (signal_pipe[1]); close (signal_pipe[1]);
#endif
scm_i_pthread_mutex_unlock (&signal_delivery_thread_mutex); scm_i_pthread_mutex_unlock (&signal_delivery_thread_mutex);
} }

6
libguile/srcprop.c
View file

@ -84,6 +84,8 @@ SCM_GLOBAL_SYMBOL (scm_sym_breakpoint, "breakpoint");
#define SETSRCPROPPOS(p, l, c) (SCM_SET_CELL_WORD(p,1, SRCPROPMAKPOS (l, c))) #define SETSRCPROPPOS(p, l, c) (SCM_SET_CELL_WORD(p,1, SRCPROPMAKPOS (l, c)))
#define SETSRCPROPLINE(p, l) SETSRCPROPPOS (p, l, SRCPROPCOL (p)) #define SETSRCPROPLINE(p, l) SETSRCPROPPOS (p, l, SRCPROPCOL (p))
#define SETSRCPROPCOL(p, c) SETSRCPROPPOS (p, SRCPROPLINE (p), c) #define SETSRCPROPCOL(p, c) SETSRCPROPPOS (p, SRCPROPLINE (p), c)
#define SETSRCPROPCOPY(p, c) (SCM_SET_CELL_WORD(p, 2, c))
#define SETSRCPROPPLIST(p, l) (SCM_SET_CELL_WORD(p, 3, l))
@ -302,14 +304,14 @@ SCM_DEFINE (scm_set_source_property_x, "set-source-property!", 3, 0, 0,
else if (scm_is_eq (scm_sym_copy, key)) else if (scm_is_eq (scm_sym_copy, key))
{ {
if (SRCPROPSP (p)) if (SRCPROPSP (p))
SRCPROPCOPY (p) = datum; SETSRCPROPCOPY (p, datum);
else else
SCM_WHASHSET (scm_source_whash, h, scm_make_srcprops (0, 0, SCM_UNDEFINED, datum, p)); SCM_WHASHSET (scm_source_whash, h, scm_make_srcprops (0, 0, SCM_UNDEFINED, datum, p));
} }
else else
{ {
if (SRCPROPSP (p)) if (SRCPROPSP (p))
SRCPROPPLIST (p) = scm_acons (key, datum, SRCPROPPLIST (p)); SETSRCPROPPLIST (p, scm_acons (key, datum, SRCPROPPLIST (p)));
else else
SCM_WHASHSET (scm_source_whash, h, scm_acons (key, datum, p)); SCM_WHASHSET (scm_source_whash, h, scm_acons (key, datum, p));
} }

4
libguile/threads.c
View file

@ -784,7 +784,7 @@ scm_with_guile (void *(*func)(void *), void *data)
scm_i_default_dynamic_state); scm_i_default_dynamic_state);
} }
static void SCM_UNUSED static void
scm_leave_guile_cleanup (void *x) scm_leave_guile_cleanup (void *x)
{ {
scm_leave_guile (); scm_leave_guile ();
@ -1292,11 +1292,11 @@ fat_mutex_lock (SCM mutex, scm_t_timespec *timeout, SCM owner, int *ret)
break; break;
} }
} }
block_self (m->waiting, mutex, &m->lock, timeout);
scm_i_pthread_mutex_unlock (&m->lock); scm_i_pthread_mutex_unlock (&m->lock);
SCM_TICK; SCM_TICK;
scm_i_scm_pthread_mutex_lock (&m->lock); scm_i_scm_pthread_mutex_lock (&m->lock);
} }
block_self (m->waiting, mutex, &m->lock, timeout);
} }
scm_i_pthread_mutex_unlock (&m->lock); scm_i_pthread_mutex_unlock (&m->lock);
return err; return err;

5
srfi/ChangeLog
View file

@ -1,3 +1,8 @@
2008-08-30 Julian Graham <joolean@gmail.com>
* srfi-18.scm: Raise error if Guile not built with threading
support.
2008-08-25 Ludovic Courtès <ludo@gnu.org> 2008-08-25 Ludovic Courtès <ludo@gnu.org>
* Makefile.am (AM_CFLAGS): New. * Makefile.am (AM_CFLAGS): New.

3
srfi/srfi-18.scm
View file

@ -89,6 +89,9 @@
make-condition-variable make-condition-variable
raise)) raise))
(if (not (provided? 'threads))
(error "SRFI-18 requires Guile with threads support"))
(cond-expand-provide (current-module) '(srfi-18)) (cond-expand-provide (current-module) '(srfi-18))
(define (check-arg-type pred arg caller) (define (check-arg-type pred arg caller)

5
test-suite/ChangeLog
View file

@ -1,3 +1,8 @@
2008-08-27 Ludovic Courtès <ludo@gnu.org>
* tests/srfi-18.test: Don't run the tests unless
"(provided? 'threads)" is true.
2008-08-25 Ludovic Courtès <ludo@gnu.org> 2008-08-25 Ludovic Courtès <ludo@gnu.org>
* standalone/Makefile.am (test_cflags): Add `$(GCC_CFLAGS)'. * standalone/Makefile.am (test_cflags): Add `$(GCC_CFLAGS)'.

10
test-suite/tests/srfi-18.test
View file

@ -1,7 +1,7 @@
;;;; srfi-18.test --- Test suite for Guile's SRFI-18 functions. -*- scheme -*- ;;;; srfi-18.test --- Test suite for Guile's SRFI-18 functions. -*- scheme -*-
;;;; Julian Graham, 2007-10-26 ;;;; Julian Graham, 2007-10-26
;;;; ;;;;
;;;; Copyright (C) 2007 Free Software Foundation, Inc. ;;;; Copyright (C) 2007, 2008 Free Software Foundation, Inc.
;;;; ;;;;
;;;; This program is free software; you can redistribute it and/or modify ;;;; This program is free software; you can redistribute it and/or modify
;;;; it under the terms of the GNU General Public License as published by ;;;; it under the terms of the GNU General Public License as published by
@ -19,8 +19,10 @@
;;;; Boston, MA 02110-1301 USA ;;;; Boston, MA 02110-1301 USA
(define-module (test-suite test-srfi-18) (define-module (test-suite test-srfi-18)
#:use-module (test-suite lib) #:use-module (test-suite lib))
#:use-module (srfi srfi-18))
(and (provided? 'threads)
(use-modules (srfi srfi-18))
(with-test-prefix "current-thread" (with-test-prefix "current-thread"
@ -475,3 +477,5 @@
(set! success #t))) (set! success #t)))
(lambda () (thread-join! t))) (lambda () (thread-join! t)))
success))) success)))
)