1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-06-19 02:00:26 +02:00

Merge remote-tracking branch 'origin/stable-2.0'

This commit is contained in:
Mark H Weaver 2012-11-03 03:35:14 -04:00
commit d628c078cc
7 changed files with 102 additions and 31 deletions

View file

@ -562,7 +562,7 @@ of file names is sorted according to ENTRY<?, which defaults to
result
(visit (basename name*) result)))
(and=> (file-system-fold enter? leaf down up skip error #f name stat)
(and=> (file-system-fold enter? leaf down up skip error #f name lstat)
(lambda (files)
(sort files entry<?))))

View file

@ -93,8 +93,10 @@ touched."
;; Wait for futures to be available and process them.
(lock-mutex %futures-mutex)
(let loop ()
(wait-condition-variable %futures-available
%futures-mutex)
(when (q-empty? %futures)
(wait-condition-variable %futures-available
%futures-mutex))
(or (q-empty? %futures)
(let ((future (deq! %futures)))
(lock-mutex (future-mutex future))