From: espen <espen>
Date: Mon, 6 Feb 2006 11:56:22 +0000 (+0000)
Subject: Proxies for non reference counted foreign objects passed as arguments to signal handl... 
X-Git-Tag: clg-0-92~88
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/clg/commitdiff_plain/ad112f2033a5bfe2f87ef61ad1e2e7a0929a8e32?hp=253c13397ee32afd6dcda1ddb9b5e601b7c27d06

Proxies for non reference counted foreign objects passed as arguments to signal handlers are invalidated when the handlers are exiting
---

diff --git a/glib/gcallback.lisp b/glib/gcallback.lisp
index cf0b9ea..d68483b 100644
--- a/glib/gcallback.lisp
+++ b/glib/gcallback.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: gcallback.lisp,v 1.26 2006/02/01 14:18:49 espen Exp $
+;; $Id: gcallback.lisp,v 1.27 2006/02/06 11:56:22 espen Exp $
 
 (in-package "GLIB")
 
@@ -58,10 +58,17 @@ (defun callback-trampoline (callback-id n-params param-values &optional
 			(gvalue-type return-value)))
 	 (args (loop
 		for n from 0 below n-params
-		collect (gvalue-get (sap+ param-values (* n +gvalue-size+))))))
-    (let ((result (apply #'invoke-callback callback-id return-type args)))
-      (when return-type
-	(gvalue-set return-value result)))))
+		for offset from 0 by +gvalue-size+
+		collect (gvalue-weak-get (sap+ param-values offset)))))
+    (unwind-protect
+	(let ((result (apply #'invoke-callback callback-id return-type args)))
+	  (when return-type
+	    (gvalue-set return-value result)))
+      (loop 
+       for arg in args
+       when (typep arg 'proxy)
+       do (invalidate-instance arg)))))
+
 
 (defun invoke-callback (callback-id return-type &rest args)
   (restart-case
@@ -212,7 +219,7 @@ (defbinding %signal-chain-from-overridden () nil
   (args pointer)
   (return-value (or null gvalue)))
 
-
+;; TODO: implement same semantics as CALL-NEXT-METHOD
 (defun %call-next-handler (n-params types args defaults return-type)
   (let ((params (allocate-memory (* n-params +gvalue-size+))))
     (loop 
diff --git a/glib/gparam.lisp b/glib/gparam.lisp
index 5e63b2b..086d993 100644
--- a/glib/gparam.lisp
+++ b/glib/gparam.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: gparam.lisp,v 1.17 2005/04/23 16:48:51 espen Exp $
+;; $Id: gparam.lisp,v 1.18 2006/02/06 11:56:22 espen Exp $
 
 (in-package "GLIB")
 
@@ -64,10 +64,14 @@ (defun gvalue-free (gvalue &optional (unset-p t))
 (defun gvalue-type (gvalue)
   (type-from-number (sap-ref-32 gvalue 0)))
 
-(defun gvalue-get (gvalue)
+(defun gvalue-get (gvalue)  
   (funcall (reader-function (gvalue-type gvalue))
    gvalue +gvalue-value-offset+))
 
+(defun gvalue-weak-get (gvalue)  
+  (funcall (weak-reader-function (gvalue-type gvalue))
+   gvalue +gvalue-value-offset+))
+
 (defun gvalue-set (gvalue value)
   (funcall (writer-function (gvalue-type gvalue))
    value gvalue +gvalue-value-offset+)