Author: futatuki
Date: Sun Sep 24 05:06:08 2023
New Revision: 1912500
URL: http://svn.apache.org/viewvc?rev=1912500&view=rev
Log:
swig-py: Use pure Python objects as edit/parse_fns3 and their decendant batons.
Former implementation of the wrappers for svn_delta_editor_t and
svn_repos_parse_fns3_t C APIs had some leakage of Python reference counts:
(1) An edit baton made by delta.make_editor / a parse_fns3 baton made by
repos.make_parse_fns3 hold a reference of editor object / parse_fns3
object and they never release it. (SVN-4916)
(2) Wrapper functions of C APIs which drive *svn_delta_editor_t() and
svn_repos_parse_fns3_t does not release reference of intermediate baton
which are created during processing call back of the API when an error
is occured during proccessing call back of the API. (SVN-4917)
(3) parse_fns3 driver object and parse_baton can make a circular references
through the pool cleanup callback registration which is not visible by
Python interpreter. If parse_fn3 driver and parse_baton object are
allocated from same pool, the python wrapper object of the pool and
its entity pool can't clean up. (SVN-4918)
To void those problems, we use pure Python object as batons and hold
references in an ancestor baton object, which is visible from Python
interpreter. During the API processing, C callback functions borrow the
references from them.
[in subversion/bindings/swig]
* python/libsvn_swig_py/swigutil_py.c
(item_baton): Removed.
(make_baton):
Return an instance of _DecBaton Python class instead of item_baton
C struct.
(unwrap_item_baton, unwrap_item_baton_with_pool): New function.
(close_baton):
- Accept an instance of _ItemBaton instead of item_baton C struct.
- Add argument to determine whether the method require an argument
or not.
(set_target_revision, delete_entry, change_dir_prop, change_file_prop,
close_file, parse_fn3_magic_header_record, parse_fn3_uuid_record,
parse_fn3_set_revision_property, parse_fn3_set_node_property,
parse_fn3_delete_node_property, parse_fn3_remove_node_props,
parse_fn3_set_fulltext)
Accept an instance of _ItemBaton instead of item_baton C struct.
(open_root, add_directory, open_directory, add_file, open_file,
parse_fn3_new_revision_record, parse_fn3_new_node_record)
- Accept an instance of _ItemBaton instead of item_baton C struct.
- Use an instance of _ItemBaton for a child baton.
(close_directory, close_edit, abort_edit, parse_fn3_close_node,
parse_fn3_close_revision, svn_swig_py_parse_fns3_destroy):
Specify whether the specfied method accept baton item argment.
(window_handler):
Accept an instance of _ItemBaton class as a wrapper of handler object,
instead of a bare handler object, to manage the life time of it by
Python interpreter.
(apply_textdelta, parse_fn3_apply_textdelta)
- Accept an instance of _ItemBaton instead of item_baton C struct.
- Use an instance of _ItemBaton for the hander baton.
(svn_swig_py_make_editor):
- Return only editor driver.
- Remove unused editor Python object.
(svn_swig_py_parse_fns3_destroy): Removed.
(svn_swig_py_make_parse_fns3):
- Return only editor driver.
- Remove unused py_parse_fns3 Python object.
- Don't register callback function svn_swig_py_parse_fns3_destroy.
* python/libsvn_swig_py/swigutil_py.h
(svn_swig_py_make_editor, svn_swig_py_make_parse_fns3):
Apply the change of public function signatures in swigutil_py.c
* python/svn/delta.py
(): import Pool from svn.core
(make_editor):
- import _AncBaton from libsvn.delta
- Use an instance of _AncBaton for the edit baton.
* python/svn/repos.py
(make_parse_fns3):
- import _AncBaton from libsvn.delta
- Derive _ParseBaton from _AncBaton for driving _close_dumpstream()
method in parse_fn3 object at instance deletion.
- Use an instance of _ParseBaton for the parse_fns3 baton.
* subversion/bindings/swig/svn_delta.i
(svn_swig_py_make_editor):
Apply the change of public function signatures in swigutil_py.c
(_ItemBaton, _DecBaton, _AncBaton): New classes.
* subversion/bindings/swig/svn_delta.i
(svn_swig_py_make_parse_fns3):
Apply the change of public function signatures in swigutil_py.c
Modified:
subversion/trunk/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c
subversion/trunk/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.h
subversion/trunk/subversion/bindings/swig/python/svn/delta.py
subversion/trunk/subversion/bindings/swig/python/svn/repos.py
subversion/trunk/subversion/bindings/swig/svn_delta.i
subversion/trunk/subversion/bindings/swig/svn_repos.i
Modified:
subversion/trunk/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c?rev=1912500&r1=1912499&r2=1912500&view=diff
==============================================================================
---
subversion/trunk/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c
(original)
+++
subversion/trunk/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c
Sun Sep 24 05:06:08 2023
@@ -1783,44 +1783,97 @@ static svn_error_t *type_conversion_erro
/*** Editor Wrapping ***/
-/* this baton is used for the editor, directory, and file batons. */
-typedef struct item_baton {
- PyObject *editor; /* the editor handling the callbacks */
- PyObject *baton; /* the dir/file baton (or NULL for edit baton) */
- apr_pool_t *pool; /* top-level pool */
-} item_baton;
-
-static item_baton *make_baton(apr_pool_t *pool,
- PyObject *editor,
- PyObject *baton)
-{
- item_baton *newb = apr_palloc(pool, sizeof(*newb));
-
- /* Note: We steal the caller's reference to 'baton'. */
- Py_INCREF(editor);
- newb->editor = editor;
- newb->baton = baton;
- newb->pool = pool;
+static PyObject *
+make_baton(apr_pool_t *pool, PyObject *parent, PyObject *baton)
+{
+ PyObject *newb;
+ newb = PyObject_CallMethod(parent, "make_decendant", "O&O",
+ make_ob_pool, pool, baton);
+ /* We always borrow the reference in ancestor's dict during the C API
+ processing, so that we never leak the reference even the API aborted
+ by some error */
+ Py_XDECREF(newb);
return newb;
}
-static svn_error_t *close_baton(void *baton,
- const char *method)
+/* Get 'editor' and 'baton' from _ItemBaton instance. The caller
+ should be within a Python thread lock. */
+static svn_error_t *
+unwrap_item_baton(PyObject **editor, PyObject **baton, PyObject *item_baton)
{
- item_baton *ib = baton;
+ svn_error_t *err;
+
+ if ((*editor = PyObject_GetAttrString(item_baton, "editor")) == NULL)
+ {
+ err = callback_exception_error();
+ *baton = NULL;
+ goto finished;
+ }
+ if ((*baton = PyObject_GetAttrString(item_baton, "baton")) == NULL)
+ {
+ Py_CLEAR(*editor);
+ err = callback_exception_error();
+ goto finished;
+ }
+ err = SVN_NO_ERROR;
+ finished:
+ Py_XDECREF(*editor);
+ Py_XDECREF(*baton);
+ return err;
+}
+
+/* Get 'editor', 'baton', 'pool' from _ItemBaton instance. The caller
+ should be within a Python thread lock. */
+static svn_error_t *
+unwrap_item_baton_with_pool(PyObject **editor, PyObject **baton,
+ PyObject **py_pool, PyObject *item_baton)
+{
+ svn_error_t *err;
+
+ if ((err = unwrap_item_baton(editor, baton, item_baton)) != SVN_NO_ERROR)
+ {
+ *py_pool = NULL;
+ goto finished;
+ }
+ if ((*py_pool = PyObject_GetAttrString(item_baton, "pool")) == NULL)
+ {
+ err = callback_exception_error();
+ *editor = NULL;
+ *baton = NULL;
+ goto finished;
+ }
+ err = SVN_NO_ERROR;
+ finished:
+ Py_XDECREF(*py_pool);
+ return err;
+}
+
+static svn_error_t *
+close_baton(void *baton, const char *method, svn_boolean_t without_item)
+{
+ PyObject *editor = NULL, *baton_item = NULL;
+ PyObject *ib = baton;
PyObject *result;
svn_error_t *err;
svn_swig_py_acquire_py_lock();
+ if ((err = unwrap_item_baton(&editor, &baton_item, ib)) != SVN_NO_ERROR)
+ {
+ goto finished;
+ }
+ if (without_item)
+ {
+ baton_item = NULL;
+ }
/* If there is no baton object, then it is an edit_baton, and we should
not bother to pass an object. Note that we still shove a NULL onto
the stack, but the format specified just won't reference it. */
/* ### python doesn't have 'const' on the method name and format */
- if ((result = PyObject_CallMethod(ib->editor, (char *)method,
- ib->baton ? (char *)"(O)" : NULL,
- ib->baton)) == NULL)
+ if ((result = PyObject_CallMethod(editor, (char *)method,
+ baton_item ? (char *)"(O)" : NULL,
+ baton_item)) == NULL)
{
err = callback_exception_error();
goto finished;
@@ -1829,19 +1882,24 @@ static svn_error_t *close_baton(void *ba
/* there is no return value, so just toss this object (probably Py_None) */
Py_DECREF(result);
- /* Release the editor object */
- Py_DECREF(ib->editor);
-
- /* We're now done with the baton. Since there isn't really a free, all
- we need to do is note that its objects are no longer referenced by
- the baton. */
- Py_XDECREF(ib->baton);
-
-#ifdef SVN_DEBUG
- ib->editor = ib->baton = NULL;
-#endif
-
- err = SVN_NO_ERROR;
+ /* We're now done with the baton. Release it from ancestor's dict */
+ if (PyObject_HasAttrString(ib, "release_self"))
+ {
+ /* Get reference for ib, because following function call remove
+ ib object from ancestor's dict, which we borrow the reference */
+ Py_INCREF(ib);
+ result = PyObject_CallMethod(ib, "release_self", NULL, NULL);
+ /* Now we can release the reference safely */
+ Py_DECREF(ib);
+ if (result == NULL)
+ {
+ err = callback_exception_error();
+ goto finished;
+ }
+ /* there is no return value, so just toss this object
+ (probably Py_None) */
+ Py_DECREF(result);
+ }
finished:
svn_swig_py_release_py_lock();
@@ -1852,14 +1910,19 @@ static svn_error_t *set_target_revision(
svn_revnum_t target_revision,
apr_pool_t *pool)
{
- item_baton *ib = edit_baton;
+ PyObject *editor = NULL, *baton_item = NULL;
+ PyObject *ib = edit_baton;
PyObject *result;
svn_error_t *err;
svn_swig_py_acquire_py_lock();
+ if ((err = unwrap_item_baton(&editor, &baton_item, ib)) != SVN_NO_ERROR)
+ {
+ goto finished;
+ }
/* ### python doesn't have 'const' on the method name and format */
- if ((result = PyObject_CallMethod(ib->editor, (char *)"set_target_revision",
+ if ((result = PyObject_CallMethod(editor, (char *)"set_target_revision",
(char *)"l", target_revision)) == NULL)
{
err = callback_exception_error();
@@ -1880,14 +1943,19 @@ static svn_error_t *open_root(void *edit
apr_pool_t *dir_pool,
void **root_baton)
{
- item_baton *ib = edit_baton;
- PyObject *result;
+ PyObject *editor = NULL, *baton_item = NULL;
+ PyObject *ib = edit_baton;
+ PyObject *result = NULL;
svn_error_t *err;
svn_swig_py_acquire_py_lock();
+ if ((err = unwrap_item_baton(&editor, &baton_item, ib)) != SVN_NO_ERROR)
+ {
+ goto finished;
+ }
/* ### python doesn't have 'const' on the method name and format */
- if ((result = PyObject_CallMethod(ib->editor, (char *)"open_root",
+ if ((result = PyObject_CallMethod(editor, (char *)"open_root",
(char *)"lO&", base_revision,
make_ob_pool, dir_pool)) == NULL)
{
@@ -1895,11 +1963,15 @@ static svn_error_t *open_root(void *edit
goto finished;
}
- /* make_baton takes our 'result' reference */
- *root_baton = make_baton(dir_pool, ib->editor, result);
+ if ((*root_baton = make_baton(dir_pool, ib, result)) == NULL)
+ {
+ err = callback_exception_error();
+ goto finished;
+ }
err = SVN_NO_ERROR;
finished:
+ Py_XDECREF(result);
svn_swig_py_release_py_lock();
return err;
}
@@ -1909,16 +1981,21 @@ static svn_error_t *delete_entry(const c
void *parent_baton,
apr_pool_t *pool)
{
- item_baton *ib = parent_baton;
+ PyObject *editor = NULL, *baton_item = NULL;
+ PyObject *ib = parent_baton;
PyObject *result;
svn_error_t *err;
svn_swig_py_acquire_py_lock();
+ if ((err = unwrap_item_baton(&editor, &baton_item, ib)) != SVN_NO_ERROR)
+ {
+ goto finished;
+ }
/* ### python doesn't have 'const' on the method name and format */
- if ((result = PyObject_CallMethod(ib->editor, (char *)"delete_entry",
+ if ((result = PyObject_CallMethod(editor, (char *)"delete_entry",
(char *)SVN_SWIG_BYTES_FMT "lOO&",
- path, revision, ib->baton,
+ path, revision, baton_item,
make_ob_pool, pool)) == NULL)
{
err = callback_exception_error();
@@ -1941,20 +2018,25 @@ static svn_error_t *add_directory(const
apr_pool_t *dir_pool,
void **child_baton)
{
- item_baton *ib = parent_baton;
- PyObject *result;
+ PyObject *editor = NULL, *baton_item = NULL;
+ PyObject *ib = parent_baton;
+ PyObject *result = NULL;
svn_error_t *err;
svn_swig_py_acquire_py_lock();
+ if ((err = unwrap_item_baton(&editor, &baton_item, ib)) != SVN_NO_ERROR)
+ {
+ goto finished;
+ }
/* ### python doesn't have 'const' on the method name and format */
- if ((result = PyObject_CallMethod(ib->editor, (char *)"add_directory",
+ if ((result = PyObject_CallMethod(editor, (char *)"add_directory",
#if IS_PY3
(char *)"yOylO&",
#else
(char *)"sOslO&",
#endif
- path, ib->baton,
+ path, baton_item,
copyfrom_path, copyfrom_revision,
make_ob_pool, dir_pool)) == NULL)
{
@@ -1962,11 +2044,15 @@ static svn_error_t *add_directory(const
goto finished;
}
- /* make_baton takes our 'result' reference */
- *child_baton = make_baton(dir_pool, ib->editor, result);
+ if ((*child_baton = make_baton(dir_pool, ib, result)) == NULL)
+ {
+ err = callback_exception_error();
+ goto finished;
+ }
err = SVN_NO_ERROR;
finished:
+ Py_XDECREF(result);
svn_swig_py_release_py_lock();
return err;
}
@@ -1977,27 +2063,36 @@ static svn_error_t *open_directory(const
apr_pool_t *dir_pool,
void **child_baton)
{
- item_baton *ib = parent_baton;
- PyObject *result;
+ PyObject *editor = NULL, *baton_item = NULL;
+ PyObject *ib = parent_baton;
+ PyObject *result = NULL;
svn_error_t *err;
svn_swig_py_acquire_py_lock();
+ if ((err = unwrap_item_baton(&editor, &baton_item, ib)) != SVN_NO_ERROR)
+ {
+ goto finished;
+ }
/* ### python doesn't have 'const' on the method name and format */
- if ((result = PyObject_CallMethod(ib->editor, (char *)"open_directory",
+ if ((result = PyObject_CallMethod(editor, (char *)"open_directory",
(char *)SVN_SWIG_BYTES_FMT "OlO&",
- path, ib->baton, base_revision,
+ path, baton_item, base_revision,
make_ob_pool, dir_pool)) == NULL)
{
err = callback_exception_error();
goto finished;
}
- /* make_baton takes our 'result' reference */
- *child_baton = make_baton(dir_pool, ib->editor, result);
+ if ((*child_baton = make_baton(dir_pool, ib, result)) == NULL)
+ {
+ err = callback_exception_error();
+ goto finished;
+ }
err = SVN_NO_ERROR;
finished:
+ Py_XDECREF(result);
svn_swig_py_release_py_lock();
return err;
}
@@ -2007,20 +2102,25 @@ static svn_error_t *change_dir_prop(void
const svn_string_t *value,
apr_pool_t *pool)
{
- item_baton *ib = dir_baton;
+ PyObject *editor = NULL, *baton_item = NULL;
+ PyObject *ib = dir_baton;
PyObject *result;
svn_error_t *err;
svn_swig_py_acquire_py_lock();
+ if ((err = unwrap_item_baton(&editor, &baton_item, ib)) != SVN_NO_ERROR)
+ {
+ goto finished;
+ }
/* ### python doesn't have 'const' on the method name and format */
- if ((result = PyObject_CallMethod(ib->editor, (char *)"change_dir_prop",
+ if ((result = PyObject_CallMethod(editor, (char *)"change_dir_prop",
#if IS_PY3
(char *)"Oyy#O&",
#else
(char *)"Oss#O&",
#endif
- ib->baton, name,
+ baton_item, name,
value ? value->data : NULL,
(Py_ssize_t) (value ? value->len : 0),
make_ob_pool, pool)) == NULL)
@@ -2041,7 +2141,7 @@ static svn_error_t *change_dir_prop(void
static svn_error_t *close_directory(void *dir_baton,
apr_pool_t *pool)
{
- return close_baton(dir_baton, "close_directory");
+ return close_baton(dir_baton, "close_directory", FALSE);
}
static svn_error_t *add_file(const char *path,
@@ -2051,20 +2151,25 @@ static svn_error_t *add_file(const char
apr_pool_t *file_pool,
void **file_baton)
{
- item_baton *ib = parent_baton;
- PyObject *result;
+ PyObject *editor = NULL, *baton_item = NULL;
+ PyObject *ib = parent_baton;
+ PyObject *result = NULL;
svn_error_t *err;
svn_swig_py_acquire_py_lock();
+ if ((err = unwrap_item_baton(&editor, &baton_item, ib)) != SVN_NO_ERROR)
+ {
+ goto finished;
+ }
/* ### python doesn't have 'const' on the method name and format */
- if ((result = PyObject_CallMethod(ib->editor, (char *)"add_file",
+ if ((result = PyObject_CallMethod(editor, (char *)"add_file",
#if IS_PY3
(char *)"yOylO&",
#else
(char *)"sOslO&",
#endif
- path, ib->baton,
+ path, baton_item,
copyfrom_path, copyfrom_revision,
make_ob_pool, file_pool)) == NULL)
{
@@ -2072,12 +2177,16 @@ static svn_error_t *add_file(const char
goto finished;
}
- /* make_baton takes our 'result' reference */
- *file_baton = make_baton(file_pool, ib->editor, result);
+ if ((*file_baton = make_baton(file_pool, ib, result)) == NULL)
+ {
+ err = callback_exception_error();
+ goto finished;
+ }
err = SVN_NO_ERROR;
finished:
+ Py_XDECREF(result);
svn_swig_py_release_py_lock();
return err;
}
@@ -2088,27 +2197,36 @@ static svn_error_t *open_file(const char
apr_pool_t *file_pool,
void **file_baton)
{
- item_baton *ib = parent_baton;
- PyObject *result;
+ PyObject *editor = NULL, *baton_item = NULL;
+ PyObject *ib = parent_baton;
+ PyObject *result = NULL;
svn_error_t *err;
svn_swig_py_acquire_py_lock();
+ if ((err = unwrap_item_baton(&editor, &baton_item, ib)) != SVN_NO_ERROR)
+ {
+ goto finished;
+ }
/* ### python doesn't have 'const' on the method name and format */
- if ((result = PyObject_CallMethod(ib->editor, (char *)"open_file",
+ if ((result = PyObject_CallMethod(editor, (char *)"open_file",
(char *)SVN_SWIG_BYTES_FMT "OlO&",
- path, ib->baton, base_revision,
+ path, baton_item, base_revision,
make_ob_pool, file_pool)) == NULL)
{
err = callback_exception_error();
goto finished;
}
- /* make_baton takes our 'result' reference */
- *file_baton = make_baton(file_pool, ib->editor, result);
+ if ((*file_baton = make_baton(file_pool, ib, result)) == NULL)
+ {
+ err = callback_exception_error();
+ goto finished;
+ }
err = SVN_NO_ERROR;
finished:
+ Py_XDECREF(result);
svn_swig_py_release_py_lock();
return err;
}
@@ -2116,12 +2234,19 @@ static svn_error_t *open_file(const char
static svn_error_t *window_handler(svn_txdelta_window_t *window,
void *baton)
{
- PyObject *handler = baton;
- PyObject *result;
- svn_error_t *err;
+ PyObject *editor = NULL, *handler = NULL;
+ PyObject *ib = baton;
+ PyObject *result = NULL;
+ int is_last_call = FALSE;
+ svn_error_t *err = SVN_NO_ERROR;
svn_swig_py_acquire_py_lock();
+ if ((err = unwrap_item_baton(&editor, &handler, ib)) != SVN_NO_ERROR)
+ {
+ is_last_call = TRUE;
+ goto finished;
+ }
if (window == NULL)
{
/* the last call; it closes the handler */
@@ -2129,9 +2254,8 @@ static svn_error_t *window_handler(svn_t
/* invoke the handler with None for the window */
/* ### python doesn't have 'const' on the format */
result = PyObject_CallFunction(handler, (char *)"O", Py_None);
+ is_last_call = TRUE;
- /* we no longer need to refer to the handler object */
- Py_DECREF(handler);
}
else
{
@@ -2144,14 +2268,40 @@ static svn_error_t *window_handler(svn_t
if (result == NULL)
{
err = callback_exception_error();
+ is_last_call = TRUE;
goto finished;
}
-
- /* there is no return value, so just toss this object (probably Py_None) */
- Py_DECREF(result);
- err = SVN_NO_ERROR;
+ else
+ {
+ /* there is no return value, so just toss this object
+ (probably Py_None) */
+ Py_DECREF(result);
+ err = SVN_NO_ERROR;
+ }
finished:
+ if (is_last_call)
+ {
+ /* now we should release the handler object */
+ if (PyObject_HasAttrString(ib, "release_self"))
+ {
+ /* Get reference for ib, because following function call remove
+ ib object from ancestor's dict, which we borrow the reference */
+ Py_INCREF(ib);
+ result = PyObject_CallMethod(ib, "release_self", NULL, NULL);
+ /* Now we can release the reference safely */
+ Py_DECREF(ib);
+ if (result == NULL)
+ {
+ if (err == SVN_NO_ERROR)
+ {
+ err = callback_exception_error();
+ }
+ }
+ Py_XDECREF(result);
+ }
+ }
+
svn_swig_py_release_py_lock();
return err;
}
@@ -2162,20 +2312,25 @@ static svn_error_t *apply_textdelta(void
svn_txdelta_window_handler_t *handler,
void **h_baton)
{
- item_baton *ib = file_baton;
- PyObject *result;
+ PyObject *editor = NULL, *baton_item = NULL;
+ PyObject *ib = file_baton;
+ PyObject *result = NULL;
svn_error_t *err;
svn_swig_py_acquire_py_lock();
+ if ((err = unwrap_item_baton(&editor, &baton_item, ib)) != SVN_NO_ERROR)
+ {
+ goto finished;
+ }
/* ### python doesn't have 'const' on the method name and format */
- if ((result = PyObject_CallMethod(ib->editor, (char *)"apply_textdelta",
+ if ((result = PyObject_CallMethod(editor, (char *)"apply_textdelta",
#if IS_PY3
(char *)"(Oy)",
#else
(char *)"(Os)",
#endif
- ib->baton,
+ baton_item,
base_checksum)) == NULL)
{
err = callback_exception_error();
@@ -2194,15 +2349,21 @@ static svn_error_t *apply_textdelta(void
}
else
{
- /* return the thunk for invoking the handler. the baton takes our
- 'result' reference, which is the handler. */
+ /* return the thunk for invoking the handler. the baton creates
+ new reference of our 'result' reference, which is the handler,
+ so we release it even if no error. */
*handler = window_handler;
- *h_baton = result;
+ if ((*h_baton = make_baton(pool, ib, result)) == NULL)
+ {
+ err = callback_exception_error();
+ goto finished;
+ }
}
err = SVN_NO_ERROR;
finished:
+ Py_XDECREF(result);
svn_swig_py_release_py_lock();
return err;
}
@@ -2212,20 +2373,25 @@ static svn_error_t *change_file_prop(voi
const svn_string_t *value,
apr_pool_t *pool)
{
- item_baton *ib = file_baton;
+ PyObject *editor = NULL, *baton_item = NULL;
+ PyObject *ib = file_baton;
PyObject *result;
svn_error_t *err;
svn_swig_py_acquire_py_lock();
+ if ((err = unwrap_item_baton(&editor, &baton_item, ib)) != SVN_NO_ERROR)
+ {
+ goto finished;
+ }
/* ### python doesn't have 'const' on the method name and format */
- if ((result = PyObject_CallMethod(ib->editor, (char *)"change_file_prop",
+ if ((result = PyObject_CallMethod(editor, (char *)"change_file_prop",
#if IS_PY3
(char *)"Oyy#O&",
#else
(char *)"Oss#O&",
#endif
- ib->baton, name,
+ baton_item, name,
value ? value->data : NULL,
(Py_ssize_t) (value ? value->len : 0),
make_ob_pool, pool)) == NULL)
@@ -2247,20 +2413,25 @@ static svn_error_t *close_file(void *fil
const char *text_checksum,
apr_pool_t *pool)
{
- item_baton *ib = file_baton;
+ PyObject *editor = NULL, *baton_item = NULL;
+ PyObject *ib = file_baton;
PyObject *result;
svn_error_t *err;
svn_swig_py_acquire_py_lock();
+ if ((err = unwrap_item_baton(&editor, &baton_item, ib)) != SVN_NO_ERROR)
+ {
+ goto finished;
+ }
/* ### python doesn't have 'const' on the method name and format */
- if ((result = PyObject_CallMethod(ib->editor, (char *)"close_file",
+ if ((result = PyObject_CallMethod(editor, (char *)"close_file",
#if IS_PY3
(char *)"(Oy)",
#else
(char *)"(Os)",
#endif
- ib->baton,
+ baton_item,
text_checksum)) == NULL)
{
err = callback_exception_error();
@@ -2270,14 +2441,24 @@ static svn_error_t *close_file(void *fil
/* there is no return value, so just toss this object (probably Py_None) */
Py_DECREF(result);
- /* We're now done with the baton. Since there isn't really a free, all
- we need to do is note that its objects are no longer referenced by
- the baton. */
- Py_XDECREF(ib->baton);
-
-#ifdef SVN_DEBUG
- ib->editor = ib->baton = NULL;
-#endif
+ /* We're now done with the baton. Release it from ancestor's dict */
+ if (PyObject_HasAttrString(ib, "release_self"))
+ {
+ /* Get reference for ib, because following function call remove
+ ib object from ancestor's dict, which we borrow the reference */
+ Py_INCREF(ib);
+ result = PyObject_CallMethod(ib, "release_self", NULL, NULL);
+ /* Now we can release the reference safely */
+ Py_DECREF(ib);
+ if (result == NULL)
+ {
+ err = callback_exception_error();
+ goto finished;
+ }
+ /* there is no return value, so just toss this object
+ (probably Py_None) */
+ Py_DECREF(result);
+ }
err = SVN_NO_ERROR;
@@ -2289,18 +2470,16 @@ static svn_error_t *close_file(void *fil
static svn_error_t *close_edit(void *edit_baton,
apr_pool_t *pool)
{
- return close_baton(edit_baton, "close_edit");
+ return close_baton(edit_baton, "close_edit", TRUE);
}
static svn_error_t *abort_edit(void *edit_baton,
apr_pool_t *pool)
{
- return close_baton(edit_baton, "abort_edit");
+ return close_baton(edit_baton, "abort_edit", TRUE);
}
void svn_swig_py_make_editor(const svn_delta_editor_t **editor,
- void **edit_baton,
- PyObject *py_editor,
apr_pool_t *pool)
{
svn_delta_editor_t *thunk_editor = svn_delta_default_editor(pool);
@@ -2321,7 +2500,6 @@ void svn_swig_py_make_editor(const svn_d
thunk_editor->abort_edit = abort_edit;
*editor = thunk_editor;
- *edit_baton = make_baton(pool, py_editor, NULL);
}
@@ -2331,14 +2509,19 @@ static svn_error_t *parse_fn3_magic_head
void *parse_baton,
apr_pool_t *pool)
{
- item_baton *ib = parse_baton;
+ PyObject *editor = NULL, *baton_item = NULL;
+ PyObject *ib = parse_baton;
PyObject *result;
svn_error_t *err;
svn_swig_py_acquire_py_lock();
+ if ((err = unwrap_item_baton(&editor, &baton_item, ib)) != SVN_NO_ERROR)
+ {
+ goto finished;
+ }
/* ### python doesn't have 'const' on the method name and format */
- if ((result = PyObject_CallMethod(ib->editor, (char *)"magic_header_record",
+ if ((result = PyObject_CallMethod(editor, (char *)"magic_header_record",
(char *)"lO&", version,
make_ob_pool, pool)) == NULL)
{
@@ -2360,14 +2543,19 @@ static svn_error_t *parse_fn3_uuid_recor
void *parse_baton,
apr_pool_t *pool)
{
- item_baton *ib = parse_baton;
+ PyObject *editor = NULL, *baton_item = NULL;
+ PyObject *ib = parse_baton;
PyObject *result;
svn_error_t *err;
svn_swig_py_acquire_py_lock();
+ if ((err = unwrap_item_baton(&editor, &baton_item, ib)) != SVN_NO_ERROR)
+ {
+ goto finished;
+ }
/* ### python doesn't have 'const' on the method name and format */
- if ((result = PyObject_CallMethod(ib->editor, (char *)"uuid_record",
+ if ((result = PyObject_CallMethod(editor, (char *)"uuid_record",
(char *)SVN_SWIG_BYTES_FMT "O&", uuid,
make_ob_pool, pool)) == NULL)
{
@@ -2390,14 +2578,19 @@ static svn_error_t *parse_fn3_new_revisi
void *parse_baton,
apr_pool_t *pool)
{
- item_baton *ib = parse_baton;
- PyObject *result;
+ PyObject *editor = NULL, *baton_item = NULL;
+ PyObject *ib = parse_baton;
+ PyObject *result = NULL;
PyObject *tmp;
svn_error_t *err;
svn_swig_py_acquire_py_lock();
- if ((result = PyObject_CallMethod(ib->editor, (char *)"new_revision_record",
+ if ((err = unwrap_item_baton(&editor, &baton_item, ib)) != SVN_NO_ERROR)
+ {
+ goto finished;
+ }
+ if ((result = PyObject_CallMethod(editor, (char *)"new_revision_record",
(char *)"O&O&",
svn_swig_py_stringhash_to_dict, headers,
make_ob_pool, pool)) == NULL) {
@@ -2405,11 +2598,15 @@ static svn_error_t *parse_fn3_new_revisi
goto finished;
}
- /* make_baton takes our 'result' reference */
- *revision_baton = make_baton(pool, ib->editor, result);
+ if ((*revision_baton = make_baton(pool, ib, result)) == NULL)
+ {
+ err = callback_exception_error();
+ goto finished;
+ }
err = SVN_NO_ERROR;
finished:
+ Py_XDECREF(result);
svn_swig_py_release_py_lock();
return err;
}
@@ -2420,26 +2617,35 @@ static svn_error_t *parse_fn3_new_node_r
void *revision_baton,
apr_pool_t *pool)
{
- item_baton *ib = revision_baton;
- PyObject *result;
+ PyObject *editor = NULL, *baton_item = NULL;
+ PyObject *ib = revision_baton;
+ PyObject *result = NULL;
svn_error_t *err;
svn_swig_py_acquire_py_lock();
- if ((result = PyObject_CallMethod(ib->editor, (char *)"new_node_record",
+ if ((err = unwrap_item_baton(&editor, &baton_item, ib)) != SVN_NO_ERROR)
+ {
+ goto finished;
+ }
+ if ((result = PyObject_CallMethod(editor, (char *)"new_node_record",
(char *)"O&OO&",
svn_swig_py_stringhash_to_dict, headers,
- ib->baton,
+ baton_item,
make_ob_pool, pool)) == NULL) {
err = callback_exception_error();
goto finished;
}
- /* make_baton takes our 'result' reference */
- *node_baton = make_baton(pool, ib->editor, result);
+ if ((*node_baton = make_baton(pool, ib, result)) == NULL)
+ {
+ err = callback_exception_error();
+ goto finished;
+ }
err = SVN_NO_ERROR;
finished:
+ Py_XDECREF(result);
svn_swig_py_release_py_lock();
return err;
}
@@ -2449,20 +2655,25 @@ static svn_error_t *parse_fn3_set_revisi
const char *name,
const svn_string_t *value)
{
- item_baton *ib = revision_baton;
+ PyObject *editor = NULL, *baton_item = NULL;
+ PyObject *ib = revision_baton;
PyObject *result;
svn_error_t *err;
svn_swig_py_acquire_py_lock();
+ if ((err = unwrap_item_baton(&editor, &baton_item, ib)) != SVN_NO_ERROR)
+ {
+ goto finished;
+ }
/* ### python doesn't have 'const' on the method name and format */
- if ((result = PyObject_CallMethod(ib->editor, (char
*)"set_revision_property",
+ if ((result = PyObject_CallMethod(editor, (char *)"set_revision_property",
#if IS_PY3
(char *)"Oyy#",
#else
(char *)"Oss#",
#endif
- ib->baton, name,
+ baton_item, name,
value ? value->data : NULL,
(Py_ssize_t) (value ? value->len : 0)))
== NULL)
@@ -2485,20 +2696,25 @@ static svn_error_t *parse_fn3_set_node_p
const char *name,
const svn_string_t *value)
{
- item_baton *ib = node_baton;
+ PyObject *editor = NULL, *baton_item = NULL;
+ PyObject *ib = node_baton;
PyObject *result;
svn_error_t *err;
svn_swig_py_acquire_py_lock();
+ if ((err = unwrap_item_baton(&editor, &baton_item, ib)) != SVN_NO_ERROR)
+ {
+ goto finished;
+ }
/* ### python doesn't have 'const' on the method name and format */
- if ((result = PyObject_CallMethod(ib->editor, (char *)"set_node_property",
+ if ((result = PyObject_CallMethod(editor, (char *)"set_node_property",
#if IS_PY3
(char *)"Oyy#",
#else
(char *)"Oss#",
#endif
- ib->baton, name,
+ baton_item, name,
value ? value->data : NULL,
(Py_ssize_t) (value ? value->len : 0)))
== NULL)
@@ -2520,16 +2736,21 @@ static svn_error_t *parse_fn3_set_node_p
static svn_error_t *parse_fn3_delete_node_property(void *node_baton,
const char *name)
{
- item_baton *ib = node_baton;
+ PyObject *editor = NULL, *baton_item = NULL;
+ PyObject *ib = node_baton;
PyObject *result;
svn_error_t *err;
svn_swig_py_acquire_py_lock();
+ if ((err = unwrap_item_baton(&editor, &baton_item, ib)) != SVN_NO_ERROR)
+ {
+ goto finished;
+ }
/* ### python doesn't have 'const' on the method name and format */
- if ((result = PyObject_CallMethod(ib->editor, (char *)"delete_node_property",
+ if ((result = PyObject_CallMethod(editor, (char *)"delete_node_property",
(char *)"O" SVN_SWIG_BYTES_FMT,
- ib->baton, name)) == NULL)
+ baton_item, name)) == NULL)
{
err = callback_exception_error();
goto finished;
@@ -2547,15 +2768,20 @@ static svn_error_t *parse_fn3_delete_nod
static svn_error_t *parse_fn3_remove_node_props(void *node_baton)
{
- item_baton *ib = node_baton;
+ PyObject *editor = NULL, *baton_item = NULL;
+ PyObject *ib = node_baton;
PyObject *result;
svn_error_t *err;
svn_swig_py_acquire_py_lock();
+ if ((err = unwrap_item_baton(&editor, &baton_item, ib)) != SVN_NO_ERROR)
+ {
+ goto finished;
+ }
/* ### python doesn't have 'const' on the method name and format */
- if ((result = PyObject_CallMethod(ib->editor, (char *)"remove_node_props",
- (char *)"(O)", ib->baton)) == NULL)
+ if ((result = PyObject_CallMethod(editor, (char *)"remove_node_props",
+ (char *)"(O)", baton_item)) == NULL)
{
err = callback_exception_error();
goto finished;
@@ -2574,15 +2800,22 @@ static svn_error_t *parse_fn3_remove_nod
static svn_error_t *parse_fn3_set_fulltext(svn_stream_t **stream,
void *node_baton)
{
- item_baton *ib = node_baton;
+ PyObject *editor = NULL, *baton_item = NULL, *py_pool = NULL;
+ PyObject *ib = node_baton;
PyObject *result = NULL;
+ apr_pool_t *pool;
svn_error_t *err = SVN_NO_ERROR;
svn_swig_py_acquire_py_lock();
+ if ((err = unwrap_item_baton_with_pool(&editor, &baton_item, &py_pool,
+ ib)) != SVN_NO_ERROR)
+ {
+ goto finished;
+ }
/* ### python doesn't have 'const' on the method name and format */
- if ((result = PyObject_CallMethod(ib->editor, (char *)"set_fulltext",
- (char *)"(O)", ib->baton)) == NULL)
+ if ((result = PyObject_CallMethod(editor, (char *)"set_fulltext",
+ (char *)"(O)", baton_item)) == NULL)
{
err = callback_exception_error();
goto finished;
@@ -2595,9 +2828,15 @@ static svn_error_t *parse_fn3_set_fullte
}
else
{
+ if (svn_swig_ConvertPtrString(py_pool, (void **)&pool,
+ "apr_pool_t *") == -1)
+ {
+ err = type_conversion_error("apr_pool_t *");
+ goto finished;
+ }
/* create a stream from the IO object. it will increment the
reference on the 'result'. */
- *stream = svn_swig_py_make_stream(result, ib->pool);
+ *stream = svn_swig_py_make_stream(result, pool);
if (*stream == NULL)
{
err = callback_exception_error();
@@ -2614,19 +2853,27 @@ finished:
}
-static svn_error_t *parse_fn3_apply_textdelta(svn_txdelta_window_handler_t
*handler,
- void **handler_baton,
- void *node_baton)
+static svn_error_t *
+parse_fn3_apply_textdelta(svn_txdelta_window_handler_t *handler,
+ void **handler_baton,
+ void *node_baton)
{
- item_baton *ib = node_baton;
+ PyObject *editor = NULL, *baton_item = NULL, *py_pool = NULL;
+ PyObject *ib = node_baton;
+ apr_pool_t *pool;
PyObject *result;
svn_error_t *err;
svn_swig_py_acquire_py_lock();
+ if ((err = unwrap_item_baton_with_pool(&editor, &baton_item, &py_pool,
+ ib)) != SVN_NO_ERROR)
+ {
+ goto finished;
+ }
/* ### python doesn't have 'const' on the method name and format */
- if ((result = PyObject_CallMethod(ib->editor, (char *)"apply_textdelta",
- (char *)"(O)", ib->baton)) == NULL)
+ if ((result = PyObject_CallMethod(editor, (char *)"apply_textdelta",
+ (char *)"(O)", baton_item)) == NULL)
{
err = callback_exception_error();
goto finished;
@@ -2644,10 +2891,21 @@ static svn_error_t *parse_fn3_apply_text
}
else
{
- /* return the thunk for invoking the handler. the baton takes our
- 'result' reference, which is the handler. */
+ /* return the thunk for invoking the handler. the baton creates
+ new reference of our 'result' reference, which is the handler,
+ so we release it even if no error. */
*handler = window_handler;
- *handler_baton = result;
+ if (svn_swig_ConvertPtrString(py_pool, (void **)&pool,
+ "apr_pool_t *") == -1)
+ {
+ err = type_conversion_error("apr_pool_t *");
+ goto finished;
+ }
+ if ((*handler_baton = make_baton(pool, ib, result)) == NULL)
+ {
+ err = callback_exception_error();
+ goto finished;
+ }
}
err = SVN_NO_ERROR;
@@ -2660,13 +2918,13 @@ static svn_error_t *parse_fn3_apply_text
static svn_error_t *parse_fn3_close_node(void *node_baton)
{
- return close_baton(node_baton, "close_node");
+ return close_baton(node_baton, "close_node", FALSE);
}
static svn_error_t *parse_fn3_close_revision(void *revision_baton)
{
- return close_baton(revision_baton, "close_revision");
+ return close_baton(revision_baton, "close_revision", FALSE);
}
@@ -2686,26 +2944,11 @@ static const svn_repos_parse_fns3_t thun
parse_fn3_close_revision
};
-static apr_status_t
-svn_swig_py_parse_fns3_destroy(void *parse_baton)
-{
- close_baton(parse_baton, "_close_dumpstream");
- return APR_SUCCESS;
-}
-
void svn_swig_py_make_parse_fns3(const svn_repos_parse_fns3_t **parse_fns3,
- void **parse_baton,
- PyObject *py_parse_fns3,
apr_pool_t *pool)
{
*parse_fns3 = &thunk_parse_fns3_vtable;
- *parse_baton = make_baton(pool, py_parse_fns3, NULL);
-
- /* Dump stream vtable does not provide a method which is called right before
- the end of the parsing (similar to close_edit/abort_edit in delta editor).
- Thus, register a pool clean-up routine to release this parse baton. */
- apr_pool_cleanup_register(pool, *parse_baton, svn_swig_py_parse_fns3_destroy,
- apr_pool_cleanup_null);
+ return;
}
Modified:
subversion/trunk/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.h
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.h?rev=1912500&r1=1912499&r2=1912500&view=diff
==============================================================================
---
subversion/trunk/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.h
(original)
+++
subversion/trunk/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.h
Sun Sep 24 05:06:08 2023
@@ -275,14 +275,10 @@ svn_swig_py_unwrap_struct_ptr(PyObject *
/* make an editor that "thunks" from C callbacks up to Python */
void svn_swig_py_make_editor(const svn_delta_editor_t **editor,
- void **edit_baton,
- PyObject *py_editor,
apr_pool_t *pool);
/* make a parse vtable that "thunks" from C callbacks up to Python */
void svn_swig_py_make_parse_fns3(const svn_repos_parse_fns3_t **parse_fns3,
- void **parse_baton,
- PyObject *py_parse_fns3,
apr_pool_t *pool);
apr_file_t *svn_swig_py_make_file(PyObject *py_file,
Modified: subversion/trunk/subversion/bindings/swig/python/svn/delta.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/swig/python/svn/delta.py?rev=1912500&r1=1912499&r2=1912500&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/swig/python/svn/delta.py (original)
+++ subversion/trunk/subversion/bindings/swig/python/svn/delta.py Sun Sep 24
05:06:08 2023
@@ -77,5 +77,6 @@ class Editor:
pass
-def make_editor(editor, pool=None):
- return svn_swig_py_make_editor(editor, pool)
+def make_editor(editor, pool=None, baton=None):
+ from libsvn.delta import _AncBaton
+ return svn_swig_py_make_editor(pool), _AncBaton(editor, pool, baton)
Modified: subversion/trunk/subversion/bindings/swig/python/svn/repos.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/swig/python/svn/repos.py?rev=1912500&r1=1912499&r2=1912500&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/swig/python/svn/repos.py (original)
+++ subversion/trunk/subversion/bindings/swig/python/svn/repos.py Sun Sep 24
05:06:08 2023
@@ -336,5 +336,16 @@ class ParseFns3:
pass
-def make_parse_fns3(parse_fns3, pool=None):
- return svn_swig_py_make_parse_fns3(parse_fns3, pool)
+def make_parse_fns3(parse_fns3, pool=None, baton=None):
+ from libsvn.delta import _AncBaton
+
+ class _ParseBaton(_AncBaton):
+ # Drive _close_dumpstream method when the instance is deleted.
+ # For backward compatibility before Subversion 1.15, we call it even if
+ # the instance would not be used by C API, or the C API would cause
+ # some error.
+ def __del__(self):
+ self.editor._close_dumpstream()
+
+ parse_baton = _ParseBaton(parse_fns3, pool, baton)
+ return svn_swig_py_make_parse_fns3(pool), parse_baton
Modified: subversion/trunk/subversion/bindings/swig/svn_delta.i
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/swig/svn_delta.i?rev=1912500&r1=1912499&r2=1912500&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/swig/svn_delta.i (original)
+++ subversion/trunk/subversion/bindings/swig/svn_delta.i Sun Sep 24 05:06:08
2023
@@ -68,8 +68,6 @@
### There must be a cleaner way to implement this?
### Maybe follow Ruby by wrapping it where passing an editor? */
void svn_swig_py_make_editor(const svn_delta_editor_t **editor,
- void **edit_baton,
- PyObject *py_editor,
apr_pool_t *pool);
#endif
@@ -207,6 +205,49 @@ void _ops_get(int *num_ops, const svn_tx
#ifdef SWIGPYTHON
%pythoncode %{
+# Baton container class for editor/parse_fns3 batons and their decendants.
+class _ItemBaton:
+ def __init__(self, editor, pool, baton=None):
+ self.pool = pool if pool else libsvn.core.svn_pool_create()
+ self.baton = baton
+ self.editor = editor
+
+ def get_ancestor(self):
+ raise NotImplementedError
+
+ def make_decendant(self, pool, baton=None):
+ return _DecBaton(self, pool, baton)
+
+
+class _DecBaton(_ItemBaton):
+ def __init__(self, parent, pool, baton=None):
+ import weakref
+ _ItemBaton.__init__(self, parent.editor, pool, baton)
+ self._anc = weakref.ref(parent.get_ancestor())
+ self._anc().hold_baton(self)
+
+ def get_ancestor(self):
+ return self._anc()
+
+ def release_self(self):
+ self._anc().release_baton(self)
+
+
+class _AncBaton(_ItemBaton):
+ def __init__(self, editor, pool, baton=None):
+ _ItemBaton.__init__(self, editor, pool, baton)
+ self._dec = {} # hold decendant batons.
+
+ def get_ancestor(self):
+ return self
+
+ def hold_baton(self, baton):
+ self._dec[id(baton)] = baton
+
+ def release_baton(self, baton):
+ del self._dec[id(baton)]
+
+
# This function is for backwards compatibility only.
# Use svn_txdelta_window_t.ops instead.
svn_txdelta_window_t_ops_get = svn_txdelta_window_t._ops_get
Modified: subversion/trunk/subversion/bindings/swig/svn_repos.i
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/swig/svn_repos.i?rev=1912500&r1=1912499&r2=1912500&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/swig/svn_repos.i (original)
+++ subversion/trunk/subversion/bindings/swig/svn_repos.i Sun Sep 24 05:06:08
2023
@@ -162,8 +162,6 @@ svn_error_t *svn_repos_dump_fs2(svn_repo
#ifdef SWIGPYTHON
/* Make swig wrap this function for us, to allow making a vtable in python */
void svn_swig_py_make_parse_fns3(const svn_repos_parse_fns3_t **parse_fns3,
- void **parse_baton,
- PyObject *py_parse_fns3,
apr_pool_t *pool);
#endif
