[Sbcl-commits] CVS: sbcl/src/pcl defs.lisp, 1.60, 1.61 fixup.lisp, 1.7, 1.8 slots-boot.lisp, 1.33, 1.34 slots.lisp, 1.28, 1.29

[Nikodemus S. <de...@us...>]

Update of /cvsroot/sbcl/sbcl/src/pcl
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv31462/src/pcl

Modified Files:
	defs.lisp fixup.lisp slots-boot.lisp slots.lisp 
Log Message:
1.0.7.27: SLOT-CLASS cleanups

 * No need for two separate implementations of FIND-SLOT-DEFINITION -- just
   move the one we care about to slots-boot.lisp along with MAKE-SLOT-VECTOR
   (which it is intimately tied up with.) Add comments for posterity.

 * There should be no (SETF CLASS-SLOTS) or (SETF CLASS-DIRECT-SLOTS), so
   :READER, not :ACCESSOR in SLOT-CLASS.



Index: defs.lisp
===================================================================
RCS file: /cvsroot/sbcl/sbcl/src/pcl/defs.lisp,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -d -r1.60 -r1.61
--- defs.lisp	17 Jul 2007 18:36:34 -0000	1.60
+++ defs.lisp	17 Jul 2007 20:50:19 -0000	1.61
@@ -657,36 +657,14 @@
 (defclass slot-class (pcl-class)
   ((direct-slots
     :initform ()
-    :accessor class-direct-slots)
+    :reader class-direct-slots)
    (slots
     :initform ()
-    :accessor class-slots)
+    :reader class-slots)
    (slot-vector
     :initform #(nil)
     :reader class-slot-vector)))
 
