citizenaspirant/PyBitmessage
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Fix infinite loop

Browse Source
This commit is contained in:
Peter Šurda 2017-01-16 23:17:56 +01:00
parent d652dc864d
commit 4f920fe641
Signed by untrusted user: PeterSurda
GPG Key ID: 0C5F50C0B5F37D87
1 changed files with 29 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
src/inventory.py
View File

@ -118,23 +118,14 @@ class Missing(object):
with self.lock: with self.lock:
return len(self.hashes) return len(self.hashes)
def removeObjectFromCurrentThread(self, objectHash):
with self.lock:
try:
self.hashes[objectHash]['peers'].remove(current_thread().peer)
except KeyError:
return
except ValueError:
pass
if len(self.hashes[objectHash]['peers']) == 0:
del self.hashes[objectHash]
def pull(self, count=1): def pull(self, count=1):
if count < 1: if count < 1:
raise ValueError("Must be at least one") raise ValueError("Must be at least one")
objectHashes = [] objectHashes = []
unreachableObjects = []
if self.stopped: if self.stopped:
return objectHashes return objectHashes
start = time.time()
try: try:
for objectHash in self.hashes.keys(): for objectHash in self.hashes.keys():
with self.lock: with self.lock:
@ -146,6 +137,9 @@ class Missing(object):
self.pending[current_thread().peer]['received'] >= time.time() - self.frequency) and \ self.pending[current_thread().peer]['received'] >= time.time() - self.frequency) and \
len(self.pending[current_thread().peer]['objects']) >= count: len(self.pending[current_thread().peer]['objects']) >= count:
break break
if len(self.hashes[objectHash]['peers']) == 0:
unreachableObjects.append(objectHash)
continue
# requested too long ago or not at all from any thread # requested too long ago or not at all from any thread
if self.hashes[objectHash]['requested'] < time.time() - self.frequency: if self.hashes[objectHash]['requested'] < time.time() - self.frequency:
# ready requested from this thread but haven't received yet # ready requested from this thread but haven't received yet
@ -174,24 +168,26 @@ class Missing(object):
except (RuntimeError, KeyError, ValueError): except (RuntimeError, KeyError, ValueError):
# the for cycle sometimes breaks if you remove elements # the for cycle sometimes breaks if you remove elements
pass pass
for objectHash in unreachableObjects:
with self.lock:
del self.hashes[objectHash]
# logger.debug("Pull took %.3f seconds", time.time() - start)
return objectHashes return objectHashes
def delete(self, objectHash, justReceived=False): def delete(self, objectHash):
with self.lock: with self.lock:
if objectHash in self.hashes: if objectHash in self.hashes:
del self.hashes[objectHash] del self.hashes[objectHash]
self.pending[current_thread().peer]['received'] = time.time() self.pending[current_thread().peer]['received'] = time.time()
while True: toDelete = []
try: for thread in self.pending.keys():
for thread in self.pending.keys(): with self.lock:
with self.lock: if objectHash in self.pending[thread]['objects']:
if objectHash in self.pending[thread]['objects']: toDelete.append(objectHash)
self.pending[thread]['objects'].remove(objectHash) for thread in toDelete:
except (KeyError, RuntimeError): with self.lock:
pass if thread in self.pending:
else: self.pending[thread]['objects'].remove(objectHash)
break
def stop(self): def stop(self):
with self.lock: with self.lock:
@ -201,11 +197,17 @@ class Missing(object):
def threadEnd(self): def threadEnd(self):
while True: while True:
try: try:
for objectHash in self.hashes:
self.removeObjectFromCurrentThread(objectHash)
with self.lock: with self.lock:
del self.pending[current_thread().peer] if current_thread().peer in self.pending:
except (KeyError, RuntimeError): for objectHash in self.pending[current_thread().peer]['objects']:
if objectHash in self.hashes:
self.hashes[objectHash]['peers'].remove(current_thread().peer)
except (KeyError):
pass pass
else: else:
break break
with self.lock:
try:
del self.pending[current_thread().peer]
except KeyError:
pass