Update of /project/elephant/cvsroot/elephant/src/db-bdb In directory clnet:/tmp/cvs-serv1882/src/db-bdb

Modified Files: bdb-controller.lisp Log Message: Added 64-bit support, verified for 32-bit lisp via Allegro/Mac OS X. Thanks to Henrik Hjelte

--- /project/elephant/cvsroot/elephant/src/db-bdb/bdb-controller.lisp 2007/01/31 22:24:16 1.18 +++ /project/elephant/cvsroot/elephant/src/db-bdb/bdb-controller.lisp 2007/02/01 04:03:26 1.19 @@ -27,8 +27,6 @@ :accessor controller-environment) (oid-db :type (or null pointer-void) :accessor controller-oid-db) (oid-seq :type (or null pointer-void) :accessor controller-oid-seq) - (symid-db :type (or null pointer-void) :accessor controller-symid-db) - (symid-seq :type (or null pointer-void) :accessor controller-symid-seq) (btrees :type (or null pointer-void) :accessor controller-btrees) (indices :type (or null pointer-void) :accessor controller-indices) (indices-assoc :type (or null pointer-void) @@ -117,19 +115,6 @@ :auto-commit t :create t :thread t) (setf (controller-oid-seq sc) oid-seq)))

- (let ((db (db-create env))) - (setf (controller-symid-db sc) db) - (db-open db :file "%ELEPHANTSYMID" :database "%ELEPHANTSYMID" - :auto-commit t :type DB-BTREE :create t :thread thread) - (let ((symid-seq (db-sequence-create db))) - (db-sequence-set-cachesize symid-seq *cachesize*) - (db-sequence-set-flags symid-seq :seq-inc t :seq-wrap t) - (db-sequence-set-range symid-seq 0 most-positive-fixnum) - (db-sequence-initial-value symid-seq 0) - (db-sequence-open symid-seq "%ELEPHANTSYMID" - :auto-commit t :create t :thread t) - (setf (controller-symid-seq sc) symid-seq))) - (setf (slot-value sc 'root) (make-instance 'bdb-btree :from-oid -1 :sc sc))

@@ -153,10 +138,6 @@ ;; clean instance cache (flush-instance-cache sc) ;; close handles / environment - (db-sequence-close (controller-symid-seq sc)) - (setf (controller-symid-seq sc) nil) - (db-close (controller-symid-db sc)) - (setf (controller-symid-db sc) nil) (db-sequence-close (controller-oid-seq sc)) (setf (controller-oid-seq sc) nil) (db-close (controller-oid-db sc)) @@ -179,13 +160,6 @@ (db-sequence-get-fixnum (controller-oid-seq sc) 1 :transaction +NULL-VOID+ :auto-commit t :txn-nosync t))

-(defmethod next-symid ((sc bdb-store-controller)) - (declare (type bdb-store-controller sc)) - (db-sequence-get-fixnum (controller-symid-seq sc) 1 :transaction +NULL-VOID+ - :auto-commit t :txn-nosync t)) - - - ;; ;; Automated Deadlock Support ;;