Changeset 13302


Ignore:
Timestamp:
Dec 17, 2009, 2:53:50 PM (10 years ago)
Author:
gz
Message:

From trunk: interactive source-location tweaks (r13193, r13201)

Location:
branches/working-0711/ccl
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/working-0711/ccl

  • branches/working-0711/ccl/level-1/l1-readloop.lisp

    r13092 r13302  
    684684    (and defenv (eq 'compile-file (car (defenv.type defenv))))))
    685685
     686;; This is EVAL.
    686687(defun cheap-eval (form)
    687   (cheap-eval-in-environment form nil))
     688  ;; Don't record source locations for explicit calls to EVAL.
     689  (let ((*nx-source-note-map* nil))
     690    (cheap-eval-in-environment form nil)))
    688691
    689692; used by nfcomp too
     
    816819                       (cheap-eval-in-environment protected-form env))
    817820                   (progn-in-env cleanup-forms env env)))
    818                (funcall (cheap-eval-function nil (cheap-eval-transform form `(lambda () (progn ,form))) env))))
     821               (let ((fn (cheap-eval-function nil (cheap-eval-transform form `(lambda () (progn ,form))) env)))
     822                 (funcall fn))))
    819823            ((and (symbolp sym) (macro-function sym env))
    820824             (cheap-eval-in-environment (cheap-eval-macroexpand-1 form env) env))
  • branches/working-0711/ccl/lib/source-files.lisp

    r13070 r13302  
    4747;; This used to be weak, but the keys are symbols-with-definitions, so why bother.
    4848;; Set a high rehash threshold because space matters more than speed here.
     49;; Do not use lock-free hash tables, because they optimize reads at the expense of
     50;; writes/rehashes.  Writes/rehashes affect file-compilation speed, which matters.
    4951(defvar %source-files% (make-hash-table :test #'eq
    50                                         :size 13000
    51                                         :rehash-threshold .95))
     52                                        :size 14000
     53                                        :rehash-size 1.8 ;; compensate for high threshold
     54                                        :rehash-threshold .95
     55                                        :lock-free nil))
     56
    5257
    5358
Note: See TracChangeset for help on using the changeset viewer.