minor optimization and refactoring

stamparm · stamparm · commit 5770c08784cb · 2011-07-25T20:17:44.000Z
diff --git a/lib/core/settings.py b/lib/core/settings.py
@@ -384,7 +384,7 @@
 ROTATING_CHARS = ('\\', '|', '|', '/', '-')
 
 # Chunk length (in items) used by BigArray objects (only last chunk and cached one are held in memory)
-BIGARRAY_CHUNK_LENGTH = 5000
+BIGARRAY_CHUNK_LENGTH = 4096
 
 # Only console display last n table rows
-TRIM_STDOUT_DUMP_SIZE = 256
+TRIM_STDOUT_DUMP_SIZE = 1024
diff --git a/lib/techniques/error/use.py b/lib/techniques/error/use.py
@@ -320,8 +320,8 @@ def errorUse(expression, expected=None, resumeValue=True, dump=False):
                 stopLimit = 1
 
             threadData = getCurrentThreadData()
-            threadData.shared.limits = range(startLimit, stopLimit)
-            numThreads = min(conf.threads, len(threadData.shared.limits))
+            threadData.shared.limits = iter(xrange(startLimit, stopLimit))
+            numThreads = min(conf.threads, (stopLimit - startLimit))
             threadData.shared.outputs = BigArray()
 
             if stopLimit > TURN_OFF_RESUME_INFO_LIMIT:
@@ -340,13 +340,12 @@ def errorThread():
 
                     while kb.threadContinue:
                         kb.locks.limits.acquire()
-                        if threadData.shared.limits:
-                            num = threadData.shared.limits[-1]
-                            del threadData.shared.limits[-1]
-                            kb.locks.limits.release()
-                        else:
-                            kb.locks.limits.release()
+                        try:
+                            num = threadData.shared.limits.next()
+                        except StopIteration:
                             break
+                        finally:
+                            kb.locks.limits.release()
 
                         output = __errorFields(expression, expressionFields, expressionFieldsList, expected, num, resumeValue)
 
diff --git a/lib/techniques/union/use.py b/lib/techniques/union/use.py
@@ -261,8 +261,8 @@ def unionUse(expression, unpack=True, dump=False):
                 stopLimit = 1
 
             threadData = getCurrentThreadData()
-            threadData.shared.limits = range(startLimit, stopLimit)
-            numThreads = min(conf.threads, len(threadData.shared.limits))
+            threadData.shared.limits = iter(xrange(startLimit, stopLimit))
+            numThreads = min(conf.threads, (stopLimit - startLimit))
             threadData.shared.value = BigArray()
 
             if stopLimit > TURN_OFF_RESUME_INFO_LIMIT:
@@ -281,13 +281,12 @@ def unionThread():
 
                     while kb.threadContinue:
                         kb.locks.limits.acquire()
-                        if threadData.shared.limits:
-                            num = threadData.shared.limits[-1]
-                            del threadData.shared.limits[-1]
-                            kb.locks.limits.release()
-                        else:
-                            kb.locks.limits.release()
+                        try:
+                            num = threadData.shared.limits.next()
+                        except StopIteration:
                             break
+                        finally:
+                            kb.locks.limits.release()
 
                         if Backend.getIdentifiedDbms() in (DBMS.MSSQL, DBMS.SYBASE):
                             field = expressionFieldsList[0]
diff --git a/lib/utils/hash.py b/lib/utils/hash.py
@@ -266,7 +266,7 @@ def attackDumpedTable():
                 colUser = column
                 break
 
-        for i in range(count):
+        for i in xrange(count):
             for column in columns:
                 if column == colUser or column == '__infos__':
                     continue
diff --git a/sqlmap.py b/sqlmap.py
@@ -130,7 +130,8 @@ def main():
         kb.threadException = True
 
         # Reference: http://stackoverflow.com/questions/1635080/terminate-a-multi-thread-python-program
-        os._exit(0)
+        if conf.threads > 1:
+            os._exit(0)
 
 if __name__ == "__main__":
     main()
