Make objectHashHolder into a list

- was a dict
This commit is contained in:
Peter Šurda 2017-01-10 21:19:57 +01:00
parent 9c214b4a24
commit b4703ec6ce
Signed by: PeterSurda
GPG Key ID: 0C5F50C0B5F37D87

View File

@ -17,11 +17,11 @@ class objectHashHolder(threading.Thread):
threading.Thread.__init__(self, name="objectHashHolder") threading.Thread.__init__(self, name="objectHashHolder")
self.shutdown = False self.shutdown = False
self.sendDataThreadMailbox = sendDataThreadMailbox # This queue is used to submit data back to our associated sendDataThread. self.sendDataThreadMailbox = sendDataThreadMailbox # This queue is used to submit data back to our associated sendDataThread.
self.collectionOfHashLists = {} self.collectionOfHashLists = []
self.collectionOfPeerLists = {} self.collectionOfPeerLists = []
for i in range(self.size): for i in range(objectHashHolder.size):
self.collectionOfHashLists[i] = [] self.collectionOfHashLists.append([])
self.collectionOfPeerLists[i] = [] self.collectionOfPeerLists.append([])
def run(self): def run(self):
iterator = 0 iterator = 0
@ -33,11 +33,11 @@ class objectHashHolder(threading.Thread):
self.sendDataThreadMailbox.put((0, 'sendaddr', self.collectionOfPeerLists[iterator])) self.sendDataThreadMailbox.put((0, 'sendaddr', self.collectionOfPeerLists[iterator]))
self.collectionOfPeerLists[iterator] = [] self.collectionOfPeerLists[iterator] = []
iterator += 1 iterator += 1
iterator %= self.size iterator %= objectHashHolder.size
time.sleep(1) time.sleep(1)
def holdHash(self,hash): def holdHash(self,hash):
self.collectionOfHashLists[random.randrange(0, self.size)].append(hash) self.collectionOfHashLists[random.randrange(0, objectHashHolder.size)].append(hash)
def hasHash(self, hash): def hasHash(self, hash):
if hash in (hashlist for hashlist in self.collectionOfHashLists): if hash in (hashlist for hashlist in self.collectionOfHashLists):
@ -46,7 +46,7 @@ class objectHashHolder(threading.Thread):
return False return False
def holdPeer(self,peerDetails): def holdPeer(self,peerDetails):
self.collectionOfPeerLists[random.randrange(0, self.size)].append(peerDetails) self.collectionOfPeerLists[random.randrange(0, objectHashHolder.size)].append(peerDetails)
def hashCount(self): def hashCount(self):
return sum([len(x) for x in self.collectionOfHashLists if type(x) is list]) return sum([len(x) for x in self.collectionOfHashLists if type(x) is list])