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

[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-serv16598/src Modified Files: elephant.lisp Log Message: openmcl Date: Thu Sep 2 09:10:34 2004 Author: blee Index: elephant/src/elephant.lisp diff -u elephant/src/elephant.lisp:1.7 elephant/src/elephant.lisp:1.8 --- elephant/src/elephant.lisp:1.7 Mon Aug 30 23:14:49 2004 +++ elephant/src/elephant.lisp Thu Sep 2 09:10:34 2004 @@ -43,7 +43,6 @@ (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 @@ -75,6 +74,7 @@ slot-value-using-class slot-boundp-using-class slot-definition-allocation + slot-definition-initargs compute-slots initialize-internal-slot-functions @@ -105,6 +105,7 @@ slot-value-using-class slot-boundp-using-class slot-definition-allocation + slot-definition-initargs compute-slots) #+sbcl (:import-from :sb-pcl @@ -136,17 +137,55 @@ slot-value-using-class slot-boundp-using-class slot-definition-allocation + slot-definition-initargs compute-slots) #+allegro (:import-from :excl compute-effective-slot-definition-initargs) - #+openmcl - (:import-from :openmcl-mop + #+openmcl + (:import-from :ccl + validate-superclass + standard-slot-definition + standard-direct-slot-definition + standard-effective-slot-definition + direct-slot-definition-class + effective-slot-definition-class slot-definition-name - compute-slots) + slot-definition-initfunction + compute-effective-slot-definition + class-slots + slot-value-using-class + slot-boundp-using-class + slot-definition-allocation + slot-definition-initargs + compute-slots + ;; This stuff we need until we resolve the :transient + ;; slot specifier stuff + make-effective-slot-definition + slots-class + %slot-definition-initfunction + %slot-definition-documentation + %slot-definition-initargs + %slot-definition-initform + %slot-definition-allocation + %slot-definition-class + %slot-definition-type) #+lispworks (:import-from :clos + validate-superclass + standard-slot-definition + standard-direct-slot-definition + standard-effective-slot-definition + direct-slot-definition-class + effective-slot-definition-class slot-definition-name + slot-definition-initfunction + compute-effective-slot-definition + class-slots + slot-value-using-class + slot-boundp-using-class + slot-definition-allocation + slot-definition-initargs compute-slots) )

1 0

[elephant-cvs] CVS update: elephant/src/classes.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-serv16566/src Modified Files: classes.lisp Log Message: openmcl, fixed shared-initialize, slot-mkunbound Date: Thu Sep 2 09:09:57 2004 Author: blee Index: elephant/src/classes.lisp diff -u elephant/src/classes.lisp:1.6 elephant/src/classes.lisp:1.7 --- elephant/src/classes.lisp:1.6 Mon Aug 30 23:14:25 2004 +++ elephant/src/classes.lisp Thu Sep 2 09:09:57 2004 @@ -67,26 +67,37 @@ (call-next-method)))) (defmethod shared-initialize :around ((instance persistent-object) slot-names &rest initargs &key &allow-other-keys) + "This seems to be necessary because it is typical for implementations to optimize setting the slots via initforms and initargs in such a way that slot-value-using-class et al aren't used." (let* ((class (class-of instance)) (persistent-slot-names (persistent-slot-names class))) (flet ((persistent-slot-p (item) (member item persistent-slot-names :test #'eq))) (let ((transient-slot-inits - (if (eq slot-names t) + (if (eq slot-names t) ; t means all slots (transient-slot-names class) (remove-if #'persistent-slot-p slot-names))) (persistent-slot-inits (if (eq slot-names t) persistent-slot-names (remove-if-not #'persistent-slot-p slot-names)))) - (loop for slot-def in (class-slots class) - when (member (slot-definition-name slot-def) - persistent-slot-inits) - unless (slot-boundp-using-class class instance slot-def) - do - (let ((initfun (slot-definition-initfunction slot-def))) - (when initfun - (setf (slot-value-using-class class instance slot-def) - (funcall initfun))))) + ;; initialize the persistent slots + (flet ((initialize-from-initarg (slot-def) + (loop for initarg in initargs + with slot-initargs = (slot-definition-initargs slot-def) + when (member initarg slot-initargs :test #'eq) + do + (setf (slot-value-using-class class instance slot-def) + (getf initargs initarg)) + (return t)))) + (loop for slot-def in (class-slots class) + unless (initialize-from-initarg slot-def) + when (member (slot-definition-name slot-def) persistent-slot-names :test #'eq) + unless (slot-boundp-using-class class instance slot-def) + do + (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))))) (defmethod slot-value-using-class :around (class (instance persistent-object) (slot-def persistent-slot-definition)) @@ -107,11 +118,11 @@ (defmethod slot-makunbound-using-class :around (class (instance persistent-object) (slot-def persistent-slot-definition)) (declare (ignore class)) (buffer-write-int (oid instance) *key-buf*) - (let* ((key-length (serialize (slot-definition-name slot-def) *key-buf*)) - (buf (db-delete-buffered - (controller-db *store-controller*) - (buffer-stream-buffer *key-buf*) - key-length - :transaction *current-transaction* - :auto-commit *auto-commit*))))) + (let ((key-length (serialize (slot-definition-name slot-def) *key-buf*))) + (db-delete-buffered + (controller-db *store-controller*) + (buffer-stream-buffer *key-buf*) + key-length + :transaction *current-transaction* + :auto-commit *auto-commit*)))

1 0

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

02 Sep '04

Update of /project/elephant/cvsroot/elephant In directory common-lisp.net:/tmp/cvs-serv16480 Modified Files: TODO Log Message: notes from rtoy on bignums Date: Thu Sep 2 09:05:36 2004 Author: blee Index: elephant/TODO diff -u elephant/TODO:1.1 elephant/TODO:1.2 --- elephant/TODO:1.1 Mon Aug 30 23:41:34 2004 +++ elephant/TODO Thu Sep 2 09:05:36 2004 @@ -14,7 +14,9 @@ Lispworks stuff (fli:replace-foreign-array...) -bignum fix +bignum fix: CMUCL / SBCL use %bignum-ref. OpenMCL: check +that ldb is non-consing (i think it is), look at +%ldb-fixnum-from-bignum) serialize lambdas, closures, packages.....

1 0

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

02 Sep '04

Update of /project/elephant/cvsroot/elephant In directory common-lisp.net:/tmp/cvs-serv16450 Modified Files: Makefile Log Message: conditionalize darwin Date: Thu Sep 2 09:03:53 2004 Author: blee Index: elephant/Makefile diff -u elephant/Makefile:1.1 elephant/Makefile:1.2 --- elephant/Makefile:1.1 Sun Aug 29 22:34:10 2004 +++ elephant/Makefile Thu Sep 2 09:03:51 2004 @@ -1,24 +1,30 @@ # -# Makefile for compiling libsleepycat.c +# GNU Makefile for compiling libsleepycat.c (BSDers use gmake) # # Contributed by Rafal Strzalinski # SHELL=/bin/sh +UNAME:=$(shell uname -s) # *BSD users will probably want -# DBLIBDIR=/usr/local/lib/db42 -# DBINCDIR=/usr/local/include/db42 +DBLIBDIR=/usr/local/lib/db42 +DBINCDIR=/usr/local/include/db42 -DB42DIR=/usr/local/BerkeleyDB.4.2 - -DBLIBDIR=$(DB42DIR)/lib/ -DBINCDIR=$(DB42DIR)/include/ - -INSTALLDIR=/usr/local/share/common-lisp/elephant/ +#DB42DIR=/usr/local/BerkeleyDB.4.2 +#DBLIBDIR=$(DB42DIR)/lib/ +#DBINCDIR=$(DB42DIR)/include/ + +INSTALLDIR=/usr/local/share/common-lisp/elephant-0.1/ + +ifeq (Darwin,$(UNAME)) + SHARED=-bundle +else + SHARED=-shared +endif libsleepycat.so: src/libsleepycat.c - gcc -L$(DBLIBDIR) -I$(DBINCDIR) -fPIC -shared -O3 -o $@ $< -ldb + gcc $(SHARED) -L$(DBLIBDIR) -I$(DBINCDIR) -fPIC -O3 -o $@ $< -ldb install: libsleepycat.so install $< $(INSTALLDIR)

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-serv16190 Modified Files: INSTALL Log Message: 0.1 Date: Thu Sep 2 09:01:37 2004 Author: blee Index: elephant/INSTALL diff -u elephant/INSTALL:1.5 elephant/INSTALL:1.6 --- elephant/INSTALL:1.5 Tue Aug 31 01:46:12 2004 +++ elephant/INSTALL Thu Sep 2 09:01:37 2004 @@ -29,7 +29,7 @@ 0) Unpack Elephant. I put mine in the directory -/usr/local/share/common-lisp/elephant/ +/usr/local/share/common-lisp/elephant-0.1/ 1) Install UFFI 1.4.24. Replace

1 0