summaryrefslogtreecommitdiff
path: root/libguile/threads.c
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2012-02-08 11:48:08 +0100
committerAndy Wingo <wingo@pobox.com>2012-02-08 11:48:08 +0100
commit0858753e829fd399b55700688b4b2cb9c3ea6908 (patch)
tree55f97b3c1db7a33a181314663cb4e4750077fc3f /libguile/threads.c
parent0aed71aa51e89e714de2392c2a5f44694dca77ea (diff)
parent817307ccac5027fd784798bbbf6ffb52e0a5d751 (diff)
downloadguile-0858753e829fd399b55700688b4b2cb9c3ea6908.tar.gz
Merge remote-tracking branch 'origin/stable-2.0'
Conflicts: GUILE-VERSION libguile/gc-malloc.c libguile/ports.c
Diffstat (limited to 'libguile/threads.c')
-rw-r--r--libguile/threads.c17
1 files changed, 9 insertions, 8 deletions
diff --git a/libguile/threads.c b/libguile/threads.c
index 463414f4a..d5c51eaf3 100644
--- a/libguile/threads.c
+++ b/libguile/threads.c
@@ -1471,11 +1471,12 @@ SCM scm_lock_mutex (SCM mx)
SCM_DEFINE (scm_lock_mutex_timed, "lock-mutex", 1, 2, 0,
(SCM m, SCM timeout, SCM owner),
-"Lock @var{mutex}. If the mutex is already locked, the calling thread "
-"blocks until the mutex becomes available. The function returns when "
-"the calling thread owns the lock on @var{mutex}. Locking a mutex that "
-"a thread already owns will succeed right away and will not block the "
-"thread. That is, Guile's mutexes are @emph{recursive}. ")
+ "Lock mutex @var{m}. If the mutex is already locked, the calling\n"
+ "thread blocks until the mutex becomes available. The function\n"
+ "returns when the calling thread owns the lock on @var{m}.\n"
+ "Locking a mutex that a thread already owns will succeed right\n"
+ "away and will not block the thread. That is, Guile's mutexes\n"
+ "are @emph{recursive}.")
#define FUNC_NAME s_scm_lock_mutex_timed
{
SCM exception;
@@ -1784,9 +1785,9 @@ SCM_DEFINE (scm_make_condition_variable, "make-condition-variable", 0, 0, 0,
SCM_DEFINE (scm_timed_wait_condition_variable, "wait-condition-variable", 2, 1, 0,
(SCM cv, SCM mx, SCM t),
-"Wait until @var{cond-var} has been signalled. While waiting, "
-"@var{mutex} is atomically unlocked (as with @code{unlock-mutex}) and "
-"is locked again when this function returns. When @var{time} is given, "
+"Wait until condition variable @var{cv} has been signalled. While waiting, "
+"mutex @var{mx} is atomically unlocked (as with @code{unlock-mutex}) and "
+"is locked again when this function returns. When @var{t} is given, "
"it specifies a point in time where the waiting should be aborted. It "
"can be either a integer as returned by @code{current-time} or a pair "
"as returned by @code{gettimeofday}. When the waiting is aborted the "