September 2004 - elephant-cvs@common-lisp.net

[elephant-cvs] CVS update: elephant/src/elephant.lisp
by blee＠common-lisp.net 04 Sep '04

04 Sep '04

Update of /project/elephant/cvsroot/elephant/src In directory common-lisp.net:/tmp/cvs-serv12700/src Modified Files: elephant.lisp Log Message: update Date: Sat Sep 4 10:17:24 2004 Author: blee Index: elephant/src/elephant.lisp diff -u elephant/src/elephant.lisp:1.9 elephant/src/elephant.lisp:1.10 --- elephant/src/elephant.lisp:1.9 Thu Sep 2 16:47:53 2004 +++ elephant/src/elephant.lisp Sat Sep 4 10:17:24 2004 @@ -45,7 +45,7 @@ (:use common-lisp sleepycat) (:shadow #:with-transaction) (:export #:*store-controller* #:*current-transaction* #:*auto-commit* - #:open-store #:close-store + #:open-store #:close-store #:with-open-store #:store-controller #:open-controller #:close-controller #:with-open-controller #:controller-path #:controller-environment #:controller-db #:controller-root #:add-to-root #:get-from-root @@ -62,6 +62,7 @@ ) #+cmu (:import-from :pcl + compute-class-precedence-list validate-superclass standard-slot-definition standard-direct-slot-definition @@ -69,6 +70,7 @@ direct-slot-definition-class effective-slot-definition-class slot-definition-name + slot-definition-initform slot-definition-initfunction compute-effective-slot-definition class-slots @@ -91,8 +93,13 @@ (:import-from :ext make-weak-pointer weak-pointer-value finalize) + #+cmu + (:import-from :bignum + %bignum-ref) + #+sbcl (:import-from :sb-mop + compute-class-precedence-list validate-superclass standard-slot-definition standard-direct-slot-definition @@ -100,6 +107,7 @@ direct-slot-definition-class effective-slot-definition-class slot-definition-name + slot-definition-initform slot-definition-initfunction compute-effective-slot-definition class-slots @@ -123,8 +131,13 @@ (:import-from :sb-ext make-weak-pointer weak-pointer-value finalize) + #+sbcl + (:import-from :sb-bignum + %bignum-ref) + #+allegro (:import-from :clos + compute-class-precedence-list validate-superclass standard-slot-definition standard-direct-slot-definition @@ -132,6 +145,7 @@ direct-slot-definition-class effective-slot-definition-class slot-definition-name + slot-definition-initform slot-definition-initfunction compute-effective-slot-definition class-slots @@ -145,6 +159,7 @@ compute-effective-slot-definition-initargs) #+openmcl (:import-from :ccl + compute-class-precedence-list validate-superclass standard-slot-definition standard-direct-slot-definition @@ -152,6 +167,7 @@ direct-slot-definition-class effective-slot-definition-class slot-definition-name + slot-definition-initform slot-definition-initfunction compute-effective-slot-definition class-slots @@ -173,6 +189,7 @@ %slot-definition-type) #+lispworks (:import-from :clos + compute-class-precedence-list validate-superclass standard-slot-definition standard-direct-slot-definition @@ -180,6 +197,7 @@ direct-slot-definition-class effective-slot-definition-class slot-definition-name + slot-definition-initform slot-definition-initfunction compute-effective-slot-definition class-slots

1 0

[elephant-cvs] CVS update: elephant/src/controller.lisp
by blee＠common-lisp.net 04 Sep '04

04 Sep '04

Update of /project/elephant/cvsroot/elephant/src In directory common-lisp.net:/tmp/cvs-serv12648/src Modified Files: controller.lisp Log Message: fixed macros Date: Sat Sep 4 10:16:56 2004 Author: blee Index: elephant/src/controller.lisp diff -u elephant/src/controller.lisp:1.7 elephant/src/controller.lisp:1.8 --- elephant/src/controller.lisp:1.7 Thu Sep 2 16:42:38 2004 +++ elephant/src/controller.lisp Sat Sep 4 10:16:55 2004 @@ -157,12 +157,13 @@ (setf (controller-environment sc) nil) nil) -(defmacro with-open-controller ((&optional (sc *store-controller*)) +(defmacro with-open-controller ((&optional (sc '*store-controller*)) &body body) `(unwind-protect (progn - (open-controller ,sc) - ,@body) + (let (*store-controller* (open-controller ,sc)) + (declare (special *store-controller*)) + ,@body)) (close-controller ,sc))) (defun open-store (path) @@ -170,4 +171,16 @@ (open-controller *store-controller*)) (defun close-store () - (close-controller *store-controller*)) \ No newline at end of file + (close-controller *store-controller*)) + +(defmacro with-open-store ((path) &body body) + (let ((sc (gensym))) + `(let ((,sc (make-instance 'store-controller :path ,path))) + (unwind-protect + (progn + (let ((*store-controller* ,sc)) + (declare (special *store-controller*)) + (open-controller *store-controller*) + ,@body)) + (close-controller ,sc))))) +

