jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Thread safety patch for Python STL iterators from Abhinandan Jain

Browse source 
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@10317 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
William S Fulton 2008-03-21 23:11:24 +00:00
commit a1100e9964
2 changed files with 13 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

3
CHANGES.current
View file

@ -1,6 +1,9 @@
Version 1.3.35 (in progress) Version 1.3.35 (in progress)
============================ ============================
03/21/2008: wsfulton
[Python] Thread safety patch for STL iterators from Abhinandan Jain.
03/17/2008: mgossage 03/17/2008: mgossage
[Lua] Added %luacode feature to add source code into wrappers. [Lua] Added %luacode feature to add source code into wrappers.
Updated documentation to document this. Updated documentation to document this.

15
Lib/python/pyiterators.swg
View file

@ -6,7 +6,7 @@
* *
* Implement a python 'output' iterator for Python 2.2 or higher. * Implement a python 'output' iterator for Python 2.2 or higher.
* *
* Users can derive form the PySwigIterator to implemet their * Users can derive form the PySwigIterator to implement their
* own iterators. As an example (real one since we use it for STL/STD * own iterators. As an example (real one since we use it for STL/STD
* containers), the template PySwigIterator_T does the * containers), the template PySwigIterator_T does the
* implementation for genereic C++ iterators. * implementation for genereic C++ iterators.
@ -57,17 +57,22 @@ namespace swig {
// C++ common/needed methods // C++ common/needed methods
virtual PySwigIterator *copy() const = 0; virtual PySwigIterator *copy() const = 0;
PyObject *next() PyObject *next()
{ {
SWIG_PYTHON_THREAD_BEGIN_BLOCK; // disable threads
PyObject *obj = value(); PyObject *obj = value();
incr(); incr();
return obj; SWIG_PYTHON_THREAD_END_BLOCK; // re-enable threads
return obj;
} }
PyObject *previous() PyObject *previous()
{ {
SWIG_PYTHON_THREAD_BEGIN_BLOCK; // disable threads
decr(); decr();
return value(); PyObject *obj = value();
SWIG_PYTHON_THREAD_END_BLOCK; // re-enable threads
return obj;
} }
PySwigIterator *advance(ptrdiff_t n) PySwigIterator *advance(ptrdiff_t n)