fixed that thread partial output problem (one character behind) reported by Kasper Fons

stamparm · stamparm · commit 430a25407b1a · 2010-05-11T11:06:21.000Z
diff --git a/lib/techniques/blind/inference.py b/lib/techniques/blind/inference.py
@@ -194,6 +194,7 @@ def etaProgressUpdate(charTime, index):
         index   = [ firstChar ]    # As list for python nested function scoping
         idxlock = threading.Lock()
         iolock  = threading.Lock()
+        valuelock  = threading.Lock()
         conf.seqLock = threading.Lock()
         conf.threadContinue = True
 
@@ -220,7 +221,10 @@ def downloadThread():
                     else:
                         break
 
+                    valuelock.acquire()
                     value[curidx-1] = val
+                    currentValue = list(value)
+                    valuelock.release()
 
                     if conf.threadContinue:
                         if showEta:
@@ -230,7 +234,7 @@ def downloadThread():
                             endCharIndex = 0
 
                             for i in xrange(length):
-                                if value[i] is not None:
+                                if currentValue[i] is not None:
                                     endCharIndex = max(endCharIndex, i)
 
                             output = ''
@@ -240,11 +244,11 @@ def downloadThread():
 
                             count = 0
 
-                            for i in xrange(startCharIndex, endCharIndex):
-                                output += '_' if value[i] is None else value[i]
+                            for i in xrange(startCharIndex, endCharIndex + 1):
+                                output += '_' if currentValue[i] is None else currentValue[i]
 
                             for i in xrange(length):
-                                count += 1 if value[i] is not None else 0
+                                count += 1 if currentValue[i] is not None else 0
 
                             if startCharIndex > 0:
                                 output = '..' + output[2:]