1 0

[elephant-cvs] CVS update: elephant/src/classes.lisp
by blee＠common-lisp.net 04 Sep '04

04 Sep '04

Update of /project/elephant/cvsroot/elephant/src In directory common-lisp.net:/tmp/cvs-serv12530/src Modified Files: classes.lisp Log Message: initialize-instance obj : forgot to cache instances initialize-instance class => shared-initialize : reinitialize instance fixes shared-initialize obj : transients before persistents Date: Sat Sep 4 10:16:12 2004 Author: blee Index: elephant/src/classes.lisp diff -u elephant/src/classes.lisp:1.8 elephant/src/classes.lisp:1.9 --- elephant/src/classes.lisp:1.8 Thu Sep 2 16:41:25 2004 +++ elephant/src/classes.lisp Sat Sep 4 10:16:11 2004 @@ -50,7 +50,8 @@ "Sets the OID." (if (not from-oid) (setf (oid instance) (next-oid *store-controller*)) - (setf (oid instance) from-oid))) + (setf (oid instance) from-oid)) + (cache-instance *store-controller* instance)) (defclass persistent-object (persistent) ((%persistent-slots :transient t)) @@ -58,12 +59,32 @@ classes") (:metaclass persistent-metaclass)) -(defmethod initialize-instance :around ((class persistent-metaclass) &rest args &key direct-superclasses) +#| +(defmethod compute-class-precedence-list :around ((class persistent-metaclass)) + (let ((cpl (call-next-method)) + (persistent-object (find-class 'persistent-object))) + (if (member persistent-object cpl :test #'eq) + cpl + (let ((std-obj (find-class 'standard-object)) + (ccpl (copy-list cpl))) + (loop for c on ccpl + when (eq (cadr c) std-obj) + do + (setf (cdr c) (cons persistent-object + (cons (find-class 'persistent) (cdr c)))) + (return nil)) + ccpl)))) +|# + +(defmethod shared-initialize :around ((class persistent-metaclass) slot-names &rest args &key direct-superclasses) (let* ((persistent-metaclass (find-class 'persistent-metaclass)) + (persistent-object (find-class 'persistent-object)) (not-already-persistent (loop for superclass in direct-superclasses never (eq (class-of superclass) persistent-metaclass)))) - (if not-already-persistent - (apply #'call-next-method class :direct-superclasses (cons (find-class 'persistent-object) direct-superclasses) args) + (if (and (not (eq class persistent-object)) not-already-persistent) + (apply #'call-next-method class slot-names + :direct-superclasses (cons persistent-object + direct-superclasses) args) (call-next-method)))) (defmethod shared-initialize :around ((instance persistent-object) slot-names &rest initargs &key &allow-other-keys) @@ -79,6 +100,8 @@ (persistent-slot-inits (if (eq slot-names t) persistent-slot-names (remove-if-not #'persistent-slot-p slot-names)))) + ;; let the implementation initialize the transient slots + (apply #'call-next-method instance transient-slot-inits initargs) ;; initialize the persistent slots (flet ((initialize-from-initarg (slot-def) (loop for initarg in initargs @@ -96,9 +119,7 @@ (let ((initfun (slot-definition-initfunction slot-def))) (when initfun (setf (slot-value-using-class class instance slot-def) - (funcall initfun)))))) - ;; let the implementation initialize the transient slots - (apply #'call-next-method instance transient-slot-inits initargs))))) + (funcall initfun)))))))))) (defmethod slot-value-using-class :around (class (instance persistent-object) (slot-def persistent-slot-definition)) (declare (ignore class))

1 0

[elephant-cvs] CVS update: elephant/elephant.asd
by blee＠common-lisp.net 04 Sep '04

04 Sep '04

Update of /project/elephant/cvsroot/elephant In directory common-lisp.net:/tmp/cvs-serv11738 Modified Files: elephant.asd Log Message: typo Date: Sat Sep 4 10:13:14 2004 Author: blee Index: elephant/elephant.asd diff -u elephant/elephant.asd:1.4 elephant/elephant.asd:1.5 --- elephant/elephant.asd:1.4 Sun Aug 29 22:35:52 2004 +++ elephant/elephant.asd Sat Sep 4 10:13:14 2004 @@ -3,7 +3,7 @@ ;;; elephant.asd -- ASDF system definition for elephant ;;; ;;; Initial version 8/26/2004 by Ben Lee -;;; <ablumberg(a)common-lisp.net> +;;; <blee(a)common-lisp.net> ;;; ;;; part of ;;;

1 0

[elephant-cvs] CVS update: elephant/elephant-tests.asd
by blee＠common-lisp.net 04 Sep '04

04 Sep '04

Update of /project/elephant/cvsroot/elephant In directory common-lisp.net:/tmp/cvs-serv11712 Added Files: elephant-tests.asd Log Message: initial version Date: Sat Sep 4 10:13:00 2004 Author: blee

1 0

[elephant-cvs] CVS update: elephant/TODO
by blee＠common-lisp.net 04 Sep '04

04 Sep '04

Update of /project/elephant/cvsroot/elephant In directory common-lisp.net:/tmp/cvs-serv11686 Modified Files: TODO Log Message: update Date: Sat Sep 4 10:12:18 2004 Author: blee Index: elephant/TODO diff -u elephant/TODO:1.3 elephant/TODO:1.4 --- elephant/TODO:1.3 Thu Sep 2 17:11:58 2004 +++ elephant/TODO Sat Sep 4 10:12:18 2004 @@ -2,7 +2,8 @@ new counters in 4.3 (october) -understand the profiler / timer, tweak performance of CLOS stuff +understand the profiler / timer, tweak performance of CLOS +stuff tweak performance of transactions! @@ -23,3 +24,9 @@ lispy pointer arithmetic performance hacks: class / slot to ID + +tests tests tests + +this is not particularly a bug but: if you redefine the +persistent-object class, you will mess up any existing +persistent classes you've made.

1 0

[elephant-cvs] CVS update: elephant/INSTALL
by blee＠common-lisp.net 02 Sep '04

02 Sep '04

Update of /project/elephant/cvsroot/elephant In directory common-lisp.net:/tmp/cvs-serv6238 Modified Files: INSTALL Log Message: update of docs (for openmcl, revisions) Date: Thu Sep 2 17:19:17 2004 Author: blee Index: elephant/INSTALL diff -u elephant/INSTALL:1.7 elephant/INSTALL:1.8 --- elephant/INSTALL:1.7 Thu Sep 2 17:11:58 2004 +++ elephant/INSTALL Thu Sep 2 17:19:17 2004 @@ -9,15 +9,18 @@ ASDF - http://www.cliki.net/asdf -UFFI 1.4.24 - http://uffi.b9.com +UFFI 1.4.24/5 - http://uffi.b9.com I've patched src/functions.lisp to support some kinds of :out arguments. it is backwards-compatible so shouldn't -interfere with your existing work. I've contacted Kevin -Rosenberg about this, it will appear in a future release. +interfere with your existing work. It is included in +1.4.25, but just in case you have 1.4.24 I have included it. Sleepycat Berkeley DB 4.2 - http://www.sleepycat.com +The version number is important -- the headers have changed +siginificantly. + A C compiler. Presumably you have this if you installed Sleepycat. @@ -38,11 +41,11 @@ with the provided file. 2) Install Berkeley DB 4.2. You may actually already have -this installed. The version number is important. FreeBSD -has a port for this, as I'm sure do other BSDs (including -Darwin/Fink.) Take note of where libdb.so and db.h are -installed (usually /usr/local/BerekleyDB.4.2/lib/libdb.so -and /usr/local/BerekleyDB.4.2/include/db.h, or +this installed. FreeBSD has a port for this, as I'm sure +do other BSDs (including Darwin/Fink.) Take note of where +libdb.so and db.h are installed (usually +/usr/local/BerekleyDB.4.2/lib/libdb.so and +/usr/local/BerekleyDB.4.2/include/db.h, or /usr/local/lib/db42/libdb.so and /usr/local/include/db42/db.h.) @@ -54,7 +57,8 @@ /usr/local/share/common-lisp/elephant/ -or where you specified. +or where you specified. On Darwin / OS X you need to have +the developer tools installed. 4) Compile and load Elephant: @@ -72,9 +76,11 @@ errors", especially on SBCL. They are not issues, go ahead and redefine the constants. -Under CMUCL I sporadically get strange behavior which -indicates you might get better performance if you compile -everything again with everything loaded. +I can't seem to make OpenMCL not intern default keyword +values of my macros -- something which doesn't happen on +other implementations. I can't reproduce the issue except +for in my code, but expect (use-package "ELE")'s to produce +conflicting symbol warnings. ----------- Quick Start

1 0

[elephant-cvs] CVS update: elephant/TUTORIAL elephant/TODO elephant/NEWS elephant/INSTALL elephant/ChangeLog
by blee＠common-lisp.net 02 Sep '04

02 Sep '04

Update of /project/elephant/cvsroot/elephant In directory common-lisp.net:/tmp/cvs-serv5302 Modified Files: TUTORIAL TODO NEWS INSTALL ChangeLog Log Message: update of docs (for openmcl, revisions) Date: Thu Sep 2 17:11:59 2004 Author: blee Index: elephant/TUTORIAL diff -u elephant/TUTORIAL:1.5 elephant/TUTORIAL:1.6 --- elephant/TUTORIAL:1.5 Thu Sep 2 16:39:12 2004 +++ elephant/TUTORIAL Thu Sep 2 17:11:58 2004 @@ -138,10 +138,7 @@ (get-from-root "my other key")) => NIL -As a consequence, btrees have a sort of mishmash eql / -equalp hashing. - -2) Changing substructures are not automatically saved: +2) Changing substructures is not automatically saved: * (setf (car foo) T) => T @@ -156,7 +153,7 @@ maintain, deserialization must re-cons the entire object every time. Plus, one of the reasons to use a database is if your objects can't fit into main memory all at - once! + once, so lazy allocation is desirable. 4) Merge-conflicts in heavily multi-process/threaded situations. More on this later. @@ -244,11 +241,15 @@ persistent, it cannot later be changed to a transient slot. Note that the database is read every time you access a slot. -In particular, if your slot value is not an immediate value, -this will cons the value. Gets are not an expensive -operation (I can do a million reads in 30 seconds), but if -you're concerned, cache values. (In the future we will -provide automatic value caching.) +This is a feature, not a bug, especially in concurrent +situations: you want the most recent commits, right? +(Sleepycat will give isolation inside of transactions, +though.) In particular, if your slot value is not an +immediate value, reading will cons the value. Gets are not +an expensive operation (I can do a million reads in 30 +seconds), but if you're concerned, cache values. In the +future we will provide automatic value caching -- "single +user mode." Finally, if you for some reason make an instance with a specified OID which already exists in the database, initargs @@ -392,7 +393,8 @@ The serializer is definitely fast on fixnums, strings, and persistent things. It is fairly fast but consing with -floats and doubles. YMMV with other values. +floats and doubles. YMMV with other values, though I've +tried to make them fast. Using *auto-commit* and not "with-transactions" is a great way to have a huge number of transactions. You'll find that @@ -411,3 +413,6 @@ transactions correctly they should be much faster. If you don't need transactions you can turn them off. +Opening the DB in less concurrent / transctional modes will +be supported very soon (it's just an argument change, I +think.) Index: elephant/TODO diff -u elephant/TODO:1.2 elephant/TODO:1.3 --- elephant/TODO:1.2 Thu Sep 2 09:05:36 2004 +++ elephant/TODO Thu Sep 2 17:11:58 2004 @@ -22,6 +22,4 @@ lispy pointer arithmetic -OpenMCL! - performance hacks: class / slot to ID Index: elephant/NEWS diff -u elephant/NEWS:1.3 elephant/NEWS:1.4 --- elephant/NEWS:1.3 Tue Aug 31 01:53:32 2004 +++ elephant/NEWS Thu Sep 2 17:11:58 2004 @@ -1,4 +1,12 @@ +September 2, 2004 - + +The bad news: there was a bug in 0.1 which made OID +generation inside of manual transactions deadlock. + +The good news: this is fixed, and I've added OpenMCL +support. So I'm releasing 0.1-p1. + August 30, 2004 - Elephant 0.1 was released August 30th, 2004. This is an Index: elephant/INSTALL diff -u elephant/INSTALL:1.6 elephant/INSTALL:1.7 --- elephant/INSTALL:1.6 Thu Sep 2 09:01:37 2004 +++ elephant/INSTALL Thu Sep 2 17:11:58 2004 @@ -3,9 +3,9 @@ Requirements ------------ -CMUCL 19a, SBCL 0.8.13, or Allegro CL 6.2. I've tested -under FreeBSD and Linux. OpenMCL and Lispworks versions -will come soon. +CMUCL 19a, SBCL 0.8.13, OpemMCL 0.14.2, or Allegro CL 6.2. +I've tested under FreeBSD, Linux and OpenMCL / Darwin. A +Lispworks version will come if requested. ASDF - http://www.cliki.net/asdf Index: elephant/ChangeLog diff -u elephant/ChangeLog:1.1 elephant/ChangeLog:1.2 --- elephant/ChangeLog:1.1 Tue Aug 31 00:05:41 2004 +++ elephant/ChangeLog Thu Sep 2 17:11:58 2004 @@ -1,2 +1,4 @@ +9/02/2004 - Alpha 0.1-p1: OID counter bugfix, OpenMCL support. + 8/30/2004 - Alpha 0.1.

1 0

[elephant-cvs] CVS update: elephant/src/elephant.lisp
by blee＠common-lisp.net 02 Sep '04

02 Sep '04

Update of /project/elephant/cvsroot/elephant/src In directory common-lisp.net:/tmp/cvs-serv31423/src Modified Files: elephant.lisp Log Message: turns out i need to shadow with-transaction after all! Date: Thu Sep 2 16:47:53 2004 Author: blee Index: elephant/src/elephant.lisp diff -u elephant/src/elephant.lisp:1.8 elephant/src/elephant.lisp:1.9 --- elephant/src/elephant.lisp:1.8 Thu Sep 2 09:10:34 2004 +++ elephant/src/elephant.lisp Thu Sep 2 16:47:53 2004 @@ -43,6 +43,7 @@ (defpackage elephant (:nicknames ele :ele) (:use common-lisp sleepycat) + (:shadow #:with-transaction) (:export #:*store-controller* #:*current-transaction* #:*auto-commit* #:open-store #:close-store #:store-controller #:open-controller #:close-controller

1 0

[elephant-cvs] CVS update: elephant/src/utils.lisp
by blee＠common-lisp.net 02 Sep '04

02 Sep '04

Update of /project/elephant/cvsroot/elephant/src In directory common-lisp.net:/tmp/cvs-serv31364/src Modified Files: utils.lisp Log Message: nested transactions are borking -- kword default to with-transactions should be '*current-transaction*, not *current-transaction* -- i want to capture the dynamic, not lexical environment Date: Thu Sep 2 16:47:31 2004 Author: blee Index: elephant/src/utils.lisp diff -u elephant/src/utils.lisp:1.3 elephant/src/utils.lisp:1.4 --- elephant/src/utils.lisp:1.3 Thu Sep 2 09:21:45 2004 +++ elephant/src/utils.lisp Thu Sep 2 16:47:31 2004 @@ -123,9 +123,10 @@ (defmacro with-transaction ((&key transaction (environment (controller-environment *store-controller*)) - (parent *current-transaction*) + (parent '*current-transaction*) dirty-read txn-nosync - txn-nowait txn-sync) + txn-nowait txn-sync + (retries 100)) &body body) `(sleepycat:with-transaction (:transaction ,transaction :environment ,environment @@ -133,7 +134,8 @@ :dirty-read ,dirty-read :txn-nosync ,txn-nosync :txn-nowait ,txn-nowait - :txn-sync ,txn-sync) + :txn-sync ,txn-sync + :retries ,100) ,@body))

1 0