(declaim (inline wrapper-class*))
(defun wrapper-class* (wrapper)
(or (wrapper-class wrapper)
- (ensure-non-standard-class
- (classoid-name (layout-classoid wrapper)))))
+ (let ((classoid (layout-classoid wrapper)))
+ (ensure-non-standard-class
+ (classoid-name classoid)
+ classoid))))
;;; The wrapper cache machinery provides general mechanism for
;;; trapping on the next access to any instance of a given class. This
;; FIXME: We are here inside PCL lock, but might someone be
;; accessing the wrapper at the same time from outside the lock?
- ;; Can it matter that they get 0 from one slot and a valid value
- ;; from another?
- (dotimes (i layout-clos-hash-length)
- (setf (layout-clos-hash owrapper i) 0))
+ (setf (layout-clos-hash owrapper) 0)
;; FIXME: We could save a whopping cons by using (STATE . WRAPPER)
;; instead
(remhash owrapper *previous-nwrappers*)
(setf (gethash nwrapper *previous-nwrappers*) new-previous)))
+;;; FIXME: This is not a good name: part of the constract here is that
+;;; we return the valid wrapper, which is not obvious from the name
+;;; (or the names of our callees.)
(defun check-wrapper-validity (instance)
(let* ((owrapper (wrapper-of instance))
(state (layout-invalid owrapper)))
(aver (not (eq state :uninitialized)))
- (etypecase state
- (null owrapper)
- ;; FIXME: I can't help thinking that, while this does cure the
- ;; symptoms observed from some class redefinitions, this isn't
- ;; the place to be doing this flushing. Nevertheless... --
- ;; CSR, 2003-05-31
- ;;
- ;; CMUCL comment:
- ;; We assume in this case, that the :INVALID is from a
- ;; previous call to REGISTER-LAYOUT for a superclass of
- ;; INSTANCE's class. See also the comment above
- ;; FORCE-CACHE-FLUSHES. Paul Dietz has test cases for this.
- ((member t)
- (force-cache-flushes (class-of instance))
- (check-wrapper-validity instance))
- (cons
- (ecase (car state)
- (:flush
- (flush-cache-trap owrapper (cadr state) instance))
- (:obsolete
- (obsolete-instance-trap owrapper (cadr state) instance)))))))
+ (cond ((not state)
+ owrapper)
+ ((not (layout-for-std-class-p owrapper))
+ ;; Obsolete structure trap.
+ (obsolete-instance-trap owrapper nil instance))
+ ((eq t state)
+ ;; FIXME: I can't help thinking that, while this does cure
+ ;; the symptoms observed from some class redefinitions,
+ ;; this isn't the place to be doing this flushing.
+ ;; Nevertheless... -- CSR, 2003-05-31
+ ;;
+ ;; CMUCL comment:
+ ;; We assume in this case, that the :INVALID is from a
+ ;; previous call to REGISTER-LAYOUT for a superclass of
+ ;; INSTANCE's class. See also the comment above
+ ;; FORCE-CACHE-FLUSHES. Paul Dietz has test cases for this.
+ (force-cache-flushes (class-of instance))
+ ;; KLUDGE avoid an infinite recursion, it's still better to
+ ;; bail out with an AVER for server softwares. see FIXME above.
+ ;; details: http://thread.gmane.org/gmane.lisp.steel-bank.devel/10175
+ (aver (not (eq (layout-invalid (wrapper-of instance)) t)))
+ (check-wrapper-validity instance))
+ ((consp state)
+ (ecase (car state)
+ (:flush
+ (flush-cache-trap owrapper (cadr state) instance))
+ (:obsolete
+ (obsolete-instance-trap owrapper (cadr state) instance))))
+ (t
+ (bug "Invalid LAYOUT-INVALID: ~S" state)))))
(declaim (inline check-obsolete-instance))
(defun check-obsolete-instance (instance)
(when (invalid-wrapper-p (layout-of instance))
(check-wrapper-validity instance)))
+
+(defun valid-wrapper-of (instance)
+ (let ((wrapper (wrapper-of instance)))
+ (if (invalid-wrapper-p wrapper)
+ (check-wrapper-validity instance)
+ wrapper)))
\f
;;; NIL: means nothing so far, no actual arg info has NILs in the
;;; metatype.