premiere
/
premiere-libtorrent
2
2
Fork 1
Code Issues Pull Requests Releases Wiki Activity

log packet sizes at the normal logging level in uTP and also parse it out in parse_utp_log.py

This commit is contained in:
Arvid Norberg 2012-06-25 05:38:29 +00:00
parent 4ddbe44a0d
commit 34694bf91f
2 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
parse_utp_log.py
View File

@ -92,6 +92,7 @@ packet_loss = 0
packet_timeout = 0 packet_timeout = 0
delay_histogram = {} delay_histogram = {}
packet_size_histogram = {}
window_size = {'0': 0, '1': 0} window_size = {'0': 0, '1': 0}
# [35301484] 0x00ec1190: actual_delay:1021583 our_delay:102 their_delay:-1021345 off_target:297 max_window:2687 upload_rate:18942 delay_base:1021481154 delay_sum:-1021242 target_delay:400 acked_bytes:1441 cur_window:2882 scaled_gain:2.432 # [35301484] 0x00ec1190: actual_delay:1021583 our_delay:102 their_delay:-1021345 off_target:297 max_window:2687 upload_rate:18942 delay_base:1021481154 delay_sum:-1021242 target_delay:400 acked_bytes:1441 cur_window:2882 scaled_gain:2.432
@ -131,6 +132,11 @@ for l in file:
if "Packet timeout" in l: if "Packet timeout" in l:
packet_timeout = packet_timeout + 1 packet_timeout = packet_timeout + 1
continue continue
if "sending packet" in l:
v = l.split('size:')[1].split(' ')[0]
packet_size_histogram[v] = 1 + packet_size_histogram.get(v, 0)
if "our_delay:" not in l: if "our_delay:" not in l:
continue continue
@ -185,6 +191,10 @@ for d,f in delay_histogram.iteritems():
print >>out, float(d*histogram_quantization) + histogram_quantization / 2, f print >>out, float(d*histogram_quantization) + histogram_quantization / 2, f
out.close() out.close()
out = open('%s_packet_size.histogram' % out_file, 'wb')
for d,f in packet_size_histogram.iteritems():
print >>out, d, f
out.close()
plot = [ plot = [
{ {
@ -249,11 +259,21 @@ print >>out, 'set xlabel "delay (ms)"'
print >>out, 'set boxwidth 1' print >>out, 'set boxwidth 1'
print >>out, 'set ylabel "number of packets"' print >>out, 'set ylabel "number of packets"'
print >>out, 'plot "%s.histogram" using 1:2 with boxes fs solid 0.3' % out_file print >>out, 'plot "%s.histogram" using 1:2 with boxes fs solid 0.3' % out_file
files += out_file + '.delays.png '
print >>out, 'set output "%s.packet_sizes.png"' % out_file
print >>out, 'set xrange [0:*]'
print >>out, 'set xlabel "packet size (B)"'
print >>out, 'set boxwidth 1'
print >>out, 'set ylabel "number of packets sent"'
print >>out, 'set logscale y'
print >>out, 'plot "%s_packet_size.histogram" using 1:2 with boxes fs solid 0.3' % out_file
print >>out, 'set nologscale y'
files += out_file + '.packet_sizes.png '
print >>out, "set style data steps" print >>out, "set style data steps"
#print >>out, "set yrange [0:*]" #print >>out, "set yrange [0:*]"
print >>out, "set y2range [*:*]" print >>out, "set y2range [*:*]"
files += out_file + '.delays.png '
#set hidden3d #set hidden3d
#set title "Peer bandwidth distribution" #set title "Peer bandwidth distribution"
#set xlabel "Ratio" #set xlabel "Ratio"

11
src/utp_stream.cpp
View File

@ -1648,15 +1648,16 @@ bool utp_socket_impl::send_pkt(bool ack)
h->timestamp_microseconds = boost::uint32_t(total_microseconds(now - min_time())); h->timestamp_microseconds = boost::uint32_t(total_microseconds(now - min_time()));
#if TORRENT_UTP_LOG #if TORRENT_UTP_LOG
UTP_LOGV("%8p: sending packet seq_nr:%d ack_nr:%d type:%s " UTP_LOG("%8p: sending packet seq_nr:%d ack_nr:%d type:%s "
"id:%d target:%s size:%d error:%s send_buffer_size:%d cwnd:%d " "id:%d target:%s size:%d error:%s send_buffer_size:%d cwnd:%d "
"ret:%d adv_wnd:%d in-flight:%d mtu:%d timestamp:%u time_diff:%u " "adv_wnd:%d in-flight:%d mtu:%d timestamp:%u time_diff:%u "
"mtu_probe:%d\n" "mtu_probe:%d extension:%d\n"
, this, int(h->seq_nr), int(h->ack_nr), packet_type_names[h->get_type()] , this, int(h->seq_nr), int(h->ack_nr), packet_type_names[h->get_type()]
, m_send_id, print_endpoint(udp::endpoint(m_remote_address, m_port)).c_str() , m_send_id, print_endpoint(udp::endpoint(m_remote_address, m_port)).c_str()
, packet_size, m_error.message().c_str(), m_write_buffer_size, int(m_cwnd >> 16) , packet_size, m_error.message().c_str(), m_write_buffer_size, int(m_cwnd >> 16)
, ret, m_adv_wnd, m_bytes_in_flight, m_mtu, boost::uint32_t(h->timestamp_microseconds) , m_adv_wnd, m_bytes_in_flight, m_mtu, boost::uint32_t(h->timestamp_microseconds)
, boost::uint32_t(h->timestamp_difference_microseconds), int(p->mtu_probe)); , boost::uint32_t(h->timestamp_difference_microseconds), int(p->mtu_probe)
, h->extension);
#endif #endif
TORRENT_ASSERT(!m_error); TORRENT_ASSERT(!m_error);