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

antoine.pitrou python-checkins at python.org
Tue Oct 27 18:46:10 CET 2009


Author: antoine.pitrou
Date: Tue Oct 27 18:46:09 2009
New Revision: 75819

Log:
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/release26-maint/   (props changed)
   python/branches/release26-maint/Lib/test/test_bz2.py
   python/branches/release26-maint/Misc/NEWS
   python/branches/release26-maint/Modules/bz2module.c

Modified: python/branches/release26-maint/Lib/test/test_bz2.py
==============================================================================
--- python/branches/release26-maint/Lib/test/test_bz2.py	(original)
+++ python/branches/release26-maint/Lib/test/test_bz2.py	Tue Oct 27 18:46:09 2009
@@ -7,6 +7,7 @@
 import os
 import subprocess
 import sys
+import threading
 
 import bz2
 from bz2 import BZ2File, BZ2Compressor, BZ2Decompressor
@@ -284,6 +285,23 @@
         bz2f.close()
         self.assertEqual(xlines, ['Test'])
 
+    def testThreading(self):
+        # Using a BZ2File from several threads doesn't deadlock (issue #7205).
+        data = "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/release26-maint/Misc/NEWS
==============================================================================
--- python/branches/release26-maint/Misc/NEWS	(original)
+++ python/branches/release26-maint/Misc/NEWS	Tue Oct 27 18:46:09 2009
@@ -24,6 +24,9 @@
 Library
 -------
 
+- Issue #7205: Fix a possible deadlock when using a BZ2File object from
+  several threads at once.
+
 - Issue #7048: Force Decimal.logb to round its result when that result
   is too large to fit in the current precision.
 

Modified: python/branches/release26-maint/Modules/bz2module.c
==============================================================================
--- python/branches/release26-maint/Modules/bz2module.c	(original)
+++ python/branches/release26-maint/Modules/bz2module.c	Tue Oct 27 18:46:09 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)


More information about the Python-checkins mailing list