Bug fix

[clg] / glib / glib.lisp

diff --git a/glib/glib.lisp b/glib/glib.lisp
index a2731eb40b1588d3f93ab546e9a97d9c6f461ae6..2b3e256fc83154932ebf961ea3da60a05a6120a2 100644 (file)
--- a/glib/glib.lisp
+++ b/glib/glib.lisp
@@ -20,73 +20,80 @@
 ;; TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 ;; SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 ;; TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 ;; SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 

-;; $Id: glib.lisp,v 1.31 2005-04-24 13:27:20 espen Exp $
+;; $Id: glib.lisp,v 1.40 2007-06-15 12:25:16 espen Exp $

 
 
 (in-package "GLIB")
 
 (use-prefix "g")
 
 
 
 (in-package "GLIB")
 
 (use-prefix "g")
 

+#-sb-thread
+(progn
+  (defun make-mutex ()
+    nil)
+  
+  (defmacro with-mutex ((mutex) &body body)
+    (declare (ignore mutex))
+    `(progn ,@body)))

 
 

-;;;; Memory management

 
 

-(defbinding (allocate-memory "g_malloc0") () pointer
-  (size unsigned-long))
+;;;; Memory management

 
 

-(defbinding (reallocate-memory "g_realloc") () pointer
-  (address pointer)
+(defbinding (%allocate-memory "g_malloc0") () pointer

   (size unsigned-long))
 
   (size unsigned-long))
 

-(defbinding (deallocate-memory "g_free") () nil
+(defbinding (%deallocate-memory "g_free") () nil

   (address pointer))
   (address pointer))

-;; (defun deallocate-memory (address)
-;;   (declare (ignore address)))

 
 

-(defun copy-memory (from length &optional (to (allocate-memory length)))
-  #+cmu(system-area-copy from 0 to 0 (* 8 length))
-  #+sbcl(system-area-ub8-copy from 0 to 0 length)
-  to)
+;; (setf
+;;  (symbol-function 'allocate-memory) #'%allocate-memory
+;;  (symbol-function 'deallocate-memory) #'%deallocate-memory)

 
 

+(setf *memory-allocator* #'%allocate-memory)
+(setf *memory-deallocator* #'%deallocate-memory)

 
 ;;;; User data mechanism
 
 
 ;;;; User data mechanism
 

-(internal *user-data* *user-data-count*)
-
+(defvar *user-data-lock* (make-mutex))

 (defvar *user-data* (make-hash-table))
 (defvar *user-data-count* 0)
 
 (defun register-user-data (object &optional destroy-function)
   (check-type destroy-function (or null symbol function))
 (defvar *user-data* (make-hash-table))
 (defvar *user-data-count* 0)
 
 (defun register-user-data (object &optional destroy-function)
   (check-type destroy-function (or null symbol function))

-  (incf *user-data-count*)
-  (setf
-   (gethash *user-data-count* *user-data*)
-   (cons object destroy-function))
-  *user-data-count*)
+  (with-mutex (*user-data-lock*)
+    (incf *user-data-count*)
+    (setf
+     (gethash *user-data-count* *user-data*)
+     (cons object destroy-function))
+    *user-data-count*))

 
 (defun find-user-data (id)
   (check-type id fixnum)
 
 (defun find-user-data (id)
   (check-type id fixnum)

-  (multiple-value-bind (user-data p) (gethash id *user-data*)
-    (values (car user-data) p)))
+  (with-mutex (*user-data-lock*)
+    (multiple-value-bind (user-data p) (gethash id *user-data*)
+      (values (car user-data) p))))

 
 (defun user-data-exists-p (id)
   (nth-value 1 (find-user-data id)))
 
 (defun update-user-data (id object)
   (check-type id fixnum)
 
 (defun user-data-exists-p (id)
   (nth-value 1 (find-user-data id)))
 
 (defun update-user-data (id object)
   (check-type id fixnum)

-  (multiple-value-bind (user-data exists-p) (gethash id *user-data*)
-    (cond
-     ((not exists-p) (error "User data id ~A does not exist" id))
-     (t 
-      (when (cdr user-data)
-       (funcall (cdr user-data) (car user-data)))
-      (setf (car user-data) object)))))
+  (with-mutex (*user-data-lock*)
+    (multiple-value-bind (user-data exists-p) (gethash id *user-data*)
+      (cond
+       ((not exists-p) (error "User data id ~A does not exist" id))
+       (t 
+       (when (cdr user-data)
+         (funcall (cdr user-data) (car user-data)))
+       (setf (car user-data) object))))))

 
 (defun destroy-user-data (id)
   (check-type id fixnum)
 
 (defun destroy-user-data (id)
   (check-type id fixnum)

-  (let ((user-data (gethash id *user-data*)))
-    (when (cdr user-data)
-      (funcall (cdr user-data) (car user-data))))
-  (remhash id *user-data*))
+  (with-mutex (*user-data-lock*)
+    (let ((user-data (gethash id *user-data*)))
+      (when (cdr user-data)
+       (funcall (cdr user-data) (car user-data))))
+    (remhash id *user-data*)))

 
 
 ;;;; Quarks
 
 
 ;;;; Quarks


@@ -104,616 +111,338 @@ (defun quark-intern (object)
                                 (package-name (symbol-package object)) 
                                 object)))))
 
                                 (package-name (symbol-package object)) 
                                 object)))))
 

-(defbinding quark-to-string () (copy-of string)
+(defbinding quark-to-string () (static string)

   (quark quark))
 
 
 ;;;; Linked list (GList)
 
 (deftype glist (type) 
   (quark quark))
 
 
 ;;;; Linked list (GList)
 
 (deftype glist (type) 

-  `(or (null (cons ,type list))))
+  `(or null (cons ,type list)))

 
 (defbinding (%glist-append "g_list_append") () pointer
 
 (defbinding (%glist-append "g_list_append") () pointer

-  (glist pointer)
+  (glist (or null pointer))

   (nil null))
 
   (nil null))
 

-(defun make-glist (type list)
-  (loop
-   with writer = (writer-function type)
-   for element in list
-   as glist = (%glist-append (or glist (make-pointer 0)))
-   do (funcall writer element glist)
-   finally (return glist)))
+(defun make-glist (element-type list &optional temp-p)
+  (let ((writer (if (functionp element-type)
+                   element-type
+                 (writer-function element-type :temp temp-p))))
+    (loop
+     for element in list
+     as glist = (%glist-append nil) then (%glist-append glist)
+     do (funcall writer element glist)
+     finally (return glist))))

 
 (defun glist-next (glist)
   (unless (null-pointer-p glist)
 
 (defun glist-next (glist)
   (unless (null-pointer-p glist)

-    (sap-ref-sap glist +size-of-pointer+)))
+    (ref-pointer glist #.(size-of 'pointer))))

   
 ;; Also used for gslists
   
 ;; Also used for gslists

-(defun map-glist (seqtype function glist element-type)
-  (let ((reader (reader-function element-type)))
+(defun map-glist (seqtype function glist element-type &optional (ref :read))
+  (let ((reader (if (functionp element-type)
+                   element-type
+                 (reader-function element-type :ref ref))))

     (case seqtype 
      ((nil)
       (loop
     (case seqtype 
      ((nil)
       (loop

-       as tmp = glist then (glist-next tmp)
-       until (null-pointer-p tmp)
-       do (funcall function (funcall reader tmp))))
+       as element = glist then (glist-next element)
+       until (null-pointer-p element)
+       do (funcall function (funcall reader element))))

      (list
       (loop
      (list
       (loop

-       as tmp = glist then (glist-next tmp)
-       until (null-pointer-p tmp)
-       collect (funcall function (funcall reader tmp))))
+       as element = glist then (glist-next element)
+       until (null-pointer-p element)
+       collect (funcall function (funcall reader element))))

      (t
       (coerce 
        (loop
      (t
       (coerce 
        (loop

-       as tmp = glist then (glist-next tmp)
-       until (null-pointer-p tmp)
-       collect (funcall function (funcall reader tmp)))
+       as element = glist then (glist-next element)
+       until (null-pointer-p element)
+       collect (funcall function (funcall reader element)))

        seqtype)))))
 
 (defbinding (glist-free "g_list_free") () nil
   (glist pointer))
 
        seqtype)))))
 
 (defbinding (glist-free "g_list_free") () nil
   (glist pointer))
 

-(defun destroy-glist (glist element-type)
-  (loop
-   with destroy = (destroy-function element-type)
-   as tmp = glist then (glist-next tmp)
-   until (null-pointer-p tmp)
-   do (funcall destroy tmp 0))
+(defun destroy-glist (glist element-type &optional temp-p)
+  (let ((destroy (if (functionp element-type)
+                    element-type
+                  (destroy-function element-type :temp temp-p))))
+    (loop
+     as element = glist then (glist-next element)
+     until (null-pointer-p element)
+     do (funcall destroy element)))

   (glist-free glist))
 
   (glist-free glist))
 

-(defmethod alien-type ((type (eql 'glist)) &rest args)
-  (declare (ignore type args))
+(define-type-method alien-type ((type glist))
+  (declare (ignore type))

   (alien-type 'pointer))
 
   (alien-type 'pointer))
 

-(defmethod size-of ((type (eql 'glist)) &rest args)
-  (declare (ignore type args))
+(define-type-method size-of ((type glist) &key inlined)
+  (assert-not-inlined type inlined)

   (size-of 'pointer))
 
   (size-of 'pointer))
 

-(defmethod to-alien-form (list (type (eql 'glist)) &rest args)
-  (declare (ignore type))
-  (destructuring-bind (element-type) args    
-    `(make-glist ',element-type ,list)))
-
-(defmethod to-alien-function ((type (eql 'glist)) &rest args)
-  (declare (ignore type))
-  (destructuring-bind (element-type) args    
-    #'(lambda (list)
-       (make-glist element-type list))))
-
-(defmethod from-alien-form (glist (type (eql 'glist)) &rest args)
-  (declare (ignore type))
-  (destructuring-bind (element-type) args
-    `(let ((glist ,glist))
-      (unwind-protect
-          (map-glist 'list #'identity glist ',element-type)
-       (destroy-glist glist ',element-type)))))
-
-(defmethod from-alien-function ((type (eql 'glist)) &rest args)
-  (declare (ignore type))
-  (destructuring-bind (element-type) args
-    #'(lambda (glist)
-       (unwind-protect
-            (map-glist 'list #'identity glist element-type)
-         (destroy-glist glist element-type)))))
-
-(defmethod copy-from-alien-form (glist (type (eql 'glist)) &rest args)
-  (declare (ignore type))
-  (destructuring-bind (element-type) args
-    `(map-glist 'list #'identity ,glist ',element-type)))
-
-(defmethod copy-from-alien-function ((type (eql 'glist)) &rest args)
-  (declare (ignore type))
-  (destructuring-bind (element-type) args
-    #'(lambda (glist)
-       (map-glist 'list #'identity glist element-type))))
-
-(defmethod cleanup-form (glist (type (eql 'glist)) &rest args)
-  (declare (ignore type))
-  (destructuring-bind (element-type) args
-    `(destroy-glist ,glist ',element-type)))
+(define-type-method type-alignment ((type glist) &key inlined)
+  (assert-not-inlined type inlined)
+  (type-alignment 'pointer))

 
 

-(defmethod cleanup-function ((type (eql 'glist)) &rest args)
-  (declare (ignore type))
-  (destructuring-bind (element-type) args
-    #'(lambda (glist)
-       (destroy-glist glist element-type))))
+(define-type-method alien-arg-wrapper ((type glist) var list style form &optional copy-in-p)
+  (destructuring-bind (element-type) (rest (type-expand-to 'glist type))
+    (cond
+      ((and (in-arg-p style) (not (out-arg-p style)))
+       `(with-pointer (,var (make-glist ',element-type ,list ,(not copy-in-p)))
+         (unwind-protect
+             ,form
+           ,(unless copy-in-p
+              `(destroy-glist ,var ',element-type t)))))
+      ((and (in-arg-p style) (out-arg-p style))
+       (let ((glist (make-symbol "GLIST")))
+        `(with-pointer (,glist (make-glist ',element-type ,list ,(not copy-in-p)))
+            (with-pointer (,var ,glist)                      
+             (unwind-protect
+                 ,form
+               ,(unless copy-in-p
+                  `(destroy-glist ,glist ',element-type t)))))))
+      ((and (out-arg-p style) (not (in-arg-p style)))
+       `(with-pointer (,var)
+         ,form)))))
+
+(define-type-method to-alien-form ((type glist) list &optional copy-p)
+  (declare (ignore copy-p))
+  (destructuring-bind (element-type) (rest (type-expand-to 'glist type))
+    `(make-glist ',element-type ,list)))

 
 

-(defmethod writer-function ((type (eql 'glist)) &rest args)
-  (declare (ignore type))
-  (destructuring-bind (element-type) args
+(define-type-method to-alien-function ((type glist) &optional copy-p)
+  (destructuring-bind (element-type) (rest (type-expand-to 'glist type))
+    (values
+     #'(lambda (list)
+        (make-glist element-type list (not copy-p)))
+     (unless copy-p
+       #'(lambda (list glist)
+          (declare (ignore list))
+          (destroy-glist glist element-type t))))))
+
+(define-type-method from-alien-form ((type glist) form &key (ref :free))
+  (destructuring-bind (element-type) (rest (type-expand-to 'glist type))
+    `(let ((glist ,form))
+       (unwind-protect
+          (map-glist 'list #'identity glist ',element-type 
+           ,(ecase ref (:free :get) ((:static :temp) :peek) (:copy :read)))
+        ,(when (eq ref :free)
+           `(destroy-glist glist ',element-type))))))
+
+(define-type-method from-alien-function ((type glist) &key (ref :free))
+  (destructuring-bind (element-type) (rest (type-expand-to 'glist type))
+    (ecase ref
+      (:free 
+       #'(lambda (glist)
+          (prog1
+              (map-glist 'list #'identity glist element-type :get)
+            (glist-free glist))))
+      (:copy
+       #'(lambda (glist)
+          (map-glist 'list #'identity glist element-type :read)))
+      ((:static :temp)
+       #'(lambda (glist)
+          (map-glist 'list #'identity glist element-type :peek))))))
+
+(define-type-method writer-function ((type glist) &key temp inlined)
+  (assert-not-inlined type inlined)
+  (let ((element-type (second (type-expand-to 'glist type))))

     #'(lambda (list location &optional (offset 0))
        (setf 
     #'(lambda (list location &optional (offset 0))
        (setf 

-        (sap-ref-sap location offset)
-        (make-glist element-type list)))))
-
-(defmethod reader-function ((type (eql 'glist)) &rest args)
-  (declare (ignore type))
-  (destructuring-bind (element-type) args
+        (ref-pointer location offset)
+        (make-glist element-type list temp)))))
+
+(define-type-method reader-function ((type glist) &key (ref :read) inlined)
+  (assert-not-inlined type inlined)
+  (let ((element-type (second (type-expand-to 'glist type))))
+    (ecase ref
+      ((:read :peek)
+       #'(lambda (location &optional (offset 0))
+          (unless (null-pointer-p (ref-pointer location offset))
+            (map-glist 'list #'identity (ref-pointer location offset) element-type ref))))
+      (:get
+       #'(lambda (location &optional (offset 0))
+          (unless (null-pointer-p (ref-pointer location offset))
+            (prog1
+                (map-glist 'list #'identity (ref-pointer location offset) element-type :get)
+              (glist-free (ref-pointer location offset))
+              (setf (ref-pointer location offset) (make-pointer 0)))))))))
+
+(define-type-method destroy-function ((type glist) &key temp inlined)
+  (assert-not-inlined type inlined)
+  (let ((element-type (second (type-expand-to 'glist type))))

     #'(lambda (location &optional (offset 0))
     #'(lambda (location &optional (offset 0))

-       (unless (null-pointer-p (sap-ref-sap location offset))
-         (map-glist 'list #'identity (sap-ref-sap location offset) element-type)))))
-
-(defmethod destroy-function ((type (eql 'glist)) &rest args)
-  (declare (ignore type))
-  (destructuring-bind (element-type) args
-    #'(lambda (location &optional (offset 0))
-       (unless (null-pointer-p (sap-ref-sap location offset))
-         (destroy-glist (sap-ref-sap location offset) element-type)
-         (setf (sap-ref-sap location offset) (make-pointer 0))))))
-
+       (unless (null-pointer-p (ref-pointer location offset))
+         (destroy-glist (ref-pointer location offset) element-type temp)
+         (setf (ref-pointer location offset) (make-pointer 0))))))
+
+(define-type-method copy-function ((type glist) &key inlined)
+  (assert-not-inlined type inlined)
+  (destructuring-bind (element-type) (rest (type-expand-to 'glist type))
+    (let ((copy-element (copy-function element-type)))
+      #'(lambda (from to &optional (offset 0))
+         (unless (null-pointer-p (ref-pointer from offset))
+           (loop
+            as from-list = (ref-pointer from offset) 
+                           then (glist-next from-list)
+            as to-list = (setf (ref-pointer to offset) (%glist-append nil)) 
+                         then (%glist-append to-list)
+            do (funcall copy-element from-list to-list)
+            while (glist-next from-lisT)))))))

 
 
 ;;;; Single linked list (GSList)
 
 
 
 ;;;; Single linked list (GSList)
 

-(deftype gslist (type) `(or (null (cons ,type list))))
+(deftype gslist (type) `(or null (cons ,type list)))

 
 (defbinding (%gslist-prepend "g_slist_prepend") () pointer
   (gslist pointer)
   (nil null))
 
 
 (defbinding (%gslist-prepend "g_slist_prepend") () pointer
   (gslist pointer)
   (nil null))
 

-(defun make-gslist (type list)
-  (loop
-   with writer = (writer-function type)
-   for element in (reverse list)
-   as gslist = (%gslist-prepend (or gslist (make-pointer 0)))
-   do (funcall writer element gslist)
-   finally (return gslist)))
+(defbinding (%gslist-append "g_slist_append") () pointer
+  (glist (or null pointer))
+  (nil null))
+
+
+(defun make-gslist (element-type list &optional temp-p)
+  (let ((writer (if (functionp element-type)
+                   element-type
+                 (writer-function element-type :temp temp-p))))
+    (loop
+     for element in (reverse list)
+     as gslist = (%gslist-prepend (make-pointer 0)) then (%gslist-prepend gslist)
+     do (funcall writer element gslist)
+     finally (return gslist))))

 
 (defbinding (gslist-free "g_slist_free") () nil
   (gslist pointer))
 
 
 (defbinding (gslist-free "g_slist_free") () nil
   (gslist pointer))
 

-(defun destroy-gslist (gslist element-type)
+(defun destroy-gslist (gslist element-type &optional temp-p)

   (loop
   (loop

-   with destroy = (destroy-function element-type)
-   as tmp = gslist then (glist-next tmp)
-   until (null-pointer-p tmp)
-   do (funcall destroy tmp 0))
+   with destroy = (destroy-function element-type :temp temp-p)
+   as element = gslist then (glist-next element)
+   until (null-pointer-p element)
+   do (funcall destroy element 0))

   (gslist-free gslist))
 
   (gslist-free gslist))
 

-(defmethod alien-type ((type (eql 'gslist)) &rest args)
-  (declare (ignore type args))
-  (alien-type 'pointer))
-
-(defmethod size-of ((type (eql 'gslist)) &rest args)
-  (declare (ignore type args))
-  (size-of 'pointer))
-
-(defmethod to-alien-form (list (type (eql 'gslist)) &rest args)
-  (declare (ignore type))
-  (destructuring-bind (element-type) args    
-    `(make-sglist ',element-type ,list)))
-
-(defmethod to-alien-function ((type (eql 'gslist)) &rest args)
-  (declare (ignore type))
-  (destructuring-bind (element-type) args    
-    #'(lambda (list)
-       (make-gslist element-type list))))
-
-(defmethod from-alien-form (gslist (type (eql 'gslist)) &rest args)
-  (declare (ignore type))
-  (destructuring-bind (element-type) args
-    `(let ((gslist ,gslist))
-      (unwind-protect
-          (map-glist 'list #'identity gslist ',element-type)
-       (destroy-gslist gslist ',element-type)))))
-
-(defmethod from-alien-function ((type (eql 'gslist)) &rest args)
-  (declare (ignore type))
-  (destructuring-bind (element-type) args
-    #'(lambda (gslist)
-       (unwind-protect
-            (map-glist 'list #'identity gslist element-type)
-         (destroy-gslist gslist element-type)))))
-
-(defmethod copy-from-alien-form (gslist (type (eql 'gslist)) &rest args)
-  (declare (ignore type))
-  (destructuring-bind (element-type) args
-    `(map-glist 'list #'identity ,gslist ',element-type)))
-
-(defmethod copy-from-alien-function ((type (eql 'gslist)) &rest args)
-  (declare (ignore type))
-  (destructuring-bind (element-type) args
-    #'(lambda (gslist)
-       (map-glist 'list #'identity gslist element-type))))
-
-(defmethod cleanup-form (gslist (type (eql 'gslist)) &rest args)
-  (declare (ignore type))
-  (destructuring-bind (element-type) args
-    `(destroy-gslist ,gslist ',element-type)))
-
-(defmethod cleanup-function ((type (eql 'gslist)) &rest args)
-  (declare (ignore type))
-  (destructuring-bind (element-type) args
-    #'(lambda (gslist)
-       (destroy-gslist gslist element-type))))
-
-(defmethod writer-function ((type (eql 'gslist)) &rest args)
-  (declare (ignore type))
-  (destructuring-bind (element-type) args
-    #'(lambda (list location &optional (offset 0))
-       (setf 
-        (sap-ref-sap location offset)
-        (make-gslist element-type list)))))
-
-(defmethod reader-function ((type (eql 'gslist)) &rest args)
-  (declare (ignore type))
-  (destructuring-bind (element-type) args
-    #'(lambda (location &optional (offset 0))
-       (unless (null-pointer-p (sap-ref-sap location offset))
-         (map-glist 'list #'identity (sap-ref-sap location offset) element-type)))))
-
-(defmethod destroy-function ((type (eql 'gslist)) &rest args)
-  (declare (ignore type))
-  (destructuring-bind (element-type) args
-    #'(lambda (location &optional (offset 0))
-       (unless (null-pointer-p (sap-ref-sap location offset))
-         (destroy-gslist (sap-ref-sap location offset) element-type)
-         (setf (sap-ref-sap location offset) (make-pointer 0))))))
-
-
-;;; Vector
-
-(defun make-c-vector (type length &optional content location)
-  (let* ((size-of-type (size-of type))
-        (location (or location (allocate-memory (* size-of-type length))))
-        (writer (writer-function type)))
-    (etypecase content
-      (vector
-       (loop
-       for element across content
-       for i from 0 below length
-       as offset = 0 then (+ offset size-of-type)
-       do (funcall writer element location offset)))
-      (list
-       (loop
-       for element in content
-       for i from 0 below length
-       as offset = 0 then (+ offset size-of-type)
-       do (funcall writer element location offset))))
-    location))
-
-
-(defun map-c-vector (seqtype function location element-type length)
-  (let ((reader (reader-function element-type))
-       (size-of-element (size-of element-type)))
-    (case seqtype 
-     ((nil)
-      (loop
-       for i from 0 below length
-       as offset = 0 then (+ offset size-of-element)
-       do (funcall function (funcall reader location offset))))
-     (list
-      (loop
-       for i from 0 below length
-       as offset = 0 then (+ offset size-of-element)
-       collect (funcall function (funcall reader location offset))))
-     (t
-      (loop
-       with sequence = (make-sequence seqtype length)
-       for i from 0 below length
-       as offset = 0 then (+ offset size-of-element)
-       do (setf 
-          (elt sequence i)
-          (funcall function (funcall reader location offset)))
-       finally (return sequence))))))
-
-
-(defun destroy-c-vector (location element-type length)
-  (loop
-   with destroy = (destroy-function element-type)
-   with element-size = (size-of element-type)
-   for i from 0 below length
-   as offset = 0 then (+ offset element-size)
-   do (funcall destroy location offset))
-  (deallocate-memory location))
-
-
-(defmethod alien-type ((type (eql 'vector)) &rest args)
-  (declare (ignore type args))
-  (alien-type 'pointer))
-
-(defmethod size-of ((type (eql 'vector)) &rest args)
-  (declare (ignore type args))
-  (size-of 'pointer))
-
-(defmethod to-alien-form (vector (type (eql 'vector)) &rest args)
-  (declare (ignore type))
-  (destructuring-bind (element-type &optional (length '*)) args
-    (if (eq length '*)
-       `(let* ((vector ,vector)
-               (location (sap+
-                          (allocate-memory (+ ,+size-of-int+ 
-                                              (* ,(size-of element-type) 
-                                                 (length vector))))
-                          ,+size-of-int+)))
-         (make-c-vector ',element-type (length vector) vector location)
-         (setf (sap-ref-32 location ,(- +size-of-int+)) (length vector))
-         location)       
-      `(make-c-vector ',element-type ,length ,vector))))
-
-(defmethod from-alien-form (c-vector (type (eql 'vector)) &rest args)
-  (declare (ignore type))
-  (destructuring-bind (element-type &optional (length '*)) args
-    (if (eq length '*)
-       (error "Can't use vector of variable size as return type")
-      `(let ((c-vector ,c-vector))
-       (prog1
-           (map-c-vector 'vector #'identity c-vector ',element-type ,length)
-         (destroy-c-vector c-vector ',element-type ,length))))))
-
-(defmethod copy-from-alien-form (c-vector (type (eql 'vector)) &rest args)
-  (declare (ignore type))
-  (destructuring-bind (element-type &optional (length '*)) args
-    (if (eq length '*)
-       (error "Can't use vector of variable size as return type")
-      `(map-c-vector 'vector #'identity ,c-vector ',element-type ,length))))
-
-(defmethod copy-from-alien-function ((type (eql 'vector)) &rest args)
-  (declare (ignore type))
-  (destructuring-bind (element-type &optional (length '*)) args
-    (if (eq length '*)
-       (error "Can't use vector of variable size as return type")
-      #'(lambda (c-vector)
-         (map-c-vector 'vector #'identity c-vector element-type length)))))
-
-(defmethod cleanup-form (location (type (eql 'vector)) &rest args)
-  (declare (ignore type))
-  (destructuring-bind (element-type &optional (length '*)) args
-    `(let* ((location ,location)
-           (length ,(if (eq length '*)
-                        `(sap-ref-32 location ,(- +size-of-int+))
-                        length)))
-      (loop
-       with destroy = (destroy-function ',element-type)
-       for i from 0 below length
-       as offset = 0 then (+ offset ,(size-of element-type))
-       do (funcall destroy location offset))
-      (deallocate-memory ,(if (eq length '*) 
-                             `(sap+ location  ,(- +size-of-int+))
-                           'location)))))
-
-(defmethod writer-function ((type (eql 'vector)) &rest args)
-  (declare (ignore type))
-  (destructuring-bind (element-type &optional (length '*)) args
-    #'(lambda (vector location &optional (offset 0))
-       (setf 
-        (sap-ref-sap location offset)
-        (make-c-vector element-type length vector)))))
-
-(defmethod reader-function ((type (eql 'vector)) &rest args)
-  (declare (ignore type))
-  (destructuring-bind (element-type &optional (length '*)) args
-    (if (eq length '*)
-       (error "Can't create reader function for vector of variable size")
-      #'(lambda (location &optional (offset 0))
-         (unless (null-pointer-p (sap-ref-sap location offset))
-           (map-c-vector 'vector #'identity (sap-ref-sap location offset) 
-            element-type length))))))
-
-(defmethod destroy-function ((type (eql 'vector)) &rest args)
-  (declare (ignore type))
-  (destructuring-bind (element-type &optional (length '*)) args
-    (if (eq length '*)
-       (error "Can't create destroy function for vector of variable size")
-      #'(lambda (location &optional (offset 0))
-         (unless (null-pointer-p (sap-ref-sap location offset))
-           (destroy-c-vector 
-            (sap-ref-sap location offset) element-type length)
-           (setf (sap-ref-sap location offset) (make-pointer 0)))))))
-
-
-;;;; Null terminated vector
-
-(defun make-0-vector (type content &optional location)
-  (let* ((size-of-type (size-of type))
-        (location (or 
-                   location 
-                   (allocate-memory (* size-of-type (1+ (length content))))))
-        (writer (writer-function type)))
-    (etypecase content
-      (vector
-       (loop
-       for element across content
-       as offset = 0 then (+ offset size-of-type)
-       do (funcall writer element location offset)
-       finally (setf (sap-ref-sap location offset) (make-pointer 0))))
-      (list
-       (loop
-       for element in content
-       as offset = 0 then (+ offset size-of-type)
-       do (funcall writer element location offset)
-       finally (setf (sap-ref-sap location (+ offset size-of-type)) (make-pointer 0)))))
-    location))
-
-
-(defun map-0-vector (seqtype function location element-type)
-  (let ((reader (reader-function element-type))
-       (size-of-element (size-of element-type)))
-    (case seqtype 
-     ((nil)
-      (loop
-       as offset = 0 then (+ offset size-of-element)
-       until (null-pointer-p (sap-ref-sap location offset))
-       do (funcall function (funcall reader location offset))))
-     (list
-      (loop
-       as offset = 0 then (+ offset size-of-element)
-       until (null-pointer-p (sap-ref-sap location offset))
-       collect (funcall function (funcall reader location offset))))
-     (t
-      (coerce 
-       (loop
-       as offset = 0 then (+ offset size-of-element)
-       until (null-pointer-p (sap-ref-sap location offset))
-       collect (funcall function (funcall reader location offset)))
-       seqtype)))))
-
-
-(defun destroy-0-vector (location element-type)
-  (loop
-   with destroy = (destroy-function element-type)
-   with element-size = (size-of element-type)
-   as offset = 0 then (+ offset element-size)
-   until (null-pointer-p (sap-ref-sap location offset))
-   do (funcall destroy location offset))
-  (deallocate-memory location))
-
-(deftype null-terminated-vector (element-type) `(vector ,element-type))
-
-(defmethod alien-type ((type (eql 'null-terminated-vector)) &rest args)
-  (declare (ignore type args))
-  (alien-type 'pointer))
-
-(defmethod size-of ((type (eql 'null-terminated-vector)) &rest args)
-  (declare (ignore type args))
-  (size-of 'pointer))
-
-(defmethod to-alien-form (vector (type (eql 'null-terminated-vector)) &rest args)
+(define-type-method alien-type ((type gslist))

   (declare (ignore type))
   (declare (ignore type))

-  (destructuring-bind (element-type) args
-    `(make-0-vector ',element-type ,vector)))
-
-(defmethod from-alien-form (c-vector (type (eql 'null-terminated-vector)) &rest args)
-  (declare (ignore type))
-  (destructuring-bind (element-type) args
-    `(let ((c-vector ,c-vector))
-       (prog1
-          (map-0-vector 'vector #'identity c-vector ',element-type)
-        (destroy-0-vector c-vector ',element-type)))))
-
-(defmethod copy-from-alien-form (c-vector (type (eql 'null-terminated-vector)) &rest args)
-  (declare (ignore type))
-  (destructuring-bind (element-type) args
-    `(map-0-vector 'vector #'identity ,c-vector ',element-type)))
-
-(defmethod cleanup-form (location (type (eql 'null-terminated-vector)) &rest args)
-  (declare (ignore type))
-  (destructuring-bind (element-type) args
-    `(destroy-0-vector ,location ',element-type)))
-
-(defmethod writer-function ((type (eql 'null-terminated-vector)) &rest args)
-  (declare (ignore type))
-  (destructuring-bind (element-type) args
-    (unless (eq (alien-type element-type) (alien-type 'pointer))
-      (error "Elements in null-terminated vectors need to be of pointer types"))
-    #'(lambda (vector location &optional (offset 0))
-       (setf 
-        (sap-ref-sap location offset)
-        (make-0-vector element-type vector)))))
-
-(defmethod reader-function ((type (eql 'null-terminated-vector)) &rest args)
-  (declare (ignore type))
-  (destructuring-bind (element-type) args
-    (unless (eq (alien-type element-type) (alien-type 'pointer))
-      (error "Elements in null-terminated vectors need to be of pointer types"))
-    #'(lambda (location &optional (offset 0))
-       (unless (null-pointer-p (sap-ref-sap location offset))
-         (map-0-vector 'vector #'identity (sap-ref-sap location offset) 
-          element-type)))))
-
-(defmethod destroy-function ((type (eql 'null-terminated-vector)) &rest args)
-  (declare (ignore type))
-  (destructuring-bind (element-type) args
-    (unless (eq (alien-type element-type) (alien-type 'pointer))
-      (error "Elements in null-terminated vectors need to be of pointer types"))
-    #'(lambda (location &optional (offset 0))
-         (unless (null-pointer-p (sap-ref-sap location offset))
-           (destroy-0-vector 
-            (sap-ref-sap location offset) element-type)
-           (setf (sap-ref-sap location offset) (make-pointer 0))))))
-
-(defmethod unbound-value ((type (eql 'null-terminated-vector)) &rest args)
-  (declare (ignore type args))
-  (values t nil))
-
-
-;;; Counted vector
-
-(defun make-counted-vector (type content)
-  (let* ((size-of-type (size-of type))
-        (length (length content))
-        (location 
-         (allocate-memory (+ +size-of-int+ (* size-of-type length)))))
-    (setf (sap-ref-32 location 0) length)
-    (make-c-vector type length content (sap+ location +size-of-int+))))
-
-(defun map-counted-vector (seqtype function location element-type)
-  (let ((length (sap-ref-32 location 0)))
-    (map-c-vector 
-     seqtype function (sap+ location +size-of-int+)
-     element-type length)))
-
-(defun destroy-counted-vector (location element-type)
-  (loop
-   with destroy = (destroy-function element-type)
-   with element-size = (size-of element-type)
-   for i from 0 below (sap-ref-32 location 0)
-   as offset = +size-of-int+ then (+ offset element-size)
-   do (funcall destroy location offset))
-  (deallocate-memory location))
-
-
-(deftype counted-vector (element-type) `(vector ,element-type))
-
-(defmethod alien-type ((type (eql 'counted-vector)) &rest args)
-  (declare (ignore type args))

   (alien-type 'pointer))
 
   (alien-type 'pointer))
 

-(defmethod size-of ((type (eql 'counted-vector)) &rest args)
-  (declare (ignore type args))
+(define-type-method size-of ((type gslist) &key inlined)
+  (assert-not-inlined type inlined)

   (size-of 'pointer))
 
   (size-of 'pointer))
 

-(defmethod to-alien-form (vector (type (eql 'counted-vector)) &rest args)
-  (declare (ignore type))
-  (destructuring-bind (element-type) args
-    `(make-counted-vector ',element-type ,vector)))
-
-(defmethod from-alien-form (c-vector (type (eql 'counted-vector)) &rest args)
-  (declare (ignore type))
-  (destructuring-bind (element-type) args
-    `(let ((c-vector ,c-vector))
-       (prog1
-          (map-counted-vector 'vector #'identity c-vector ',element-type)
-        (destroy-counted-vector c-vector ',element-type)))))
-
-(defmethod copy-from-alien-form (c-vector (type (eql 'counted-vector)) &rest args)
-  (declare (ignore type))
-  (destructuring-bind (element-type) args
-    `(map-counted-vector 'vector #'identity ,c-vector ',element-type)))
-
-(defmethod copy-from-alien-function ((type (eql 'counted-vector)) &rest args)
-  (declare (ignore type))
-  (destructuring-bind (element-type) args
-    #'(lambda (c-vector)
-       (map-counted-vector 'vector #'identity c-vector element-type))))
+(define-type-method type-alignment ((type gslist) &key inlined)
+  (assert-not-inlined type inlined)
+  (type-alignment 'pointer))

 
 

-(defmethod cleanup-form (location (type (eql 'counted-vector)) &rest args)
-  (declare (ignore type))
-  (destructuring-bind (element-type) args
-    `(destroy-counted-vector ,location ',element-type)))
-
-(defmethod writer-function ((type (eql 'counted-vector)) &rest args)
-  (declare (ignore type))
-  (destructuring-bind (element-type) args
-    #'(lambda (vector location &optional (offset 0))
-       (setf 
-        (sap-ref-sap location offset)
-        (make-counted-vector element-type vector)))))
-
-(defmethod reader-function ((type (eql 'counted-vector)) &rest args)
-  (declare (ignore type))
-  (destructuring-bind (element-type) args
-    #'(lambda (location &optional (offset 0))
-       (unless (null-pointer-p (sap-ref-sap location offset))
-         (map-counted-vector 'vector #'identity 
-          (sap-ref-sap location offset) element-type)))))
-
-(defmethod destroy-function ((type (eql 'counted-vector)) &rest args)
-  (declare (ignore type))
-  (destructuring-bind (element-type) args
+(define-type-method alien-arg-wrapper ((type gslist) var list style form &optional copy-in-p)
+  (destructuring-bind (element-type) (rest (type-expand-to 'gslist type))
+    (cond
+      ((and (in-arg-p style) (not (out-arg-p style)))
+       `(with-pointer (,var (make-gslist ',element-type ,list ,(not copy-in-p)))
+         (unwind-protect
+             ,form
+           ,(unless copy-in-p
+              `(destroy-gslist ,var ',element-type t)))))
+      ((and (in-arg-p style) (out-arg-p style))
+       (let ((gslist (make-symbol "GSLIST")))
+        `(with-pointer (,gslist (make-gslist ',element-type ,list ,(not copy-in-p)))
+            (with-pointer (,var ,gslist)                     
+             (unwind-protect
+                 ,form
+               ,(unless copy-in-p
+                  `(destroy-gslist ,gslist ',element-type t)))))))
+      ((and (out-arg-p style) (not (in-arg-p style)))
+       `(with-pointer (,var)
+         ,form)))))
+
+(define-type-method to-alien-form ((type gslist) list &optional copy-p)
+  (declare (ignore copy-p))
+  (destructuring-bind (element-type) (rest (type-expand-to 'gslist type))
+    `(make-gslist ',element-type ,list)))
+
+(define-type-method to-alien-function ((type gslist) &optional copy-p)
+  (destructuring-bind (element-type) (rest (type-expand-to 'gslist type))
+    (values
+     #'(lambda (list)
+        (make-gslist element-type list (not copy-p)))
+     (unless copy-p
+       #'(lambda (list gslist)
+          (declare (ignore list))
+          (destroy-gslist gslist element-type t))))))
+
+(define-type-method from-alien-form ((type gslist) form &key (ref :free))
+  (destructuring-bind (element-type) (rest (type-expand-to 'gslist type))
+    `(let ((gslist ,form))
+       (unwind-protect
+          (map-glist 'list #'identity gslist ',element-type
+           ,(ecase ref (:free :get) ((:static :temp) :peek) (:copy :read)))
+        ,(when (eq ref :free)
+           `(destroy-gslist gslist ',element-type))))))
+
+(define-type-method from-alien-function ((type gslist)  &key (ref :free))
+  (destructuring-bind (element-type) (rest (type-expand-to 'gslist type))
+    (ecase ref
+      (:free 
+       #'(lambda (glist)
+          (prog1
+              (map-glist 'list #'identity glist element-type :get)
+            (gslist-free glist))))
+      (:copy
+       #'(lambda (glist)
+          (map-glist 'list #'identity glist element-type :read)))
+      ((:static :temp)
+       #'(lambda (glist)
+          (map-glist 'list #'identity glist element-type :peek))))))
+
+(define-type-method writer-function ((type gslist) &key temp inlined)
+  (assert-not-inlined type inlined)
+  (destructuring-bind (element-type) (rest (type-expand-to 'gslist type))
+    (let ((element-writer (writer-function element-type :temp temp)))
+      #'(lambda (list location &optional (offset 0))
+         (setf 
+          (ref-pointer location offset)
+          (make-gslist element-writer list))))))
+
+(define-type-method reader-function ((type gslist) &key (ref :read) inlined)
+  (assert-not-inlined type inlined)
+  (let ((element-type (second (type-expand-to 'gslist type))))
+    (ecase ref
+      ((:read :peek)
+       #'(lambda (location &optional (offset 0))
+          (unless (null-pointer-p (ref-pointer location offset))
+            (map-glist 'list #'identity (ref-pointer location offset) element-type ref))))
+      (:get
+       #'(lambda (location &optional (offset 0))
+          (unless (null-pointer-p (ref-pointer location offset))
+            (prog1
+                (map-glist 'list #'identity (ref-pointer location offset) element-type :get)
+              (gslist-free (ref-pointer location offset))
+              (setf (ref-pointer location offset) (make-pointer 0)))))))))
+
+(define-type-method destroy-function ((type gslist) &key temp inlined)
+  (assert-not-inlined type inlined)
+  (let ((element-type (second (type-expand-to 'gslist type))))

     #'(lambda (location &optional (offset 0))
     #'(lambda (location &optional (offset 0))

-       (unless (null-pointer-p (sap-ref-sap location offset))
-         (destroy-counted-vector 
-          (sap-ref-sap location offset) element-type)
-         (setf (sap-ref-sap location offset) (make-pointer 0))))))
+       (unless (null-pointer-p (ref-pointer location offset))
+         (destroy-gslist (ref-pointer location offset) element-type temp)
+         (setf (ref-pointer location offset) (make-pointer 0))))))
+
+(define-type-method copy-function ((type gslist) &key inlined)
+  (assert-not-inlined type inlined)
+  (destructuring-bind (element-type) (rest (type-expand-to 'gslist type))
+    (let ((copy-element (copy-function element-type)))
+      #'(lambda (from to &optional (offset 0))
+         (unless (null-pointer-p (ref-pointer from offset))
+           (loop
+            as from-list = (ref-pointer from offset) 
+                           then (glist-next from-list)
+            as to-list = (setf (ref-pointer to offset) (%gslist-append nil)) 
+                         then (%gslist-append to-list)
+            do (funcall copy-element from-list to-list)
+            while (glist-next from-list)))))))