X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fpcl%2Flow.lisp;h=deda8ec2039d5ad7392914e74e4b391eaac024e1;hb=cce46771e6d734c275f3e2d5620004da3b5d09ee;hp=5007007bbc8459281a667c55fe8bb9158818f7d8;hpb=a736ac10b709b2d40305f0a6e3764afd246a8ef5;p=sbcl.git diff --git a/src/pcl/low.lisp b/src/pcl/low.lisp index 5007007..deda8ec 100644 --- a/src/pcl/low.lisp +++ b/src/pcl/low.lisp @@ -97,7 +97,7 @@ (import 'sb-kernel:funcallable-instance-p) -(defun set-funcallable-instance-fun (fin new-value) +(defun set-funcallable-instance-function (fin new-value) (declare (type function new-value)) (aver (funcallable-instance-p fin)) (setf (funcallable-instance-fun fin) new-value)) @@ -165,13 +165,6 @@ (defmacro std-instance-class (instance) `(wrapper-class* (std-instance-wrapper ,instance))) -;;; When given a function should give this function the name -;;; NEW-NAME. Note that NEW-NAME is sometimes a list. Some lisps -;;; get the upset in the tummy when they start thinking about -;;; functions which have lists as names. To deal with that there is -;;; SET-FUN-NAME-INTERN which takes a list spec for a function -;;; name and turns it into a symbol if need be. -;;; ;;; When given a funcallable instance, SET-FUN-NAME *must* side-effect ;;; that FIN to give it the name. When given any other kind of ;;; function SET-FUN-NAME is allowed to return a new function which is @@ -180,51 +173,25 @@ ;;; In all cases, SET-FUN-NAME must return the new (or same) ;;; function. (Unlike other functions to set stuff, it does not return ;;; the new value.) -(defun set-fun-name (fcn new-name) +(defun set-fun-name (fun new-name) #+sb-doc "Set the name of a compiled function object. Return the function." (declare (special *boot-state* *the-class-standard-generic-function*)) - (cond ((symbolp fcn) - (set-fun-name (symbol-function fcn) new-name)) - ((funcallable-instance-p fcn) - (if (if (eq *boot-state* 'complete) - (typep fcn 'generic-function) - (eq (class-of fcn) *the-class-standard-generic-function*)) - (setf (%funcallable-instance-info fcn 1) new-name) - (bug "unanticipated function type")) - fcn) - (t - ;; pw-- This seems wrong and causes trouble. Tests show - ;; that loading CL-HTTP resulted in ~5400 closures being - ;; passed through this code of which ~4000 of them pointed - ;; to but 16 closure-functions, including 1015 each of - ;; DEFUN MAKE-OPTIMIZED-STD-WRITER-METHOD-FUNCTION - ;; DEFUN MAKE-OPTIMIZED-STD-READER-METHOD-FUNCTION - ;; DEFUN MAKE-OPTIMIZED-STD-BOUNDP-METHOD-FUNCTION. - ;; Since the actual functions have been moved by PURIFY - ;; to memory not seen by GC, changing a pointer there - ;; not only clobbers the last change but leaves a dangling - ;; pointer invalid after the next GC. Comments in low.lisp - ;; indicate this code need do nothing. Setting the - ;; function-name to NIL loses some info, and not changing - ;; it loses some info of potential hacking value. So, - ;; lets not do this... - #+nil - (let ((header (%closure-fun fcn))) - (setf (%simple-fun-name header) new-name)) - - ;; XXX Maybe add better scheme here someday. - fcn))) - -(defun intern-fun-name (name) - (cond ((symbolp name) name) - ((listp name) - (intern (let ((*package* *pcl-package*) - (*print-case* :upcase) - (*print-pretty* nil) - (*print-gensym* t)) - (format nil "~S" name)) - *pcl-package*)))) + (when (valid-function-name-p fun) + (setq fun (fdefinition fun))) + (when (funcallable-instance-p fun) + (if (if (eq *boot-state* 'complete) + (typep fun 'generic-function) + (eq (class-of fun) *the-class-standard-generic-function*)) + (setf (%funcallable-instance-info fun 1) new-name) + (bug "unanticipated function type"))) + ;; Fixup name-to-function mappings in cases where the function + ;; hasn't been defined by DEFUN. (FIXME: is this right? This logic + ;; comes from CMUCL). -- CSR, 2004-12-31 + (when (and (consp new-name) + (member (car new-name) '(method fast-method slot-accessor))) + (setf (fdefinition new-name) fun)) + fun) ;;; FIXME: probably no longer needed after init (defmacro precompile-random-code-segments (&optional system) @@ -306,12 +273,19 @@ nil))) ;;;; support for useful hashing of PCL instances -(let ((hash-code 0)) - (declare (fixnum hash-code)) - (defun get-instance-hash-code () - (if (< hash-code most-positive-fixnum) - (incf hash-code) - (setq hash-code 0)))) + +(defvar *instance-hash-code-random-state* (make-random-state)) +(defun get-instance-hash-code () + ;; ANSI SXHASH wants us to make a good-faith effort to produce + ;; hash-codes that are well distributed within the range of + ;; non-negative fixnums, and this RANDOM operation does that, unlike + ;; the sbcl<=0.8.16 implementation of this operation as + ;; (INCF COUNTER). + ;; + ;; Hopefully there was no virtue to the old counter implementation + ;; that I am insufficiently insightful to insee. -- WHN 2004-10-28 + (random most-positive-fixnum + *instance-hash-code-random-state*)) (defun sb-impl::sxhash-instance (x) (cond @@ -351,12 +325,44 @@ (defun structure-slotd-reader-function (slotd) (fdefinition (dsd-accessor-name slotd))) -(defun structure-slotd-writer-function (slotd) - (unless (dsd-read-only slotd) - (fdefinition `(setf ,(dsd-accessor-name slotd))))) +(defun structure-slotd-writer-function (type slotd) + (if (dsd-read-only slotd) + (let ((dd (get-structure-dd type))) + (coerce (slot-setter-lambda-form dd slotd) 'function)) + (fdefinition `(setf ,(dsd-accessor-name slotd))))) (defun structure-slotd-type (slotd) (dsd-type slotd)) (defun structure-slotd-init-form (slotd) (dsd-default slotd)) + +;;; WITH-PCL-LOCK is used around some forms that were previously +;;; protected by WITHOUT-INTERRUPTS, but in a threaded SBCL we don't +;;; have a useful WITHOUT-INTERRUPTS. In an unthreaded SBCL I'm not +;;; sure what the desired effect is anyway: should we be protecting +;;; against the possibility of recursive calls into these functions +;;; or are we using WITHOUT-INTERRUPTS as WITHOUT-SCHEDULING? +;;; +;;; Users: FORCE-CACHE-FLUSHES, MAKE-INSTANCES-OBSOLETE. Note that +;;; it's not all certain this is sufficent for threadsafety: do we +;;; just have to protect against simultaneous calls to these mutators, +;;; or actually to stop normal slot access etc at the same time as one +;;; of them runs + +#+sb-thread +(progn +(defstruct spinlock (value 0)) +(defvar *pcl-lock* (make-spinlock)) + +(defmacro with-pcl-lock (&body body) + `(progn + (sb-thread::get-spinlock *pcl-lock* 1 (sb-thread::current-thread-id)) + (unwind-protect + (progn ,@body) + (setf (spinlock-value *pcl-lock*) 0)))) +);progn + +#-sb-thread +(defmacro with-pcl-lock (&body body) + `(progn ,@body))