suzanne.soy/racket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

csm thread, io: avoid termination problem

Browse Source 
Especially avoid problems with `custodian-shutdown-all` on the main
custodian in the main thread.
This commit is contained in:
Matthew Flatt 2019-10-14 18:38:19 -06:00
parent 6e0c5e60f3
commit 6aa96ad3f7
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
racket/src/io/port/fd-port.rkt
View File

@ -32,12 +32,14 @@
prop:fd-place-message-opener)
;; in atomic mode
(define (fd-close fd fd-refcount)
(define (fd-close fd fd-refcount
#:discard-errors? [discard-errors? #f])
(set-box! fd-refcount (sub1 (unbox fd-refcount)))
(when (zero? (unbox fd-refcount))
(fd-semaphore-update! fd 'remove)
(define v (rktio_close rktio fd))
(when (rktio-error? v)
(when (and (rktio-error? v)
(not discard-errors?))
(end-atomic)
(raise-rktio-error #f v "error closing stream port"))))
@ -507,7 +509,7 @@
(if (input-port? port)
(send fd-input-port port on-close)
(send fd-output-port port on-close))
(fd-close fd fd-refcount)
(fd-close fd fd-refcount #:discard-errors? #t)
(set-closed-state! port))
#f
#f))

2
racket/src/thread/schedule.rkt
View File

@ -149,6 +149,8 @@
;; Thread continues
(cond
[(zero? (current-atomic))
(when (thread-dead? root-thread)
(force-exit 0))
(define new-leftover-ticks (- leftover-ticks (- TICKS remaining-ticks)))
(accum-cpu-time! t (new-leftover-ticks . <= . 0))
(set-thread-future! t (current-future))