;;; this shouldn't matter, since the only two slots that WRAPPER adds
;;; are meaningless in those cases.
(defstruct (wrapper
- (:include layout
- ;; KLUDGE: In CMU CL, the initialization default
- ;; for LAYOUT-INVALID was NIL. In SBCL, that has
- ;; changed to :UNINITIALIZED, but PCL code might
- ;; still expect NIL for the initialization
- ;; default of WRAPPER-INVALID. Instead of trying
- ;; to find out, I just overrode the LAYOUT
- ;; default here. -- WHN 19991204
- (invalid nil))
- (:conc-name %wrapper-)
- (:constructor make-wrapper-internal)
- (:copier nil))
+ (:include layout
+ ;; KLUDGE: In CMU CL, the initialization default
+ ;; for LAYOUT-INVALID was NIL. In SBCL, that has
+ ;; changed to :UNINITIALIZED, but PCL code might
+ ;; still expect NIL for the initialization
+ ;; default of WRAPPER-INVALID. Instead of trying
+ ;; to find out, I just overrode the LAYOUT
+ ;; default here. -- WHN 19991204
+ (invalid nil))
+ (:conc-name %wrapper-)
+ (:constructor make-wrapper-internal)
+ (:copier nil))
(instance-slots-layout nil :type list)
(class-slots nil :type list))
#-sb-fluid (declaim (sb-ext:freeze-type wrapper))
;; by puns based on absolute locations. Fun fun fun.. -- WHN 2001-10-30
:slot-names (clos-slots name hash-code)
:boa-constructor %make-pcl-funcallable-instance
- :superclass-name funcallable-instance
+ :superclass-name function
:metaclass-name random-pcl-classoid
:metaclass-constructor make-random-pcl-classoid
:dd-type funcallable-structure
(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))
+;;; FIXME: these macros should just go away. It's not clear whether
+;;; the inline functions defined by
+;;; !DEFSTRUCT-WITH-ALTERNATE-METACLASS are as efficient as they could
+;;; be; ordinary defstruct accessors are defined as source transforms.
(defmacro fsc-instance-p (fin)
`(funcallable-instance-p ,fin))
(defmacro fsc-instance-wrapper (fin)
`(%funcallable-instance-layout ,fin))
-;;; FIXME: This seems to bear no relation at all to the CLOS-SLOTS
-;;; slot in the FUNCALLABLE-INSTANCE structure, above, which
-;;; (bizarrely) seems to be set to the NAME of the
-;;; FUNCALLABLE-INSTANCE. At least, the index 1 seems to return the
-;;; NAME, and the index 2 NIL. Weird. -- CSR, 2002-11-07
(defmacro fsc-instance-slots (fin)
- `(%funcallable-instance-info ,fin 0))
+ `(%funcallable-instance-info ,fin 1))
(defmacro fsc-instance-hash (fin)
`(%funcallable-instance-info ,fin 3))
\f
;; a temporary definition used for debugging the bootstrap
#+sb-show
(defun print-std-instance (instance stream depth)
- (declare (ignore depth))
+ (declare (ignore depth))
(print-unreadable-object (instance stream :type t :identity t)
(let ((class (class-of instance)))
(when (or (eq class (find-class 'standard-class nil))
- (eq class (find-class 'funcallable-standard-class nil))
- (eq class (find-class 'built-in-class nil)))
- (princ (early-class-name instance) stream)))))
+ (eq class (find-class 'funcallable-standard-class nil))
+ (eq class (find-class 'built-in-class nil)))
+ (princ (early-class-name instance) stream)))))
;;; This is the value that we stick into a slot to tell us that it is
;;; unbound. It may seem gross, but for performance reasons, we make
(defmacro std-instance-class (instance)
`(wrapper-class* (std-instance-wrapper ,instance)))
\f
-;;; 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
;;; 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 2) 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) '(slow-method fast-method slot-accessor)))
+ (setf (fdefinition new-name) fun))
+ fun)
\f
;;; FIXME: probably no longer needed after init
(defmacro precompile-random-code-segments (&optional system)
;;; we make it, and we want the accessor to still be type-correct.
#|
(defstruct (standard-instance
- (:predicate nil)
- (:constructor %%allocate-instance--class ())
- (:copier nil)
- (:alternate-metaclass instance
- cl:standard-class
- make-standard-class))
+ (:predicate nil)
+ (:constructor %%allocate-instance--class ())
+ (:copier nil)
+ (:alternate-metaclass instance
+ cl:standard-class
+ make-standard-class))
(slots nil))
|#
(!defstruct-with-alternate-metaclass standard-instance
:slot-names (slots hash-code)
:boa-constructor %make-standard-instance
- :superclass-name instance
+ :superclass-name t
:metaclass-name standard-classoid
:metaclass-constructor make-standard-classoid
:dd-type structure
(defmacro get-instance-wrapper-or-nil (inst)
(once-only ((wrapper `(wrapper-of ,inst)))
`(if (typep ,wrapper 'wrapper)
- ,wrapper
- nil)))
+ ,wrapper
+ nil)))
\f
;;;; 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
(defun structure-type-included-type-name (type)
(let ((include (dd-include (get-structure-dd type))))
(if (consp include)
- (car include)
- include)))
+ (car include)
+ include)))
(defun structure-type-slot-description-list (type)
(nthcdr (length (let ((include (structure-type-included-type-name type)))
- (and include
- (dd-slots (get-structure-dd include)))))
- (dd-slots (get-structure-dd type))))
+ (and include
+ (dd-slots (get-structure-dd include)))))
+ (dd-slots (get-structure-dd type))))
(defun structure-slotd-name (slotd)
(dsd-name slotd))
(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
+ (defvar *pcl-lock* (sb-thread::make-spinlock))
+
+ (defmacro with-pcl-lock (&body body)
+ `(sb-thread::with-spinlock (*pcl-lock*)
+ ,@body)))
+
+#-sb-thread
+(defmacro with-pcl-lock (&body body)
+ `(progn ,@body))
projects / sbcl.git / blobdiff