Madiator2011/lbry-sdk
1
0
Fork 0
forked from LBRYCommunity/lbry-sdk
Code Pull requests Activity

fix total_sent and total_received in connection status

Browse source 
- remove `time` field from connection status
- add `max_incoming_mbs` and `max_outgoing_mbs` to connection status
- reduce delay in connection status loop
This commit is contained in:
Jack Robison 2019-10-17 14:10:08 -04:00 committed by Lex Berezhny
parent 5cebc7f5cd
commit 49a54f8a13
1 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
lbry/lbry/connection_manager.py
View file

@ -1,3 +1,4 @@
import time
import asyncio import asyncio
import typing import typing
import collections import collections
@ -18,6 +19,8 @@ class ConnectionManager:
self.incoming: typing.DefaultDict[str, int] = collections.defaultdict(int) self.incoming: typing.DefaultDict[str, int] = collections.defaultdict(int)
self.outgoing_connected: typing.Set[str] = set() self.outgoing_connected: typing.Set[str] = set()
self.outgoing: typing.DefaultDict[str, int] = collections.defaultdict(int) self.outgoing: typing.DefaultDict[str, int] = collections.defaultdict(int)
self._max_incoming_mbs = 0.0
self._max_outgoing_mbs = 0.0
self._status = {} self._status = {}
self._running = False self._running = False
self._task: typing.Optional[asyncio.Task] = None self._task: typing.Optional[asyncio.Task] = None
@ -58,29 +61,32 @@ class ConnectionManager:
'total_outgoing_mbs': 0.0, 'total_outgoing_mbs': 0.0,
'total_sent': 0, 'total_sent': 0,
'total_received': 0, 'total_received': 0,
'time': self.loop.time() 'max_incoming_mbs': 0.0,
'max_outgoing_mbs': 0.0
} }
while True: while True:
last = self.loop.time() last = time.perf_counter()
await asyncio.sleep(5, loop=self.loop) await asyncio.sleep(0.1, loop=self.loop)
self._status['incoming_bps'].clear() self._status['incoming_bps'].clear()
self._status['outgoing_bps'].clear() self._status['outgoing_bps'].clear()
now = self.loop.time() now = time.perf_counter()
while self.outgoing: while self.outgoing:
k, v = self.outgoing.popitem() k, v = self.outgoing.popitem()
self._status['total_sent'] += v
self._status['outgoing_bps'][k] = v / (now - last) self._status['outgoing_bps'][k] = v / (now - last)
while self.incoming: while self.incoming:
k, v = self.incoming.popitem() k, v = self.incoming.popitem()
self._status['total_received'] += v
self._status['incoming_bps'][k] = v / (now - last) self._status['incoming_bps'][k] = v / (now - last)
self._status['total_outgoing_mbs'] = int(sum(list(self._status['outgoing_bps'].values()) self._status['total_outgoing_mbs'] = int(sum(list(self._status['outgoing_bps'].values())
)) / 1000000.0 )) / 1000000.0
self._status['total_incoming_mbs'] = int(sum(list(self._status['incoming_bps'].values()) self._status['total_incoming_mbs'] = int(sum(list(self._status['incoming_bps'].values())
)) / 1000000.0 )) / 1000000.0
self._status['total_sent'] += sum(list(self._status['outgoing_bps'].values())) self._max_incoming_mbs = max(self._max_incoming_mbs, self._status['total_incoming_mbs'])
self._status['total_received'] += sum(list(self._status['incoming_bps'].values())) self._max_outgoing_mbs = max(self._max_outgoing_mbs, self._status['total_outgoing_mbs'])
self._status['max_incoming_mbs'] = self._max_incoming_mbs
self._status['time'] = now self._status['max_outgoing_mbs'] = self._max_outgoing_mbs
def stop(self): def stop(self):
if self._task: if self._task: