FOREIGN

[clg] / glib / gobject.lisp

diff --git a/glib/gobject.lisp b/glib/gobject.lisp
index 0b01d2e5d66ba3a2a50d1b7ffd12ed245e01bef3..bd0151fda9d4db50585e5373ee1d6a7c35866c68 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.41 2006-02-03 12:44:32 espen Exp $
+;; $Id: gobject.lisp,v 1.45 2006-02-08 22:10:47 espen Exp $
 
 (in-package "GLIB")
 
@@ -28,6 +28,7 @@ (in-package "GLIB")
 ;;;; Metaclass used for subclasses of gobject
 
 (eval-when (:compile-toplevel :load-toplevel :execute)
+;;   (push :debug-ref-counting *features*)
   (defclass gobject-class (ginstance-class)
     ((instance-slots-p :initform nil
       :documentation "Non NIL if the class has slots with instance allocation")))
@@ -64,6 +65,10 @@ (defbinding %object-unref () nil
 #+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)))
@@ -199,10 +204,18 @@ (defmethod shared-initialize :after ((class gobject-class) names &rest initargs)
 
 (eval-when (:compile-toplevel :load-toplevel :execute)
   (defclass gobject (ginstance)
-    ()
+    (#+debug-ref-counting
+     (ref-count :allocation :alien :type int :reader ref-count))
     (:metaclass gobject-class)
     (:gtype "GObject")))
 
+#+debug-ref-counting
+(defmethod print-object ((instance gobject) stream)
+  (print-unreadable-object (instance stream :type t :identity nil)
+    (if (proxy-valid-p instance)
+       (format stream "at 0x~X (~D)" (sap-int (foreign-location instance)) (ref-count instance))
+      (write-string "at \"unbound\"" stream))))
+
 
 (defun initial-add (object function initargs key pkey)
   (loop 
@@ -220,10 +233,16 @@ (defun initial-apply-add (object function initargs key pkey)
               initargs key pkey))
 
 
+(defmethod make-proxy-instance ((class gobject-class) location &rest initargs)
+  (declare (ignore location initargs))
+  (if (slot-value class 'instance-slots-p)
+      (error "An object of class ~A has instance slots and should only be created with MAKE-INSTANCE" class)
+    (call-next-method)))
+
 (defmethod initialize-instance :around ((object gobject) &rest initargs)
   (declare (ignore initargs))
   (call-next-method)
-  #+debug-ref-counting(%object-weak-ref (proxy-location object))
+  #+debug-ref-counting(%object-weak-ref (foreign-location object))
   #+glib2.8
   (when (slot-value (class-of object) 'instance-slots-p)
     (with-slots (location) object
@@ -232,7 +251,7 @@ (defmethod initialize-instance :around ((object gobject) &rest initargs)
 
 
 (defmethod initialize-instance ((object gobject) &rest initargs)
-  (unless (slot-boundp object 'location)
+  (unless (proxy-valid-p object)
     ;; Extract initargs which we should pass directly to the GObject
     ;; constructor
     (let* ((slotds (class-slots (class-of object)))
@@ -265,7 +284,7 @@ (defmethod initialize-instance ((object gobject) &rest initargs)
             (gvalue-init (sap+ tmp string-size) type value))
            (unwind-protect
                (setf  
-                (slot-value object 'location) 
+                (foreign-location object)
                 (%gobject-newv (type-number-of object) (length args) params))
              (loop
               repeat (length args)
@@ -274,14 +293,14 @@ (defmethod initialize-instance ((object gobject) &rest initargs)
               (gvalue-unset (sap+ tmp string-size)))
              (deallocate-memory params)))
        (setf  
-        (slot-value object 'location) 
+        (foreign-location object)
         (%gobject-new (type-number-of object))))))
 
   (apply #'call-next-method object 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 ()
@@ -526,7 +545,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))))