Attachment 155796 Details for Bug 241751 – Additional refcounting for ts/db

[patch] Additional refcounting for ts/db

rpm-python-mi-refcount.patch (text/plain), 2.10 KB, created by Panu Matilainen on 2007-05-31 11:48:52 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Panu Matilainen

Created: 2007-05-31 11:48:52 UTC

Size: 2.10 KB

patch

obsolete

>diff -r 8a1bbb5918b9 python/rpmdb-py.c
>--- a/python/rpmdb-py.c	Tue May 29 13:43:06 2007 +0300
>+++ b/python/rpmdb-py.c	Thu May 31 14:37:21 2007 +0300
>@@ -126,7 +126,7 @@ rpmdb_Match (rpmdbObject * s, PyObject *
> 	return NULL;
>     }
> 
>-    return rpmmi_Wrap( rpmdbInitIterator(s->db, tag, key, len) );
>+    return rpmmi_Wrap( rpmdbInitIterator(s->db, tag, key, len), (PyObject *)s);
> }
> 
> /**
>diff -r 8a1bbb5918b9 python/rpmmi-py.c
>--- a/python/rpmmi-py.c	Tue May 29 13:43:06 2007 +0300
>+++ b/python/rpmmi-py.c	Thu May 31 14:35:40 2007 +0300
>@@ -199,6 +199,7 @@ static void rpmmi_dealloc(/*@only@*/ /*@
> {
>     if (s) {
> 	s->mi = rpmdbFreeIterator(s->mi);
>+	Py_DECREF(s->ref);
> 	PyObject_Del(s);
>     }
> }
>@@ -271,7 +272,7 @@ PyTypeObject rpmmi_Type = {
> };
> /*@=fullinitblock@*/
> 
>-rpmmiObject * rpmmi_Wrap(rpmdbMatchIterator mi)
>+rpmmiObject * rpmmi_Wrap(rpmdbMatchIterator mi, PyObject *s)
> {
>     rpmmiObject * mio = (rpmmiObject *) PyObject_New(rpmmiObject, &rpmmi_Type);
> 
>@@ -280,6 +281,8 @@ rpmmiObject * rpmmi_Wrap(rpmdbMatchItera
>         return NULL;
>     }
>     mio->mi = mi;
>+    mio->ref = s;
>+    Py_INCREF(mio->ref);
>     return mio;
> }
> 
>diff -r 8a1bbb5918b9 python/rpmmi-py.h
>--- a/python/rpmmi-py.h	Tue May 29 13:43:06 2007 +0300
>+++ b/python/rpmmi-py.h	Thu May 31 14:35:40 2007 +0300
>@@ -14,6 +14,7 @@ struct rpmmiObject_s {
> struct rpmmiObject_s {
>     PyObject_HEAD
>     PyObject *md_dict;		/*!< to look like PyModuleObject */
>+    PyObject *ref;		/* for db/ts refcounting */
>     rpmdbMatchIterator mi;
> } ;
> 
>@@ -21,7 +22,7 @@ extern PyTypeObject rpmmi_Type;
> extern PyTypeObject rpmmi_Type;
> 
> /*@null@*/
>-rpmmiObject * rpmmi_Wrap(rpmdbMatchIterator mi)
>+rpmmiObject * rpmmi_Wrap(rpmdbMatchIterator mi, PyObject *s)
> 	/*@*/;
> 
> #endif
>diff -r 8a1bbb5918b9 python/rpmts-py.c
>--- a/python/rpmts-py.c	Tue May 29 13:43:06 2007 +0300
>+++ b/python/rpmts-py.c	Thu May 31 14:36:34 2007 +0300
>@@ -1397,7 +1397,7 @@ fprintf(stderr, "*** rpmts_Match(%p) ts 
> 	}
>     }
> 
>-    return rpmmi_Wrap( rpmtsInitIterator(s->ts, tag, key, len) );
>+    return rpmmi_Wrap( rpmtsInitIterator(s->ts, tag, key, len), (PyObject*)s);
> }
> 
> /** \ingroup py_c

Actions: View | Diff

Attachments on bug 241751: 155796