slightly faster and thread safer inference

This commit is contained in:
Miroslav Stampar
2011-01-16 10:52:42 +00:00
parent fb166e9445
commit 71391874eb
7 changed files with 27 additions and 35 deletions

View File

@@ -257,7 +257,6 @@ def bisection(payload, expression, length=None, charsetType=None, firstChar=None
idxlock = threading.Lock()
iolock = threading.Lock()
valuelock = threading.Lock()
kb.locks.seqLock = threading.Lock()
kb.threadContinue = True
def downloadThread():
@@ -404,8 +403,6 @@ def bisection(payload, expression, length=None, charsetType=None, firstChar=None
if conf.verbose in (1, 2) and not showEta and infoMsg:
dataToStdout(infoMsg)
kb.locks.seqLock = None
# No multi-threading (--threads = 1)
else:
index = firstChar

View File

@@ -54,7 +54,6 @@ def tableExists(tableFile, regex=None):
threads = []
tbllock = threading.Lock()
iolock = threading.Lock()
kb.locks.seqLock = threading.Lock()
kb.threadContinue = True
kb.suppressSession = True
@@ -130,7 +129,6 @@ def tableExists(tableFile, regex=None):
except KeyboardInterrupt:
raise sqlmapThreadException, "user aborted"
finally:
kb.locks.seqLock = None
kb.threadContinue = True
kb.threadException = False
kb.suppressSession = False
@@ -172,7 +170,6 @@ def columnExists(columnFile, regex=None):
threads = []
collock = threading.Lock()
iolock = threading.Lock()
kb.locks.seqLock = threading.Lock()
kb.threadContinue = True
kb.suppressSession = True
@@ -239,7 +236,6 @@ def columnExists(columnFile, regex=None):
except KeyboardInterrupt:
raise sqlmapThreadException, "user aborted"
finally:
kb.locks.seqLock = None
kb.threadContinue = True
kb.threadException = False
kb.suppressSession = False