;;; In each case, we maintain one value which is a cons. The car is the list
;;; methods. The cdr is a list of the generic functions. The cdr is always
;;; computed lazily.
+
+;;; This needs to be used recursively, in case a non-trivial user
+;;; defined ADD/REMOVE-DIRECT-METHOD method ends up calling another
+;;; function using the same lock.
+(defvar *specializer-lock* (sb-thread::make-spinlock :name "Specializer lock"))
+
+(defmethod add-direct-method :around ((specializer specializer) method)
+ ;; All the actions done under this lock are done in an order
+ ;; that is safe to unwind at any point.
+ (sb-thread::with-recursive-spinlock (*specializer-lock*)
+ (call-next-method)))
+
+(defmethod remove-direct-method :around ((specializer specializer) method)
+ ;; All the actions done under this lock are done in an order
+ ;; that is safe to unwind at any point.
+ (sb-thread::with-recursive-spinlock (*specializer-lock*)
+ (call-next-method)))
+
(defmethod add-direct-method ((specializer class) (method method))
- (with-slots (direct-methods) specializer
- (setf (car direct-methods) (adjoin method (car direct-methods)) ;PUSH
- (cdr direct-methods) ()))
+ (let ((cell (slot-value specializer 'direct-methods)))
+ ;; We need to first smash the CDR, because a parallel read may
+ ;; be in progress, and because if an interrupt catches us we
+ ;; need to have a consistent state.
+ (setf (cdr cell) ()
+ (car cell) (adjoin method (car cell))))
method)
+
(defmethod remove-direct-method ((specializer class) (method method))
- (with-slots (direct-methods) specializer
- (setf (car direct-methods) (remove method (car direct-methods))
- (cdr direct-methods) ()))
+ (let ((cell (slot-value specializer 'direct-methods)))
+ ;; We need to first smash the CDR, because a parallel read may
+ ;; be in progress, and because if an interrupt catches us we
+ ;; need to have a consistent state.
+ (setf (cdr cell) ()
+ (car cell) (remove method (car cell))))
method)
(defmethod specializer-direct-methods ((specializer class))
(car direct-methods)))
(defmethod specializer-direct-generic-functions ((specializer class))
- (with-slots (direct-methods) specializer
- (or (cdr direct-methods)
- (setf (cdr direct-methods)
- (let (collect)
- (dolist (m (car direct-methods))
- ;; the old PCL code used COLLECTING-ONCE which used
- ;; #'EQ to check for newness
- (pushnew (method-generic-function m) collect :test #'eq))
- (nreverse collect))))))
+ (let ((cell (slot-value specializer 'direct-methods)))
+ ;; If an ADD/REMOVE-METHOD is in progress, no matter: either
+ ;; we behave as if we got just first or just after -- it's just
+ ;; for update that we need to lock.
+ (or (cdr cell)
+ (sb-thread::with-spinlock (*specializer-lock*)
+ (setf (cdr cell)
+ (let (collect)
+ (dolist (m (car cell))
+ ;; the old PCL code used COLLECTING-ONCE which used
+ ;; #'EQ to check for newness
+ (pushnew (method-generic-function m) collect :test #'eq))
+ (nreverse collect)))))))
\f
;;; This hash table is used to store the direct methods and direct generic
;;; functions of EQL specializers. Each value in the table is the cons.
(let* ((object (specializer-object specializer))
(table (specializer-method-table specializer))
(entry (gethash object table)))
+ ;; This table is shared between multiple specializers, but
+ ;; no worries as (at least for the time being) our hash-tables
+ ;; are thread safe.
(unless entry
- (setq entry
- (setf (gethash object table)
- (cons nil nil))))
- (setf (car entry) (adjoin method (car entry))
- (cdr entry) ())
+ (setf entry
+ (setf (gethash object table) (cons nil nil))))
+ ;; We need to first smash the CDR, because a parallel read may
+ ;; be in progress, and because if an interrupt catches us we
+ ;; need to have a consistent state.
+ (setf (cdr entry) ()
+ (car entry) (adjoin method (car entry)))
method))
(defmethod remove-direct-method ((specializer specializer-with-object)
(let* ((object (specializer-object specializer))
(entry (gethash object (specializer-method-table specializer))))
(when entry
- (setf (car entry) (remove method (car entry))
- (cdr entry) ()))
+ ;; We need to first smash the CDR, because a parallel read may
+ ;; be in progress, and because if an interrupt catches us we
+ ;; need to have a consistent state.
+ (setf (cdr entry) ()
+ (car entry) (remove method (car entry))))
method))
(defmethod specializer-direct-methods ((specializer specializer-with-object))
(entry (gethash object (specializer-method-table specializer))))
(when entry
(or (cdr entry)
- (setf (cdr entry)
- (let (collect)
- (dolist (m (car entry))
- (pushnew (method-generic-function m) collect :test #'eq))
- (nreverse collect)))))))
+ (sb-thread::with-spinlock (*specializer-lock*)
+ (setf (cdr entry)
+ (let (collect)
+ (dolist (m (car entry))
+ (pushnew (method-generic-function m) collect :test #'eq))
+ (nreverse collect))))))))
(defun map-specializers (function)
(map-all-classes (lambda (class)
(setq %class-precedence-list (compute-class-precedence-list class))
(setq cpl-available-p t)
(add-direct-subclasses class direct-superclasses)
- (setf (slot-value class 'slots) (compute-slots class))))
+ (let ((slots (compute-slots class)))
+ (setf (slot-value class 'slots) slots)
+ (setf (layout-slot-table wrapper) (make-slot-table class slots)))))
;; Comment from Gerd's PCL, 2003-05-15:
;;
;; We don't ADD-SLOT-ACCESSORS here because we don't want to
(values defstruct-form constructor reader-names writer-names)))
(defun make-defstruct-allocation-function (class)
- (let ((dd (get-structure-dd (class-name class))))
+ ;; FIXME: Why don't we go class->layout->info == dd
+ (let ((dd (find-defstruct-description (class-name class))))
(lambda ()
(sb-kernel::%make-instance-with-layout
(sb-kernel::compiler-layout-or-lose (dd-name dd))))))
(setf (slot-value class '%class-precedence-list)
(compute-class-precedence-list class))
(setf (slot-value class 'cpl-available-p) t)
- (setf (slot-value class 'slots) (compute-slots class))
- (let ((lclass (find-classoid (class-name class))))
- (setf (classoid-pcl-class lclass) class)
- (setf (slot-value class 'wrapper) (classoid-layout lclass)))
+ (let ((slots (compute-slots class)))
+ (setf (slot-value class 'slots) slots)
+ (let* ((lclass (find-classoid (class-name class)))
+ (layout (classoid-layout lclass)))
+ (setf (classoid-pcl-class lclass) class)
+ (setf (slot-value class 'wrapper) layout)
+ (setf (layout-slot-table layout) (make-slot-table class slots))))
(setf (slot-value class 'finalized-p) t)
(update-pv-table-cache-info class)
(add-slot-accessors class direct-slots)))
(make-instances-obsolete class)
(class-wrapper class)))))
- (with-slots (wrapper slots) class
- (update-lisp-class-layout class nwrapper)
- (setf slots eslotds
- (wrapper-instance-slots-layout nwrapper) nlayout
- (wrapper-class-slots nwrapper) nwrapper-class-slots
- (wrapper-no-of-instance-slots nwrapper) nslots
- wrapper nwrapper)
- (do* ((slots (slot-value class 'slots) (cdr slots))
- (dupes nil))
- ((null slots)
- (when dupes
- (style-warn
- "~@<slot names with the same SYMBOL-NAME but ~
+ (update-lisp-class-layout class nwrapper)
+ (setf (slot-value class 'slots) eslotds
+ (wrapper-instance-slots-layout nwrapper) nlayout
+ (wrapper-class-slots nwrapper) nwrapper-class-slots
+ (layout-length nwrapper) nslots
+ (slot-value class 'wrapper) nwrapper)
+ (setf (layout-slot-table nwrapper) (make-slot-table class eslotds))
+ (do* ((slots (slot-value class 'slots) (cdr slots))
+ (dupes nil))
+ ((null slots)
+ (when dupes
+ (style-warn
+ "~@<slot names with the same SYMBOL-NAME but ~
different SYMBOL-PACKAGE (possible package problem) ~
for class ~S:~4I~@:_~<~@{~S~^~:@_~}~:>~@:>"
- class dupes)))
- (let* ((slot (car slots))
- (oslots (remove (slot-definition-name slot) (cdr slots)
- :test #'string/=
- :key #'slot-definition-name)))
- (when oslots
- (pushnew (cons (slot-definition-name slot)
- (mapcar #'slot-definition-name oslots))
- dupes
- :test #'string= :key #'car)))))
+ class dupes)))
+ (let* ((slot (car slots))
+ (oslots (remove (slot-definition-name slot) (cdr slots)
+ :test #'string/=
+ :key #'slot-definition-name)))
+ (when oslots
+ (pushnew (cons (slot-definition-name slot)
+ (mapcar #'slot-definition-name oslots))
+ dupes
+ :test #'string= :key #'car))))
(setf (slot-value class 'finalized-p) t)
(unless (eq owrapper nwrapper)
(update-pv-table-cache-info class)
;; good style. There has to be a better way! -- CSR,
;; 2002-10-29
(eq (layout-invalid owrapper) t))
- (let ((nwrapper (make-wrapper (wrapper-no-of-instance-slots owrapper)
+ (let ((nwrapper (make-wrapper (layout-length owrapper)
class)))
(setf (wrapper-instance-slots-layout nwrapper)
(wrapper-instance-slots-layout owrapper))
;;; through the UPDATE-INSTANCE-FOR-REDEFINED-CLASS mechanism.
(defmethod make-instances-obsolete ((class std-class))
(let* ((owrapper (class-wrapper class))
- (nwrapper (make-wrapper (wrapper-no-of-instance-slots owrapper)
+ (nwrapper (make-wrapper (layout-length owrapper)
class)))
(unless (class-finalized-p class)
(if (class-has-a-forward-referenced-superclass-p class)
(type-of (obsolete-structure-datum condition))))))
(defun obsolete-instance-trap (owrapper nwrapper instance)
- (if (not (pcl-instance-p instance))
+ (if (not (layout-for-std-class-p owrapper))
(if *in-obsolete-instance-trap*
*the-wrapper-of-structure-object*
(let ((*in-obsolete-instance-trap* t))
projects / sbcl.git / blobdiff