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

Revert "racket/gui/init: module caching in the load handler"

Browse Source 
This reverts commit 5c02b1c95accdb17a13c5269e17976b6785441bd.

The caching table doesn't hold entries weakly, which means that
it can be a space leak.

original commit: 5f1c8d3ec99180169640a713fd504bb8f6d00602
This commit is contained in:
Matthew Flatt 2012-07-17 06:11:35 -06:00
parent e509de2c6c
commit 8ff87e7dfe
1 changed files with 12 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
collects/mred/private/snipfile.rkt
View File

@ -241,29 +241,6 @@
;; don't load the file from source or reload useless bytecode:
(void)])))
;; cache modules that have hash codes:
(define module-cache (make-hash))
(define (check-module-cache in-port check-second? normal-k)
(let ([header (bytes-append #"^#~"
(bytes (string-length (version)))
(regexp-quote (string->bytes/utf-8 (version)))
#"T")])
(cond
[(regexp-match-peek header in-port)
(define hash-code (peek-bytes 20 (+ 2 1 (string-length (version)) 1) in-port))
(cond
[(bytes=? hash-code (make-bytes 20 0))
(values (normal-k) #f check-second?)]
[else
(define key (cons hash-code (current-load-relative-directory)))
(define m (hash-ref module-cache key #f))
(if m
(values m #f #f)
(values (normal-k) key check-second?))])]
[else
(values (normal-k) #f check-second?)])))
(define (text-editor-load-handler filename expected-module)
(unless (path? filename)
(raise-type-error 'text-editor-load-handler "path" filename))
@ -282,27 +259,21 @@
(jump-to-submodule
in-port
expected-module
(lambda (orig-check-second?)
(lambda (check-second?)
(with-module-reading-parameterization
(lambda ()
(define-values (first cache-key check-second?)
(check-module-cache in-port
orig-check-second?
(lambda () (read-syntax src in-port))))
(define module-ized-exp
(check-module-form first expected-module filename))
(define second (if check-second?
(let* ([first (read-syntax src in-port)]
[module-ized-exp (check-module-form first expected-module filename)]
[second (if check-second?
(read in-port)
eof))
(unless (eof-object? second)
(raise-syntax-error
'text-editor-load-handler
(format "expected only a `module' declaration for `~s', but found an extra expression"
expected-module)
second))
(when cache-key
(hash-set! module-cache cache-key module-ized-exp))
(eval module-ized-exp)))))))
eof)])
(unless (eof-object? second)
(raise-syntax-error
'text-editor-load-handler
(format "expected only a `module' declaration for `~s', but found an extra expression"
expected-module)
second))
(eval module-ized-exp))))))))
(let loop ([last-time-values (list (void))])
(let ([exp (read-syntax src in-port)])
(if (eof-object? exp)