aboutsummaryrefslogtreecommitdiff
path: root/gnu
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2016-11-22 22:57:41 +0100
committerLudovic Courtès <ludo@gnu.org>2016-11-22 23:45:08 +0100
commitad17470551d3e7fdc8e91930d37716e136b1080d (patch)
tree836b95930b9368e01310cf07f0bdee010f4bafcd /gnu
parent106b389e525f93a56bd1d25fd33eecbd552a8c93 (diff)
downloadguix-ad17470551d3e7fdc8e91930d37716e136b1080d.tar
guix-ad17470551d3e7fdc8e91930d37716e136b1080d.tar.gz
marionette: Avoid use of SIGALRM for timeouts.
* gnu/build/marionette.scm (make-marionette)[accept*]: New procedures. Remove calls to 'sigaction'. Use 'accept*' instead of 'accept'.
Diffstat (limited to 'gnu')
-rw-r--r--gnu/build/marionette.scm17
1 files changed, 9 insertions, 8 deletions
diff --git a/gnu/build/marionette.scm b/gnu/build/marionette.scm
index 9399c55313..d36e1c8d09 100644
--- a/gnu/build/marionette.scm
+++ b/gnu/build/marionette.scm
@@ -93,6 +93,13 @@ QEMU monitor and to the guest's backdoor REPL."
"-device" "virtio-serial"
"-device" "virtconsole,chardev=repl"))
+ (define (accept* port)
+ (match (select (list port) '() (list port) timeout)
+ (((port) () ())
+ (accept port))
+ (_
+ (error "timeout in 'accept'" port))))
+
(let ((monitor (socket AF_UNIX SOCK_STREAM 0))
(repl (socket AF_UNIX SOCK_STREAM 0)))
(bind monitor (file->sockaddr "monitor"))
@@ -117,26 +124,20 @@ QEMU monitor and to the guest's backdoor REPL."
(primitive-exit 1))))
(pid
(format #t "QEMU runs as PID ~a~%" pid)
- (sigaction SIGALRM
- (lambda (signum)
- (display "time is up!\n") ;FIXME: break
- #t))
- (alarm timeout)
- (match (accept monitor)
+ (match (accept* monitor)
((monitor-conn . _)
(display "connected to QEMU's monitor\n")
(close-port monitor)
(wait-for-monitor-prompt monitor-conn)
(display "read QEMU monitor prompt\n")
- (match (accept repl)
+ (match (accept* repl)
((repl-conn . addr)
(display "connected to guest REPL\n")
(close-port repl)
(match (read repl-conn)
('ready
(alarm 0)
- (sigaction SIGALRM SIG_DFL)
(display "marionette is ready\n")
(marionette (append command extra-options) pid
monitor-conn repl-conn)))))))))))