- elephant-cvs@lists.common-lisp.net - mailman3.common-lisp.net

[elephant-cvs] CVS elephant/src/db-bdb
by ieslick 19 Feb '06

19 Feb '06

Update of /project/elephant/cvsroot/elephant/src/db-bdb In directory common-lisp:/tmp/cvs-serv25268/src/db-bdb Modified Files: sleepycat.lisp Added Files: libsleepycat.def Log Message: New build process completed & tested for BDB --- /project/elephant/cvsroot/elephant/src/db-bdb/sleepycat.lisp 2006/02/19 04:53:00 1.1 +++ /project/elephant/cvsroot/elephant/src/db-bdb/sleepycat.lisp 2006/02/19 17:25:53 1.2 @@ -45,8 +45,69 @@ %db-sequence-get-lower db-sequence-get-fixnum )) +;; +;; EXTERNAL LIBRARY DEPENDENCIES - LOAD DURING LOAD/COMPILATION +;; + +(eval-when (:compile-toplevel :load-toplevel) + + ;; + ;; Under Linux we need pthreads! + ;; + + #+linux + (unless + (uffi:load-foreign-library "/lib/tls/libpthread.so.0" :module "pthread") + (error "Couldn't load libpthread!")) + + ;; + ;; Our interface library requires that the main Berkeley DB library be loaded + ;; + + (unless + (uffi:load-foreign-library + ele-bdb-system::*sleepycat-foreign-library-path* + :module "sleepycat") + (error "Couldn't load libdb (Sleepycat)!")) + + ;; + ;; Our local interface library + ;; + + (unless + (uffi:load-foreign-library + (merge-pathnames + (make-pathname :name "libsleepycat" :type *c-library-extension*) + (merge-pathnames (make-pathname :directory "src/db-bdb") + (asdf:component-pathname (asdf:find-system 'elephant)))) + :module "libsleepycat") + (error "Couldn't load src/db-bdb/libsleepycat.~A!" elephant-memutil::*c-library-extension*)) + + ;; Error handling + ;; I put this here so we could validate that the library was loaded + + (def-function ("db_strerr" %db-strerror) + ((error :int)) + :returning :cstring) + + (defun db-strerror (errno) + "Get the string error associated with an error number." + (convert-from-cstring (%db-strerror errno))) + + (define-condition db-error (error) + ((errno :type fixnum :initarg :errno :reader db-error-errno)) + (:report + (lambda (condition stream) + (declare (type db-error condition) (type stream stream)) + (format stream "Berkeley DB error: ~A" + (db-strerror (db-error-errno condition))))) + (:documentation "Berkeley DB / Sleepycat errors.")) + ) + +;; ;; Constants and Flags ;; eventually write a macro which generates a custom flag function. +;; ;I don't like the UFFI syntax for enumerations (defconstant DB-BTREE 1) @@ -327,45 +388,6 @@ ,@(when set-transaction-timeout `((when ,set-transaction-timeout (setq ,flags (logior ,flags DB_SET_TXN_TIMEOUT))))) ,flags))) - -(eval-when (:compile-toplevel :load-toplevel) - (def-enum DBTYPE ((:BTREE 1) :HASH :QUEUE :RECNO :UNKNOWN)) - - #+linux - (unless - (uffi:load-foreign-library "/lib/tls/libpthread.so.0" :module "pthread") - (error "Couldn't load libpthread!")) - - (unless - (uffi:load-foreign-library - ;; Sleepycat: this works on linux - #+linux -;; "/db/ben/lisp/db43/lib/libdb.so" - "/usr/local/BerkeleyDB.4.3/lib/libdb-4.3.so" - ;; this works on FreeBSD - #+(and (or bsd freebsd) (not darwin) (not macosx)) - "/usr/local/lib/db43/libdb.so" - #+(or darwin macosx) - ;; for Fink (OS X) -- but I will assume Linux more common... -;; "/sw/lib/libdb-4.3.dylib" - ;; a possible manual install - "/usr/local/BerkeleyDB.4.3/lib/libdb.dylib" - :module "sleepycat") - (error "Couldn't load libdb (Sleepycat)!")) - - ;; Libsleepycat.so: edit this - (unless - (uffi:load-foreign-library - (if (find-package 'asdf) - (merge-pathnames - (make-pathname :name "libsleepycat" :type elephant-memutil::*c-library-extension*) - (asdf:component-pathname (asdf:find-system 'elephant))) - (format nil "/usr/local/share/common-lisp/elephant-0.3/libsleepycat.~A" elephant-memutil::*c-library-extension*)) - :module "libsleepycat") - (error "Couldn't load libsleepycat.~A!" elephant-memutil::*c-library-extension*)) - ) - - ;; Environment (def-function ("db_env_cr" %db-env-create) @@ -470,6 +492,9 @@ ;; Database +(eval-when (:compile-toplevel :load-toplevel) + (def-enum DBTYPE ((:BTREE 1) :HASH :QUEUE :RECNO :UNKNOWN))) + (def-function ("db_cr" %db-create) ((dbenv :pointer-void) (flags :unsigned-int) @@ -1845,24 +1870,3 @@ (if (< ret 0) (error 'db-error :errno ret) ret))) - -;; Misc - -;; Errors - -(def-function ("db_strerr" %db-strerror) - ((error :int)) - :returning :cstring) - -(defun db-strerror (errno) - "Get the string error associated with an error number." - (convert-from-cstring (%db-strerror errno))) - -(define-condition db-error (error) - ((errno :type fixnum :initarg :errno :reader db-error-errno)) - (:report - (lambda (condition stream) - (declare (type db-error condition) (type stream stream)) - (format stream "Berkeley DB error: ~A" - (db-strerror (db-error-errno condition))))) - (:documentation "Berkeley DB / Sleepycat errors.")) --- /project/elephant/cvsroot/elephant/src/db-bdb/libsleepycat.def 2006/02/19 17:25:53 NONE +++ /project/elephant/cvsroot/elephant/src/db-bdb/libsleepycat.def 2006/02/19 17:25:53 1.1 LIBRARY Elephant EXPORTS read_int read_uint read_float read_double write_int write_uint write_float write_double offset_charp copy_buf db_env_cr db_strerr db_env_close db_env_open db_env_dbremove db_env_dbrename db_env_remove db_env_set_flags db_env_get_flags db_cr db_close db_open db_remove db_rename db_sync db_truncate db_set_flags db_get_flags db_set_pagesize db_get_pagesize db_set_bt_compare db_set_dup_compare read_num lisp_compare db_set_lisp_compare db_set_lisp_dup_compare case_cmp lex_cmp utf16_cmp db_get_raw db_put_raw db_del db_cursor db_cursor_close db_cursor_del db_cursor_dup db_cursor_get_raw db_cursor_pget_raw db_cursor_put_raw db_del_kv db_cursor_get_multiple_key db_multiple_key_next db_txn_begin db_txn_abort db_txn_commit db_txnp_begin db_txn_id db_env_lock_id db_env_lock_id_free db_env_lock_get db_env_lock_put db_env_lock_vec db_env_set_timeout db_env_get_timeout db_env_set_lk_detect db_env_get_lk_detect db_env_lock_detect db_associate never_index db_fake_associate next_counter

1 0

[elephant-cvs] CVS elephant/src/memutil
by ieslick 19 Feb '06

19 Feb '06

Update of /project/elephant/cvsroot/elephant/src/memutil In directory common-lisp:/tmp/cvs-serv25268/src/memutil Modified Files: memutil.lisp Log Message: New build process completed & tested for BDB --- /project/elephant/cvsroot/elephant/src/memutil/memutil.lisp 2006/02/19 16:22:43 1.2 +++ /project/elephant/cvsroot/elephant/src/memutil/memutil.lisp 2006/02/19 17:25:53 1.3 @@ -52,6 +52,8 @@ #:pointer-int #:pointer-void #:array-or-pointer-char +NULL-CHAR+ +NULL-VOID+ + + #:*c-library-extension* )) (in-package "ELEPHANT-MEMUTIL") @@ -63,7 +65,7 @@ (eval-when (:compile-toplevel :load-toplevel) (defparameter *c-library-extension* #+(or darwin macosx) "dylib" - #-(or darwin macosx) "so" ) + #-(or darwin macosx) "so") (unless (uffi:load-foreign-library

1 0

[elephant-cvs] CVS elephant/src/elephant
by ieslick 19 Feb '06

19 Feb '06

Update of /project/elephant/cvsroot/elephant/src/elephant In directory common-lisp:/tmp/cvs-serv18566/src/elephant Modified Files: backend.lisp Log Message: Further reorg, added auto build of memutil --- /project/elephant/cvsroot/elephant/src/elephant/backend.lisp 2006/02/19 04:53:00 1.1 +++ /project/elephant/cvsroot/elephant/src/elephant/backend.lisp 2006/02/19 16:22:43 1.2 @@ -45,21 +45,26 @@ #:class-root #:flush-instance-cache ;; Collection generic functions - #:build-indexed-btree #:build-btree - #:deserialize #:serialize #:existsp + #:build-indexed-btree #:build-btree #:existsp + ;; Serialization + #:deserialize #:serialize + #:deserialize-from-base64-string + #:serialize-to-base64-string ;; Cursor accessors #:cursor-btree #:cursor-oid #:cursor-initialized-p - ;; Misc - #:slot-definition-name - #:register-backend-con-init - #:lookup-backend-con-init ;; Transactions #:execute-transaction #:controller-start-transaction #:controller-commit-transaction #:controller-abort-transaction + ;; Misc + #:slot-definition-name + #:remove-indexed-element-and-adjust + #:register-backend-con-init + #:lookup-backend-con-init + #:form-slot-key ) (:export ;; Variables @@ -83,20 +88,25 @@ #:class-root #:flush-instance-cache ;; Collection generic functions - #:build-indexed-btree #:build-btree - #:deserialize #:serialize #:existsp + #:build-indexed-btree #:build-btree #:existsp + ;; Serialization + #:deserialize #:serialize + #:deserialize-from-base64-string + #:serialize-to-base64-string ;; Cursor accessors #:cursor-btree #:cursor-oid #:cursor-initialized-p - ;; Misc - #:slot-definition-name - #:register-backend-con-init - #:lookup-backend-con-init ;; Transactions #:execute-transaction #:controller-start-transaction #:controller-commit-transaction #:controller-abort-transaction + ;; Misc + #:slot-definition-name + #:remove-indexed-element-and-adjust + #:register-backend-con-init + #:lookup-backend-con-init + #:form-slot-key )) \ No newline at end of file

1 0

[elephant-cvs] CVS elephant/src/memutil
by ieslick 19 Feb '06

19 Feb '06

Update of /project/elephant/cvsroot/elephant/src/memutil In directory common-lisp:/tmp/cvs-serv18566/src/memutil Modified Files: memutil.lisp Log Message: Further reorg, added auto build of memutil --- /project/elephant/cvsroot/elephant/src/memutil/memutil.lisp 2006/02/19 04:53:02 1.1 +++ /project/elephant/cvsroot/elephant/src/memutil/memutil.lisp 2006/02/19 16:22:43 1.2 @@ -65,21 +65,14 @@ #+(or darwin macosx) "dylib" #-(or darwin macosx) "so" ) - (defvar *elephant-lib-path* "/usr/local/share/common-lisp/elephant/")) - -(eval-when (:compile-toplevel :load-toplevel) - - (unless - (uffi:load-foreign-library - (if (find-package 'asdf) - (merge-pathnames - (make-pathname :name "libmemutil" :type *c-library-extension*) - (asdf:component-pathname (asdf:find-system 'elephant))) - (format nil "~A/~A.~A" *elephant-lib-path* "libmemutil" *c-library-extension*)) - :module "libmemutil") - (error "Couldn't load libmemutil.~A!" *c-library-extension*)) - - ;; fini on user editable part + (unless + (uffi:load-foreign-library + (merge-pathnames + (make-pathname :name "libmemutil" :type *c-library-extension* ) + (merge-pathnames (make-pathname :directory "src/memutil") + (asdf:component-pathname (asdf:find-system 'elephant)))) + :module "libmemutil") + (error "Couldn't load src/memutil/libmemutil.~A in!" *c-library-extension*)) (def-type pointer-int (* :int)) (def-type pointer-void :pointer-void) @@ -87,7 +80,16 @@ #+allegro (:array :char) #+(or cmu sbcl scl openmcl) (* :char)) (def-type array-or-pointer-char array-or-pointer-char) - ) + + ;; Standard utility for copying two foreign buffers -- + ;; also to test that lib is actually loaded! + (def-function ("copy_buf" copy-bufs) + ((dest array-or-pointer-char) + (dest-offset :int) + (src array-or-pointer-char) + (src-offset :int) + (length :int)) + :returning :void)) (declaim (inline read-int read-uint read-float read-double write-int write-uint write-float write-double @@ -410,15 +412,6 @@ (setf (deref-array dest 'array-or-pointer-char (+ i dest-offset)) (char-code (char src (+ i src-offset)))))))) -;; For copying two foreign buffers -(def-function ("copy_buf" copy-bufs) - ((dest array-or-pointer-char) - (dest-offset :int) - (src array-or-pointer-char) - (src-offset :int) - (length :int)) - :returning :void) - ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;

1 0

[elephant-cvs] CVS elephant/src/db-clsql
by ieslick 19 Feb '06

19 Feb '06

Update of /project/elephant/cvsroot/elephant/src/db-clsql In directory common-lisp:/tmp/cvs-serv18566/src/db-clsql Modified Files: sql-collections.lisp sql-controller.lisp sql-transaction.lisp Log Message: Further reorg, added auto build of memutil --- /project/elephant/cvsroot/elephant/src/db-clsql/sql-collections.lisp 2006/02/19 04:53:00 1.1 +++ /project/elephant/cvsroot/elephant/src/db-clsql/sql-collections.lisp 2006/02/19 16:22:40 1.2 @@ -17,8 +17,7 @@ ;;; (http://opensource.franz.com/preamble.html) also known as the LLGPL. ;;; -(in-package "ELEPHANT") - +(in-package "ELEPHANT-CLSQL") (defclass sql-btree-index (btree-index sql-btree) () @@ -80,10 +79,10 @@ :oid (cursor-oid cursor) ;; Do we need to so some kind of copy on this collection? :keys (:sql-crsr-ks cursor) - :curkey (:sql-crsr-ck cursor) - :handle (db-cursor-duplicate - (cursor-handle cursor) - :position (cursor-initialized-p cursor)))) + :curkey (:sql-crsr-ck cursor))) +;; :handle (db-cursor-duplicate +;; (cursor-handle cursor) +;; :position (cursor-initialized-p cursor)))) (defmethod cursor-current ((cursor sql-cursor)) (declare (optimize (speed 3))) --- /project/elephant/cvsroot/elephant/src/db-clsql/sql-controller.lisp 2006/02/19 05:13:02 1.2 +++ /project/elephant/cvsroot/elephant/src/db-clsql/sql-controller.lisp 2006/02/19 16:22:40 1.3 @@ -19,13 +19,14 @@ (in-package "ELEPHANT") (defpackage elephant-clsql - (:use :common-lisp :elephant :elephant-memutil :uffi :elephant-backend :cl-base64)) + (:use :common-lisp :uffi :cl-base64 + :elephant :elephant-memutil :elephant-backend )) (in-package "ELEPHANT-CLSQL") ;;; other clsql packages would have to be added for ;;; non-postgresql databases, see the CL-SQL documentation -(eval-when ( :compile-toplevel :load-toplevel) +(eval-when (:compile-toplevel :load-toplevel) ;; NOTE: Integrate into load process ;; Probably must be customized ... see documentation on installin postgres. (defvar *clsql-foreign-lib-path* "/usr/lib") @@ -40,22 +41,15 @@ ;; to the database called "test" under the user postgress ;; with the psql console first. Then study the authorization ;; and configuration files. - :initform '("localhost.localdomain" "test" "postgres" "") - ) - ) + :initform '("localhost.localdomain" "test" "postgres" "")) + (db :accessor controller-db :initarg :db :initform nil)) (:documentation "Class of objects responsible for the -book-keeping of holding DB handles, the cache, table -creation, counters, locks, the root (for garbage collection,) -et cetera. This is the Postgresql-specific subclass of store-controller.") - ) + book-keeping of holding DB handles, the cache, table + creation, counters, locks, the root (for garbage collection,) + et cetera. This is the Postgresql-specific subclass of store-controller.")) (defmethod build-btree ((sc sql-store-controller)) - (make-sql-btree sc) - ) - -(defmethod get-transaction-macro-symbol ((sc sql-store-controller)) - 'with-transaction-sql - ) + (make-sql-btree sc)) (defun sql-store-spec-p (spec) (and (listp spec) @@ -171,7 +165,7 @@ (when populate (let ((key-fn (key-fn index)) ) - (with-transaction-sql (:store-controller-sql sc) + (with-transaction (:store-controller sc) (map-btree #'(lambda (k v) (multiple-value-bind (index? secondary-key) @@ -193,7 +187,7 @@ (let* ((sc (get-con bt)) (con (controller-db sc)) (indices (indices-cache bt))) - (with-transaction-sql (:store-controller-sql sc) + (with-transaction (:store-controller sc) (maphash #'(lambda (k index) (multiple-value-bind (index? secondary-key) @@ -216,7 +210,7 @@ (let* ( (sc (get-con bt)) (con (controller-db sc))) - (with-transaction-sql (:store-controller-sql sc) + (with-transaction (:store-controller sc) (let ((value (get-value key bt))) (when value (let ((indices (indices-cache bt))) @@ -342,7 +336,8 @@ ;; can put it in a function.... (unless (keyvalue-table-exists con) (create-keyvalue-table con)) - (setf (slot-value sc 'root) (make-sql-btree sc)) + (setf (slot-value sc 'root) (build-btree sc)) + (setf (slot-value sc 'class-root) (build-indexed-btree sc)) ;; Actaully, it would seem here that we must further set the oid ;; of the root tree to 0 to ensure that we read the correct thing ;; when we next opent he controller... --- /project/elephant/cvsroot/elephant/src/db-clsql/sql-transaction.lisp 2006/02/19 04:53:00 1.1 +++ /project/elephant/cvsroot/elephant/src/db-clsql/sql-transaction.lisp 2006/02/19 16:22:40 1.2 @@ -17,14 +17,14 @@ ;;; (http://opensource.franz.com/preamble.html) also known as the LLGPL. ;;; +(in-package "ELEPHANT-CLSQL") -(defun execute-transaction ((sc sql-store-controller) txn-fn args) +(defmethod execute-transaction ((sc sql-store-controller) txn-fn &key &allow-other-keys) "Execute a body with a transaction in place. On success, the transaction is committed. Otherwise, the transaction is aborted. If the body deadlocks, the body is re-executed in a new transaction, retrying a fixed number of iterations. *auto-commit* is false for the body of the transaction." - (declare (ignore args)) ;; SQL doesn't support nested transaction so we lump it all ;; together (if (clsql::in-transaction-p :database (controller-db sc)) @@ -36,8 +36,12 @@ (funcall txn-fn)) (clsql::set-autocommit t))))) -;; NOTE: Implement this! -(defmethod controller-start-transaction ((sc sql-store-controller) &rest args)) -(defmethod controller-commit-transaction ((sc sql-store-controller)) -(defmethod controller-abort-transaction ((sc sql-store-controller))) +(defmethod controller-start-transaction ((sc sql-store-controller) &key &allow-other-keys) + (clsql:start-transaction :database (controller-db sc))) + +(defmethod controller-commit-transaction ((sc sql-store-controller) &key &allow-other-keys) + (clsql:commit :database (controller-db sc))) + +(defmethod controller-abort-transaction ((sc sql-store-controller) &key &allow-other-keys) + (clsql:rollback :database (controller-db sc)))

1 0

[elephant-cvs] CVS elephant
by ieslick 19 Feb '06

19 Feb '06

Update of /project/elephant/cvsroot/elephant In directory common-lisp:/tmp/cvs-serv18566 Modified Files: Makefile ele-clsql.asd elephant.asd Log Message: Further reorg, added auto build of memutil --- /project/elephant/cvsroot/elephant/Makefile 2006/02/19 04:52:58 1.9 +++ /project/elephant/cvsroot/elephant/Makefile 2006/02/19 16:22:39 1.10 @@ -1,41 +1,57 @@ # -# GNU Makefile for compiling libsleepycat.c (BSDers use gmake) +# GNU Makefile for compiling elephant libs (BSDers use gmake) # -# Contributed by Rafal Strzalinski +# Originally contributed by Rafal Strzalinski # SHELL=/bin/sh UNAME:=$(shell uname -s) -# DB43DIR=/db/ben/lisp/db43 -# Dan Knapp contributed this line, which came form OS X? -#DB43DIR=/sw +ifeq (Darwin,$(UNAME)) + SHARED=-bundle + EXT=dylib +else + SHARED=-shared + EXT=so +endif + +# +# ALL PLATFORMS NEED TO LOAD MEMUTILS +# + +UTILSRC=src/memutil + +all: $(UTILSRC)/libmemutil.$(EXT) + +$(UTILSRC)/libmemutil.$(EXT): $(UTILSRC)/libmemutil.c + gcc $(SHARED) -Wall -fPIC -O3 -o $@ $< -lm + +# +# NON BDB PLATFORMS SHOULDN'T NEED TO COMPILE LIBSLEEPYCAT +# SO ONLY EDIT THIS IF YOU WANT TO USE BDB! +# + # But I will assume that Linux is more common? DB43DIR=/usr/local/BerkeleyDB.4.3/ +# Dan Knapp contributed this line, which came form OS X? +# DB43DIR=/sw +# Other example paths +# DB43DIR=/db/ben/lisp/db43 -DBLIBDIR=$(DB43DIR)/lib/ DBINCDIR=$(DB43DIR)/include/ # Dan Knapp contributed this line; for fink/OS X? #DBINCDIR=$(DB43DIR)/include/db4/ +DBLIBDIR=$(DB43DIR)/lib/ # *BSD users will probably want #DBLIBDIR=/usr/local/lib/db43 #DBINCDIR=/usr/local/include/db43 -ifeq (Darwin,$(UNAME)) - SHARED=-bundle - EXT=dylib -else - SHARED=-shared - EXT=so -endif - -all: libsleepycat.$(EXT) libmemutil.$(EXT) +BDBSRC=src/db-bdb -libmemutil.$(EXT): src/memutil/libmemutil.c - gcc $(SHARED) -Wall -fPIC -O3 -o $@ $< -lm +bdb: libsleepycat.$(EXT) -libsleepycat.$(EXT): src/db-bdb/libsleepycat.c +$(BDBSRC)/libsleepycat.$(EXT): $(BDBSRC)/libsleepycat.c gcc $(SHARED) -Wall -L$(DBLIBDIR) -I$(DBINCDIR) -fPIC -O3 -o $@ $< -ldb -lm --- /project/elephant/cvsroot/elephant/ele-clsql.asd 2006/02/19 05:13:02 1.5 +++ /project/elephant/cvsroot/elephant/ele-clsql.asd 2006/02/19 16:22:39 1.6 @@ -30,7 +30,7 @@ ((:module :db-clsql :components ((:file "sql-controller") - (:file "sql-transactions") + (:file "sql-transaction") (:file "sql-collections")) :serial t)))) :depends-on (:elephant :clsql :cl-base64)) --- /project/elephant/cvsroot/elephant/elephant.asd 2006/02/19 04:52:58 1.13 +++ /project/elephant/cvsroot/elephant/elephant.asd 2006/02/19 16:22:39 1.14 @@ -23,6 +23,58 @@ (in-package :elephant-system) +(eval-when (:compile-toplevel :load-toplevel :execute) + ;; We need this dependency satisfied to compute what to do for C files + (unless (find-package 'uffi) + (asdf:operate 'asdf:load-op 'uffi))) + +(defclass elephant-util-c-source (c-source-file) + ()) + +(defparameter *root-dir* (pathname-directory *load-truename*)) + +(defparameter *library-file-dir* (append (pathname-directory *load-truename*) + (list "src" "memutil"))) + +;; Compile foreign library on non-win32 platforms + +(defmethod output-files ((o compile-op) (c elephant-util-c-source)) + (let* ((library-file-type + (funcall (intern (symbol-name '#:default-foreign-library-type) + (symbol-name '#:uffi))))) + (list (make-pathname :name (component-name c) + :type library-file-type + :directory *library-file-dir*)))) + +(defmethod perform ((o compile-op) (c elephant-util-c-source)) + (unless (operation-done-p o c) + #-(or win32 windows) + (unless (zerop (uffi:run-shell-command + (format nil + #-freebsd "cd ~A; make" + #+freebds "cd ~A; gmake" + (make-pathname :directory *root-dir*)))) + (error 'operation-error :component c :operation o)))) + +(defmethod operation-done-p ((o compile-op) (c elephant-util-c-source)) + (or (let ((lib (make-pathname :defaults (component-pathname c) + :type (uffi:default-foreign-library-type)))) + (and (probe-file lib) (probe-file (component-pathname c)) + (> (file-write-date lib) (file-write-date (component-pathname c))))))) + +;; Load op - ensure that foreign library is loaded + +(defmethod perform ((o load-op) (c elephant-util-c-source)) + "Nothing to do!" + t) + +(defmethod operation-done-p ((o load-op) (c elephant-util-c-source)) + "Operation is done when the foreign library is loaded which should + happen when we compile the interface lisp file" + (and (symbol-function (intern (symbol-name '#:copy-bufs) + (find-package '#:elephant-memutil))) + t)) + (defsystem elephant :name "elephant" :author "Ben Lee <blee(a)common-lisp.net>" @@ -36,7 +88,9 @@ :components ((:module memutil :components - ((:file "memutil"))) + ((:elephant-util-c-source "libmemutil") + (:file "memutil")) + :serial t) (:module elephant :components ((:file "elephant") @@ -58,3 +112,6 @@ :depends-on (memutil))))) :depends-on (:uffi)) + + +

1 0

[elephant-cvs] CVS elephant/src
by ieslick 19 Feb '06

19 Feb '06

Update of /project/elephant/cvsroot/elephant/src In directory common-lisp:/tmp/cvs-serv18566/src Removed Files: berkeley-db.lisp classes.lisp index-utils.lisp Log Message: Further reorg, added auto build of memutil

1 0

[elephant-cvs] CVS elephant/src/db-bdb
by ieslick 19 Feb '06

19 Feb '06

Update of /project/elephant/cvsroot/elephant/src/db-bdb In directory common-lisp:/tmp/cvs-serv18566/src/db-bdb Removed Files: bdb-enable.lisp libutil.c sleepycat-old.lisp Log Message: Further reorg, added auto build of memutil

1 0

[elephant-cvs] CVS elephant/src/elephant
by ieslick 19 Feb '06

19 Feb '06

Update of /project/elephant/cvsroot/elephant/src/elephant In directory common-lisp:/tmp/cvs-serv9084/src/elephant Modified Files: controller.lisp Log Message: Minor changes for sql-backend --- /project/elephant/cvsroot/elephant/src/elephant/controller.lisp 2006/02/19 04:53:00 1.1 +++ /project/elephant/cvsroot/elephant/src/elephant/controller.lisp 2006/02/19 05:13:02 1.2 @@ -32,9 +32,8 @@ (defvar *elephant-backends* '((:bdb (:ele-bdb)) - (:sqlite3 (:ele-clsql :clsql-sqlite3)) - (:postgres (:ele-clsql :clsql-postgres))) - "Entries have the form of (backend-type asdf-depends-list open-controller-fn)") + (:clsql (:ele-clsql))) + "Entries have the form of (backend-type asdf-depends-list") (defvar *elephant-controller-init* (make-hash-table))

1 0

[elephant-cvs] CVS elephant
by ieslick 19 Feb '06

19 Feb '06

Update of /project/elephant/cvsroot/elephant In directory common-lisp:/tmp/cvs-serv9084 Modified Files: ele-clsql.asd Log Message: Minor changes for sql-backend --- /project/elephant/cvsroot/elephant/ele-clsql.asd 2006/02/19 04:52:58 1.4 +++ /project/elephant/cvsroot/elephant/ele-clsql.asd 2006/02/19 05:13:02 1.5 @@ -16,7 +16,7 @@ ;;; as governed by the terms of the Lisp Lesser GNU Public License ;;; (http://opensource.franz.com/preamble.html) also known as the LLGPL. -(defsystem ele-sql +(defsystem ele-clsql :name "elephant" :author "Ben Lee <blee(a)common-lisp.net>" :version "0.6.0" @@ -24,6 +24,7 @@ :licence "LLGPL" :description "SQL-based Object respository for Common Lisp" :long-description "An experimental CL-SQL based implementation of Elephant" + :components ((:module :src :components ((:module :db-clsql

1 0