[elephant-cvs] CVS update: elephant/src/utils.lisp - elephant-cvs@common-lisp.net - mailman3.common-lisp.net

2 Sep 2004

Update of /project/elephant/cvsroot/elephant/src
In directory common-lisp.net:/tmp/cvs-serv20809/src
Modified Files:
    utils.lisp 
Log Message:
reorder, typos
Date: Thu Sep  2 09:21:45 2004
Author: blee
Index: elephant/src/utils.lisp
diff -u elephant/src/utils.lisp:1.2 elephant/src/utils.lisp:1.3

--- elephant/src/utils.lisp:1.2	Sun Aug 29 22:41:55 2004
+++ elephant/src/utils.lisp	Thu Sep  2 09:21:45 2004
@@ -73,14 +73,32 @@
 ;;;
 ;;; Thread-local specials
+(defparameter *store-controller* nil 
+  "The store controller which persistent objects talk to.")
+
+;; Specials which control persistent objects
+(defvar *auto-commit* T)
+
+(declaim (type buffer-stream *out-buf* *key-buf* *in-buf*))
+
+;; Buffers for going in and out of the DB
+(defvar *out-buf* (make-buffer-stream))
+(defvar *key-buf* (make-buffer-stream))
+(defvar *in-buf* (make-buffer-stream))
+
+;; Stuff the serializer uses
+(defvar *lisp-obj-id* 0)
+(defvar *circularity-hash* (make-hash-table :test 'eq))
+#+(or cmu scl sbcl allegro)
+(defvar *resourced-byte-spec* (byte 32 0))
+
 ;; TODO: make this for real!
 (defun run-elephant-thread (thunk)
-  (let ((*current-transaction* +NULL-vOID+)
+  (let ((*current-transaction* +NULL-VOID+)
    (*errno-buffer* (allocate-foreign-object :int 1))
    (*get-buffer* (allocate-foreign-object :char 1))
    (*get-buffer-length* 0)
-	(*store-controller* nil)
-	;(*auto-commit* T) which is correct?
+	(*store-controller* *store-controller*)
    (*auto-commit* *auto-commit*)
    (*out-buf* (make-buffer-stream))
    (*key-buf* (make-buffer-stream))
@@ -97,26 +115,6 @@
     (funcall thunk)))
-(defparameter *store-controller* nil 
-  "The store controller which persistent objects talk to.")
-
-;; Specials which control persistent objects
-(defvar *auto-commit* T)
-
-(declaim (type buffer-stream *out-buf* *key-buf* *in-buf*))
-
-;; Buffers for going in and out of the DB
-(defvar *out-buf* (make-buffer-stream))
-(defvar *key-buf* (make-buffer-stream))
-(defvar *in-buf* (make-buffer-stream))
-
-;; Stuff the serializer uses
-(defvar *lisp-obj-id* 0)
-(defvar *circularity-hash* (make-hash-table :test 'eq))
-#+(or cmu scl sbcl allegro)
-(defvar *resourced-byte-spec* (byte 32 0))
-
-
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;;
 ;;; Macros
@@ -125,7 +123,7 @@
 (defmacro with-transaction ((&key transaction 
    			  (environment (controller-environment
    					*store-controller*))
-				  (parent '*current-transaction*)
+				  (parent *current-transaction*)
    			  dirty-read txn-nosync
    			  txn-nowait txn-sync)
    		    &body body)

    