[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Guile-commits] 08/15: Make `read-bytes' suspendable for socket reads on
From: |
Jan Nieuwenhuizen |
Subject: |
[Guile-commits] 08/15: Make `read-bytes' suspendable for socket reads on MinGW. |
Date: |
Mon, 12 Apr 2021 05:55:43 -0400 (EDT) |
janneke pushed a commit to branch wip-mingw
in repository guile.
commit de871bda5cbbd0ca3c3c0a0900ad0cba9821ef00
Author: Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
AuthorDate: Fri Mar 27 21:29:23 2020 +0100
Make `read-bytes' suspendable for socket reads on MinGW.
On MinGW, port-read will block on sockets if no data is available.
Avoid blocking by using select first.
* module/ice-9/suspendable-ports.scm (read-bytes)[mingw?]: For socket
ports, guard port-read with select.
---
module/ice-9/suspendable-ports.scm | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/module/ice-9/suspendable-ports.scm
b/module/ice-9/suspendable-ports.scm
index a823f1d..a451b63 100644
--- a/module/ice-9/suspendable-ports.scm
+++ b/module/ice-9/suspendable-ports.scm
@@ -68,8 +68,12 @@
(define (wait-for-writable port) ((current-write-waiter) port))
(define (read-bytes port dst start count)
+ (define (socket? port)
+ (string-prefix? "#<input-output: socket" (format #f "~a" port)))
(cond
- (((port-read port) port dst start count)
+ ((and (or (not (socket? port))
+ (pair? (car (select (list port) '() '() 0 0))))
+ ((port-read port) port dst start count))
=> (lambda (read)
(unless (<= 0 read count)
(error "bad return from port read function" read))
- [Guile-commits] branch wip-mingw created (now be9b668), Jan Nieuwenhuizen, 2021/04/12
- [Guile-commits] 02/15: ice-9 ftw: Use 'absolute-file-name?' in 'nftw'., Jan Nieuwenhuizen, 2021/04/12
- [Guile-commits] 10/15: DRAFT Support for x86_64-w64-mingw32., Jan Nieuwenhuizen, 2021/04/12
- [Guile-commits] 15/15: DEBUG guile.cmd: Some Wine help., Jan Nieuwenhuizen, 2021/04/12
- [Guile-commits] 05/15: Compile fix for x86_64-MinGW., Jan Nieuwenhuizen, 2021/04/12
- [Guile-commits] 06/15: Add 'set-mode' procedure for MinGW., Jan Nieuwenhuizen, 2021/04/12
- [Guile-commits] 11/15: DRAFT Add partial `scm_fcntl' support for MinGW., Jan Nieuwenhuizen, 2021/04/12
- [Guile-commits] 08/15: Make `read-bytes' suspendable for socket reads on MinGW.,
Jan Nieuwenhuizen <=
- [Guile-commits] 12/15: Define 'SIGHUP' for MinGW., Jan Nieuwenhuizen, 2021/04/12
- [Guile-commits] 01/15: Document write-line., Jan Nieuwenhuizen, 2021/04/12
- [Guile-commits] 03/15: Fix 'gethostname' prototype for x86_64-MinGW., Jan Nieuwenhuizen, 2021/04/12
- [Guile-commits] 04/15: Clear errno before CreateProcess for MinGW., Jan Nieuwenhuizen, 2021/04/12
- [Guile-commits] 07/15: Add `scm_sigaction_for_thread' stub for MinGW., Jan Nieuwenhuizen, 2021/04/12
- [Guile-commits] 09/15: Install 'mingw_take_signal' on MinGW., Jan Nieuwenhuizen, 2021/04/12
- [Guile-commits] 13/15: Fix 'absolute-file-name?' and others for cross-build to MinGW., Jan Nieuwenhuizen, 2021/04/12
- [Guile-commits] 14/15: guix: Add guile-patched, guile-mingw., Jan Nieuwenhuizen, 2021/04/12