Code clean up and propper computation of foreign object sizes

[clg] / glib / gobject.lisp

diff --git a/glib/gobject.lisp b/glib/gobject.lisp
index 4dd47e7531c6d9be13874b7a6bcb11ddb50d07f0..2cdabd8b2abd60b4d8e48e7bfbd6cef4b3cb45df 100644 (file)
--- a/glib/gobject.lisp
+++ b/glib/gobject.lisp
@@ -20,7 +20,7 @@
 ;; TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 ;; SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-;; $Id: gobject.lisp,v 1.36 2005/04/23 16:48:51 espen Exp $
+;; $Id: gobject.lisp,v 1.42 2006/02/04 12:15:32 espen Exp $
 
 (in-package "GLIB")
 
@@ -29,7 +29,8 @@ (in-package "GLIB")
 
 (eval-when (:compile-toplevel :load-toplevel :execute)
   (defclass gobject-class (ginstance-class)
-    ())
+    ((instance-slots-p :initform nil
+      :documentation "Non NIL if the class has slots with instance allocation")))
 
   (defmethod validate-superclass ((class gobject-class) (super standard-class))
 ;  (subtypep (class-name super) 'gobject)
@@ -60,6 +61,27 @@ (defbinding %object-ref () pointer
 (defbinding %object-unref () nil
   (location pointer))
 
+#+glib2.8
+(progn
+  (defcallback toggle-ref-callback (nil (data pointer) (location pointer) (last-ref-p boolean))
+    #+debug-ref-counting
+    (if last-ref-p
+       (format t "Object at 0x~8,'0X has no foreign references~%" (sap-int location))
+      (format t "Foreign reference added to object at 0x~8,'0X~%" (sap-int location)))
+    (if last-ref-p
+       (cache-instance (find-cached-instance location) t)
+      (cache-instance (find-cached-instance location) nil)))
+
+  (defbinding %object-add-toggle-ref () pointer
+    (location pointer)
+    ((callback toggle-ref-callback) pointer)
+    (nil null))
+
+  (defbinding %object-remove-toggle-ref () pointer
+    (location pointer)
+    ((callback toggle-ref-callback) pointer)
+    (nil null)))
+
 (defmethod reference-foreign ((class gobject-class) location)
   (declare (ignore class))
   (%object-ref location))
@@ -68,6 +90,16 @@ (defmethod unreference-foreign ((class gobject-class) location)
   (declare (ignore class))
   (%object-unref location))
 
+#+debug-ref-counting
+(progn
+  (defcallback weak-ref-callback (nil (data pointer) (location pointer))
+    (format t "Object at 0x~8,'0X being finalized~%" (sap-int location)))
+  
+  (defbinding %object-weak-ref () pointer
+    (location pointer)
+    ((callback weak-ref-callback) pointer)
+    (nil null)))
+
 
 ; (defbinding object-class-install-param () nil
 ;   (class pointer)
@@ -156,6 +188,16 @@ (defmethod initialize-internal-slot-functions ((slotd effective-user-data-slot-d
           (user-data-p object slot-name)))))
   (call-next-method))
 
+(defmethod shared-initialize :after ((class gobject-class) names &rest initargs)
+  (declare (ignore initargs))
+  (when (some #'(lambda (slotd)
+                 (and
+                  (eq (slot-definition-allocation slotd) :instance)
+                  (not (typep slotd 'effective-special-slot-definition))))
+             (class-slots class))
+    (setf (slot-value class 'instance-slots-p) t)))
+
+
 
 ;;;; Super class for all classes in the GObject type hierarchy
 
@@ -182,9 +224,20 @@ (defun initial-apply-add (object function initargs key pkey)
               initargs key pkey))
 
 
+(defmethod initialize-instance :around ((object gobject) &rest initargs)
+  (declare (ignore initargs))
+  (call-next-method)
+  #+debug-ref-counting(%object-weak-ref (foreign-location object))
+  #+glib2.8
+  (when (slot-value (class-of object) 'instance-slots-p)
+    (with-slots (location) object
+      (%object-add-toggle-ref location)
+      (%object-unref location))))
+
+
 (defmethod initialize-instance ((object gobject) &rest initargs)
   (unless (slot-boundp object 'location)
-    ;; Extract initargs which we should pass directly to the GObeject
+    ;; Extract initargs which we should pass directly to the GObject
     ;; constructor
     (let* ((slotds (class-slots (class-of object)))
           (args (when initargs
@@ -232,10 +285,23 @@ (defmethod initialize-instance ((object gobject) &rest initargs)
 
 
 (defmethod instance-finalizer ((instance gobject))
-  (let ((location (proxy-location instance)))
+  (let ((location (foreign-location instance)))
+    #+glib2.8
+    (if (slot-value (class-of instance) 'instance-slots-p)
+       #'(lambda ()
+           #+debug-ref-counting
+           (format t "Finalizing proxy for 0x~8,'0X~%" (sap-int location))
+           (remove-cached-instance location)
+           (%object-remove-toggle-ref location))
+      #'(lambda ()
+         #+debug-ref-counting
+         (format t "Finalizing proxy for 0x~8,'0X~%" (sap-int location))
+         (remove-cached-instance location)
+         (%object-unref location)))
+    #-glib2.8
     #'(lambda ()
        (remove-cached-instance location)
-       (%object-unref location))))
+         (%object-unref location))))
 
 
 (defbinding (%gobject-new "g_object_new") () pointer
@@ -464,7 +530,7 @@ (defmethod from-alien-form (form (type (eql 'referenced)) &rest args)
        (let ((instance (make-symbol "INSTANCE")))
          `(let ((,instance ,(from-alien-form form type)))
             (when ,instance
-              (%object-unref (proxy-location ,instance)))
+              (%object-unref (foreign-location ,instance)))
             ,instance))
       (error "~A is not a subclass of GOBJECT" type))))