[Python-checkins] r75821 - in python/branches/release31-maint: Lib/test/test_bz2.py Misc/NEWS Modules/bz2module.c

Tue Oct 27 18:49:21 CET 2009

Author: antoine.pitrou
Date: Tue Oct 27 18:49:21 2009
New Revision: 75821
Log:
Merged revisions 75820 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/branches/py3k
................
 r75820 | antoine.pitrou | 2009年10月27日 18:47:14 +0100 (mar., 27 oct. 2009) | 9 lines
 
 Merged revisions 75818 via svnmerge from 
 svn+ssh://pythondev@svn.python.org/python/trunk
 
 ........
 r75818 | antoine.pitrou | 2009年10月27日 18:41:58 +0100 (mar., 27 oct. 2009) | 3 lines
 
 Issue #7205: Fix a possible deadlock when using a BZ2File object from several threads at once.
 ........
................
Modified:
 python/branches/release31-maint/ (props changed)
 python/branches/release31-maint/Lib/test/test_bz2.py
 python/branches/release31-maint/Misc/NEWS
 python/branches/release31-maint/Modules/bz2module.c
Modified: python/branches/release31-maint/Lib/test/test_bz2.py
==============================================================================

--- python/branches/release31-maint/Lib/test/test_bz2.py	(original)
+++ python/branches/release31-maint/Lib/test/test_bz2.py	Tue Oct 27 18:49:21 2009
@@ -7,6 +7,7 @@
 import os
 import subprocess
 import sys
+import threading
 
 # Skip tests if the bz2 module doesn't exist.
 bz2 = support.import_module('bz2')
@@ -282,6 +283,23 @@
 else:
 self.fail("1/0 didn't raise an exception")
 
+ def testThreading(self):
+ # Using a BZ2File from several threads doesn't deadlock (issue #7205).
+ data = b"1" * 2**20
+ nthreads = 10
+ f = bz2.BZ2File(self.filename, 'wb')
+ try:
+ def comp():
+ for i in range(5):
+ f.write(data)
+ threads = [threading.Thread(target=comp) for i in range(nthreads)]
+ for t in threads:
+ t.start()
+ for t in threads:
+ t.join()
+ finally:
+ f.close()
+
 
 class BZ2CompressorTest(BaseTest):
 def testCompress(self):
Modified: python/branches/release31-maint/Misc/NEWS
==============================================================================
--- python/branches/release31-maint/Misc/NEWS	(original)
+++ python/branches/release31-maint/Misc/NEWS	Tue Oct 27 18:49:21 2009
@@ -34,6 +34,9 @@
 Library
 -------
 
+- Issue #7205: Fix a possible deadlock when using a BZ2File object from
+ several threads at once.
+
 - Issue #7071: byte-compilation in Distutils is now done with respect to
 sys.dont_write_bytecode.
 
Modified: python/branches/release31-maint/Modules/bz2module.c
==============================================================================
--- python/branches/release31-maint/Modules/bz2module.c	(original)
+++ python/branches/release31-maint/Modules/bz2module.c	Tue Oct 27 18:49:21 2009
@@ -78,7 +78,12 @@
 
 
 #ifdef WITH_THREAD
-#define ACQUIRE_LOCK(obj) PyThread_acquire_lock(obj->lock, 1)
+#define ACQUIRE_LOCK(obj) do { \
+	if (!PyThread_acquire_lock(obj->lock, 0)) { \
+		Py_BEGIN_ALLOW_THREADS \
+		PyThread_acquire_lock(obj->lock, 1); \
+		Py_END_ALLOW_THREADS \
+	} } while(0)
 #define RELEASE_LOCK(obj) PyThread_release_lock(obj->lock)
 #else
 #define ACQUIRE_LOCK(obj)