-;;; Make the slot-vector accessed by the after-fixup FIND-SLOT-DEFINITION.
-;;; The slot vector is a simple-vector containing plists of slot-definitions
-;;; keyd by their names. Slot definitions are put in the position indicated
-;;; by (REM (SXHASH SLOT-NAME) (LENGTH SLOT-VECTOR)).
-;;;
-;;; We make the vector slightly longer then the number of slots both
-;;; to reduce collisions (but we're not too picky, really) and to
-;;; allow FIND-SLOT-DEFINTIONS work on slotless classes without
-;;; needing to check for zero-length vectors.
-(defun make-slot-vector (slots)
-  (let* ((n (+ (length slots) 2))
-         (vector (make-array n :initial-element nil)))
-    (flet ((add-to-vector (name slot)
-             (setf (svref vector (rem (sxhash name) n))
-                   (list* name slot (svref vector (rem (sxhash name) n))))))
-      (if (eq 'complete *boot-state*)
-         (dolist (slot slots)
-           (add-to-vector (slot-definition-name slot) slot))
-         (dolist (slot slots)
-           (add-to-vector (early-slot-definition-name slot) slot))))
-    vector))
-
 ;;; The class STD-CLASS is an implementation-specific common
 ;;; superclass of the classes STANDARD-CLASS and
 ;;; FUNCALLABLE-STANDARD-CLASS.

Index: fixup.lisp
===================================================================
RCS file: /cvsroot/sbcl/sbcl/src/pcl/fixup.lisp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- fixup.lisp	17 Jul 2007 18:36:34 -0000	1.7
+++ fixup.lisp	17 Jul 2007 20:50:19 -0000	1.8
@@ -35,15 +35,3 @@
   (declare (ignore depth))
   (print-object instance stream))
 
-;;; Access the slot-vector created by MAKE-SLOT-VECTOR.
-(defun find-slot-definition (class slot-name)
-  (declare (symbol slot-name) (inline getf))
-  (let* ((vector (class-slot-vector class))
-         (index (rem (sxhash slot-name) (length vector))))
-    (declare (simple-vector vector) (index index))
-    (do ((plist (svref vector index) (cdr plist)))
-        ((not plist))
-      (let ((key (car plist)))
-        (setf plist (cdr plist))
-        (when (eq key slot-name)
-          (return (car plist)))))))

Index: slots-boot.lisp
===================================================================
RCS file: /cvsroot/sbcl/sbcl/src/pcl/slots-boot.lisp,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- slots-boot.lisp	12 Jul 2007 17:28:40 -0000	1.33
+++ slots-boot.lisp	17 Jul 2007 20:50:20 -0000	1.34
@@ -521,3 +521,59 @@
     (setf (getf (getf initargs 'plist) :slot-name-lists)
           (list (list nil slot-name)))
     initargs))
+
+;;;; FINDING SLOT DEFINITIONS
+;;;
+;;; Historical PCL found slot definitions by iterating over
+;;; CLASS-SLOTS, which is O(N) for number of slots, and moreover
+;;; requires a GF call (for SLOT-DEFINITION-NAME) for each slot in
+;;; list up to the desired one.
+;;;
+;;; As of 1.0.7.26 SBCL hashes the effective slot definitions into a
+;;; simple-vector, with bucket chains made out of plists keyed by the
+;;; slot names. This fixes gives O(1) performance, and avoid the GF
+;;; calls.
+;;;
+;;; MAKE-SLOT-VECTOR constructs the hashed vector out of a list of
+;;; effective slot definitions, and FIND-SLOT-DEFINITION knows how to
+;;; look up slots in that vector.
+;;;
+;;; The only bit of cleverness in the implementation is to make the
+;;; vectors fairly tight, but always longer then 0 elements:
+;;;
+;;; -- We don't want to waste huge amounts of space no these vectors,
+;;;    which are mostly required by things like SLOT-VALUE with a
+;;;    variable slot name, so a constant extension over the minimum
+;;;    size seems like a good choise.
+;;;
+;;; -- As long as the vector always has a length > 0
+;;;    FIND-SLOT-DEFINITION doesn't need to handle the rare case of an
+;;;    empty vector separately: it just returns a NIL.
+
+(defun find-slot-definition (class slot-name)
+  (declare (symbol slot-name) (inline getf))
+  (let* ((vector (class-slot-vector class))
+         (index (rem (sxhash slot-name) (length vector))))
+    (declare (simple-vector vector) (index index)
+             (optimize (sb-c::insert-array-bounds-checks 0)))
+    (do ((plist (the list (svref vector index)) (cdr plist)))
+        ((not (consp plist)))
+      (let ((key (car plist)))
+        (setf plist (cdr plist))
+        (when (eq key slot-name)
+          (return (car plist)))))))
+
+(defun make-slot-vector (slots)
+  (let* ((n (+ (length slots) 2))
+         (vector (make-array n :initial-element nil)))
+    (flet ((add-to-vector (name slot)
+             (declare (symbol name)
+                      (optimize (sb-c::insert-array-bounds-checks 0)))
+             (setf (svref vector (rem (sxhash name) n))
+                   (list* name slot (svref vector (rem (sxhash name) n))))))
+      (if (eq 'complete *boot-state*)
+         (dolist (slot slots)
+           (add-to-vector (slot-definition-name slot) slot))
+         (dolist (slot slots)
+           (add-to-vector (early-slot-definition-name slot) slot))))
+    vector))

Index: slots.lisp
===================================================================
RCS file: /cvsroot/sbcl/sbcl/src/pcl/slots.lisp,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- slots.lisp	17 Jul 2007 18:36:34 -0000	1.28
+++ slots.lisp	17 Jul 2007 20:50:20 -0000	1.29
@@ -75,11 +75,7 @@
          (t
           (error "unrecognized instance type")))))
 
-(defun early-find-slot-definition (class slot-name)
-  (dolist (slot (class-slots class) nil)
-    (when (eql slot-name (slot-definition-name slot))
-      (return slot))))
-(setf (fdefinition 'find-slot-definition) #'early-find-slot-definition)
+;;;; SLOT-VALUE, (SETF SLOT-VALUE), SLOT-BOUNDP
 
 (declaim (ftype (sfunction (t symbol) t) slot-value))
 (defun slot-value (object slot-name)