rnhmjoj/magnetico
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Move neighbour task work to tick task.

Browse Source
This commit is contained in:
Richard Kiss 2017-05-14 23:01:14 -07:00
parent 71f55f0c91
commit 35c6176548
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
magneticod/magneticod/dht.py
View File

@ -48,8 +48,8 @@ class SybilNode:
self._complete_info_hashes = complete_info_hashes self._complete_info_hashes = complete_info_hashes
self.__max_metadata_size = max_metadata_size self.__max_metadata_size = max_metadata_size
self._metadata_q = asyncio.Queue() self._metadata_q = asyncio.Queue()
self._tasks = []
self._is_paused = False self._is_paused = False
self._tick_task = None
logging.info("SybilNode %s on %s initialized!", self.__true_id.hex().upper(), address) logging.info("SybilNode %s on %s initialized!", self.__true_id.hex().upper(), address)
@ -58,8 +58,7 @@ class SybilNode:
await loop.create_datagram_endpoint(lambda: self, local_addr=self.__address) await loop.create_datagram_endpoint(lambda: self, local_addr=self.__address)
def connection_made(self, transport): def connection_made(self, transport):
self._tasks.append(self._loop.create_task(self.on_tick())) self._tick_task = self._loop.create_task(self.on_tick())
self._tasks.append(self._loop.create_task(self.increase_neighbour_task()))
self._transport = transport self._transport = transport
def connection_lost(self, exc): def connection_lost(self, exc):
@ -93,6 +92,8 @@ class SybilNode:
self.__bootstrap() self.__bootstrap()
self.__make_neighbours() self.__make_neighbours()
self._routing_table.clear() self._routing_table.clear()
if not self._is_paused:
self.__n_max_neighbours = self.__n_max_neighbours * 101 // 100
def datagram_received(self, data, addr) -> None: def datagram_received(self, data, addr) -> None:
# Ignore nodes that uses port 0 (assholes). # Ignore nodes that uses port 0 (assholes).
@ -114,14 +115,10 @@ class SybilNode:
elif message.get(b"q") == b"announce_peer": elif message.get(b"q") == b"announce_peer":
self.__on_ANNOUNCE_PEER_query(message, addr) self.__on_ANNOUNCE_PEER_query(message, addr)
async def increase_neighbour_task(self):
while True:
await asyncio.sleep(10)
self.__n_max_neighbours = self.__n_max_neighbours * 101 // 100
async def shutdown(self) -> None: async def shutdown(self) -> None:
futures = [peer for peer in itertools.chain.from_iterable(self.__peers.values())] futures = [peer for peer in itertools.chain.from_iterable(self.__peers.values())]
futures.extend(self._tasks) if self._tick_task:
futures.append(self._tick_task)
for future in futures: for future in futures:
future.cancel() future.cancel()
await asyncio.wait(futures) await asyncio.wait(futures)