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

io: fix file-buffer performance when driven by peeks

Browse Source
This commit is contained in:
Matthew Flatt 2019-02-22 18:47:08 -07:00
parent 75c8c3ce37
commit 4d43c9884c
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
racket/src/io/port/bytes-input.rkt
View File

@ -121,9 +121,8 @@
v)) v))
(define/who (peek-byte [orig-in (current-input-port)] [skip-k 0]) (define/who (peek-byte [orig-in (current-input-port)] [skip-k 0])
(check who input-port? orig-in) (let ([in (->core-input-port orig-in who)])
(check who exact-nonnegative-integer? skip-k) (check who exact-nonnegative-integer? skip-k)
(let ([in (->core-input-port orig-in)])
(peek-a-byte who in skip-k))) (peek-a-byte who in skip-k)))
(define/who (peek-bytes amt skip-k [in (current-input-port)]) (define/who (peek-bytes amt skip-k [in (current-input-port)])

7
racket/src/io/port/peek-via-read-port.rkt
View File

@ -72,7 +72,10 @@
(cond (cond
[(end-pos . fx< . (bytes-length bstr)) [(end-pos . fx< . (bytes-length bstr))
;; add to end of buffer ;; add to end of buffer
(pull-some-bytes amt end-pos pos)] (define pull-amt (if (eq? 'block buffer-mode)
(fx- (bytes-length bstr) end-pos)
amt))
(pull-some-bytes pull-amt end-pos pos)]
[(fx= pos 0) [(fx= pos 0)
;; extend buffer ;; extend buffer
(define new-bstr (make-bytes (fx* 2 (bytes-length bstr)))) (define new-bstr (make-bytes (fx* 2 (bytes-length bstr))))
@ -170,6 +173,8 @@
(define amt (min (fx- peeked-amt skip) (fx- end start))) (define amt (min (fx- peeked-amt skip) (fx- end start)))
(define s-pos (fx+ s skip)) (define s-pos (fx+ s skip))
(bytes-copy! dest-bstr start bstr s-pos (fx+ s-pos amt)) (bytes-copy! dest-bstr start bstr s-pos (fx+ s-pos amt))
(unless progress-sema
(fast-mode! 0))
amt] amt]
[peeked-eof? [peeked-eof?
eof] eof]