[elephant-cvs] CVS elephant/src/memutil

[ieslick]

Update of /project/elephant/cvsroot/elephant/src/memutil
In directory clnet:/tmp/cvs-serv12311/src/memutil

Modified Files:
	memutil.lisp 
Log Message:

Significant additions to the 0.6.0 release on the trunk.  Updates to 
documentation, 0.5.0 compliance, final on 0.6.0 features.  There are
one or two BDB interactions on migration to work out but this should
be a nearly code complete 0.6.0 release.  Please start testing and
evaluating this - especially the ability to open and tag 0.5.0 databases.

Features:
- Database version tagging
- Support for 0.5.0 namespaces & databases
- New migration system
- class indexing without slot indexing
- various bug fixes
- reverted fast allegro/sbcl string support to
  allow 0.5.0 databases to work correctly.  I 
  couldn't find a good way to work around this
  without creating infinite headaches
- validated that running db_deadlock will stop all
  lisp freezes that I've encountered.  This has to
  be run each time a DB environment is opened/created
  so eventually should be made part of the open-controller
  functionality for the BDB backend



--- /project/elephant/cvsroot/elephant/src/memutil/memutil.lisp	2006/02/19 20:06:04	1.4
+++ /project/elephant/cvsroot/elephant/src/memutil/memutil.lisp	2006/04/26 17:53:45	1.5
@@ -56,6 +56,10 @@
 	   #:*c-library-extension*
 	   ))
 
+;; --REMOVE HACK--
+(defpackage elephant
+  (:use :cl))
+
 (in-package "ELEPHANT-MEMUTIL")
 
 #+cmu
@@ -323,11 +327,13 @@
   #+(and allegro ics)
   ;; old: `(let ((l (length ,s))) (+ l l))
   `(etypecase ,s
-     (base-string (length ,s))
+     (base-string (excl:native-string-sizeof ,s :external-format :unicode))
+		  ;; fast 0.6.1  (length ,s)
      (string (excl:native-string-sizeof ,s :external-format :unicode)))
   #+(or (and sbcl sb-unicode) lispworks)
   `(etypecase ,s 
-    (base-string (length ,s)) 
+    (base-string (* (length ,s) #+sbcl 4 #+lispworks 2) )
+		 ;;    (length ,s)))
     (string (* (length ,s) #+sbcl 4 #+lispworks 2)))
   #-(or lispworks (and allegro ics) (and sbcl sb-unicode))
   `(length ,s))
@@ -570,10 +576,11 @@
 	(resize-buffer-stream bs needed))
 ;; I wonder if the basic problem here is that we are using this
 ;; routine instead of something like "copy-ub8-from-system-area"?
-;;      #-allegro
+      #-allegro
       (copy-str-to-buf buf size s 0 str-bytes)
-;;      #+allegro
-;;      (excl:string-to-native s :address (offset-char-pointer buf size) :external-format :unicode)
+      #+allegro
+      (excl:string-to-native s :address (offset-char-pointer buf size) :external-format :unicode)
+      ;; v0.6.0 (copy-str-to-buf buf size s 0 str-bytes)
       (setf size needed)
       nil)))