Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix calculation in Mpbs vs MB_s #19

Merged
merged 3 commits into from
Aug 2, 2017
Merged

Fix calculation in Mpbs vs MB_s #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
142fa9b
Fix calculation in Mpbs vs MB_s
rustyhowell-c4 Jun 28, 2017
39dd788
Provide isclose() for python2.x
rustyhowell Jun 28, 2017
c0d2844
Fix relative path ref
rustyhowell Jun 28, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 14 additions & 13 deletions iperf3/iperf3.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
from Queue import Queue # Python2 compatibility


__version__ = '0.1.6'
__version__ = '0.1.7'


MAX_UDP_BULKSIZE = (65535 - 8 - 20)
Expand Down Expand Up @@ -700,15 +700,16 @@ def __init__(self, result):
self.received_bytes = self.json['end']['sum_received']['bytes']
self.received_bps = self.json['end']['sum_received']['bits_per_second']

self.sent_kbps = self.sent_bps / 1024 # Kilobits per second
self.sent_Mbps = self.sent_kbps / 1024 # Megabits per second
self.sent_kB_s = self.sent_kbps / 8 # kiloBytes per second
self.sent_MB_s = self.sent_Mbps / 8 # MegaBytes per second
# Bits are measured in 10**3 terms, Bytes are measured in 2**10 terms
self.sent_kbps = self.sent_bps / 1000 # Kilobits per second
self.sent_Mbps = self.sent_kbps / 1000 # Megabits per second
self.sent_kB_s = self.sent_bps / (8 * 1024) # kiloBytes per second
self.sent_MB_s = self.sent_kB_s / 1024 # MegaBytes per second

self.received_kbps = self.received_bps / 1024 # Kilobits per second
self.received_Mbps = self.received_kbps / 1024 # Megabits per second
self.received_kB_s = self.received_kbps / 8 # kiloBytes per second
self.received_MB_s = self.received_Mbps / 8 # MegaBytes per second
self.received_kbps = self.received_bps / 1000 # Kilobits per second
self.received_Mbps = self.received_kbps / 1000 # Megabits per second
self.received_kB_s = self.received_bps / (8* 1024) # kiloBytes per second
self.received_MB_s = self.received_kB_s / 1024 # MegaBytes per second

# retransmits only returned from client
self.retransmits = self.json['end']['sum_sent'].get('retransmits', None)
Expand All @@ -718,10 +719,10 @@ def __init__(self, result):
self.bytes = self.json['end']['sum']['bytes']
self.bps = self.json['end']['sum']['bits_per_second']
self.jitter_ms = self.json['end']['sum']['jitter_ms']
self.kbps = self.bps / 1024
self.Mbps = self.kbps / 1024
self.kB_s = self.kbps / 8
self.MB_s = self.Mbps / 8
self.kbps = self.bps / 1000
self.Mbps = self.kbps / 1000
self.kB_s = self.kbps / (8 * 1024)
self.MB_s = self.Mbps / 1024
self.packets = self.json['end']['sum']['packets']
self.lost_packets = self.json['end']['sum']['lost_packets']
self.lost_percent = self.json['end']['sum']['lost_percent']
Expand Down
Loading