Object finalization optimized

diff --git a/glib/gboxed.lisp b/glib/gboxed.lisp
index 41f62431216d2206d661fd7b980b0b3e7b23727a..c2daeb54aaa5ce38a19ffdfe77b7f56ab24ce30e 100644 (file)
--- a/glib/gboxed.lisp
+++ b/glib/gboxed.lisp
@@ -15,7 +15,7 @@
 ;; License along with this library; if not, write to the Free Software
 ;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 ;; License along with this library; if not, write to the Free Software
 ;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 

-;; $Id: gboxed.lisp,v 1.12 2004-11-07 21:41:35 espen Exp $
+;; $Id: gboxed.lisp,v 1.13 2004-11-09 10:10:59 espen Exp $

 
 (in-package "GLIB")
 
 
 (in-package "GLIB")
 


@@ -29,6 +29,13 @@ (defclass boxed (struct)
   ()
   (:metaclass struct-class))
 
   ()
   (:metaclass struct-class))
 

+(defmethod instance-finalizer ((instance boxed))
+  (let ((location (proxy-location instance))
+       (type-number (type-number-of instance)))
+    #'(lambda ()
+       (remove-cached-instance location)
+       (%boxed-free type-number location))))
+

 
 ;;;; Metaclass for boxed classes
 
 
 ;;;; Metaclass for boxed classes
 


@@ -52,19 +59,19 @@ (defmethod shared-initialize ((class boxed-class) names
     (register-type class-name type-number)))
 
 
     (register-type class-name type-number)))
 
 

-(defbinding %boxed-copy (type location) pointer
-  ((find-type-number type) type-number)
+(defbinding %boxed-copy () pointer
+  (type-number type-number)

   (location pointer))
 
   (location pointer))
 

-(defbinding %boxed-free (type location) nil
-  ((find-type-number type) type-number)
+(defbinding %boxed-free () nil
+  (type-number type-number)

   (location pointer))
 
 (defmethod reference-foreign ((class boxed-class) location)
   (location pointer))
 
 (defmethod reference-foreign ((class boxed-class) location)

-  (%boxed-copy (class-name class) location))
+  (%boxed-copy (find-type-number class) location))

 
 (defmethod unreference-foreign ((class boxed-class) location)
 
 (defmethod unreference-foreign ((class boxed-class) location)

-  (%boxed-free (class-name class) location))
+  (%boxed-free (find-type-number class) location))

 
 
 ;;;; 
 
 
 ;;;; 

diff --git a/glib/gobject.lisp b/glib/gobject.lisp
index 4005672676cdf1a0b24029d04b0c7e1927a944d1..f41cb3239df746cc1151a0c384411dec162bef6f 100644 (file)
--- a/glib/gobject.lisp
+++ b/glib/gobject.lisp
@@ -15,7 +15,7 @@
 ;; License along with this library; if not, write to the Free Software
 ;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 ;; License along with this library; if not, write to the Free Software
 ;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 

-;; $Id: gobject.lisp,v 1.19 2004-11-07 15:58:08 espen Exp $
+;; $Id: gobject.lisp,v 1.20 2004-11-09 10:10:59 espen Exp $

 
 (in-package "GLIB")
 
 
 (in-package "GLIB")
 


@@ -205,6 +205,13 @@ (defmethod initialize-instance :around ((object gobject) &rest initargs)
   (call-next-method)
   (%object-weak-ref object))
 
   (call-next-method)
   (%object-weak-ref object))
 

+(defmethod instance-finalizer ((instance gobject))
+  (let ((location (proxy-location instance)))
+    #'(lambda ()
+       (remove-cached-instance location)
+       (%weak-object-unref location)
+       (%object-unref location))))
+

 
 (defcallback weak-notify (nil (data int) (location pointer))
   (let ((object (find-cached-instance location)))
 
 (defcallback weak-notify (nil (data int) (location pointer))
   (let ((object (find-cached-instance location)))


@@ -218,6 +225,12 @@ (defbinding %object-weak-ref (object) nil
   ((callback weak-notify) pointer)
   (0 unsigned-int))
 
   ((callback weak-notify) pointer)
   (0 unsigned-int))
 

+(defbinding %object-weak-unref () nil
+  (location pointer)
+  ((callback weak-notify) pointer)
+  (0 unsigned-int))
+           
+

 (defbinding (%gobject-new "g_object_new") () pointer
   (type type-number)
   (nil null))
 (defbinding (%gobject-new "g_object_new") () pointer
   (type type-number)
   (nil null))

diff --git a/glib/proxy.lisp b/glib/proxy.lisp
index eeecae10dcaad03ed8ec7f5daf18a0303996da00..9058e234056f016d59a0e53adb7c2ea308dba000 100644 (file)
--- a/glib/proxy.lisp
+++ b/glib/proxy.lisp
@@ -15,7 +15,7 @@
 ;; License along with this library; if not, write to the Free Software
 ;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 ;; License along with this library; if not, write to the Free Software
 ;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 

-;; $Id: proxy.lisp,v 1.11 2004-11-06 21:39:58 espen Exp $
+;; $Id: proxy.lisp,v 1.12 2004-11-09 10:10:59 espen Exp $

 
 (in-package "GLIB")
 
 
 (in-package "GLIB")
 


@@ -224,8 +224,7 @@ (defmethod instance-finalizer ((instance proxy))
 ;;     (unless (find-method #'unreference-foreign nil (list (class-of class) t) nil)
 ;;       (error "No matching method for UNREFERENCE-INSTANCE when called with class ~A" class))
     #'(lambda ()
 ;;     (unless (find-method #'unreference-foreign nil (list (class-of class) t) nil)
 ;;       (error "No matching method for UNREFERENCE-INSTANCE when called with class ~A" class))
     #'(lambda ()

-       (when (instance-cached-p location)
-         (remove-cached-instance location))
+       (remove-cached-instance location)

        (unreference-foreign class location))))
 
 
        (unreference-foreign class location))))
 
 


@@ -409,9 +408,10 @@ (defclass struct (proxy)
 
 (defmethod initialize-instance ((struct struct) &rest initargs)
   (declare (ignore initargs))
 
 (defmethod initialize-instance ((struct struct) &rest initargs)
   (declare (ignore initargs))

-  (setf 
-   (slot-value struct 'location)
-   (allocate-memory (proxy-instance-size (class-of struct))))
+  (let ((size (proxy-instance-size (class-of struct))))
+    (if (zerop size)
+       (error "~A has zero size" (class-of struct))
+      (setf (slot-value struct 'location) (allocate-memory size))))

   (call-next-method))
 
 
   (call-next-method))