jiigen666/libtorrent
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

optimize sending buffers on peer sockets by corking and uncorking

Browse Source
This commit is contained in:
Arvid Norberg
2011-10-24 04:22:53 +00:00
parent 5e3e4c6146
commit 9afd09d797
4 changed files with 55 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/bt_peer_connection.cpp
View File

@@ -2339,12 +2339,12 @@ namespace libtorrent
char* ptr = msg;
detail::write_int32(r.length + 1 + 4 + 4 + 4 + piece_list_buf.size(), ptr);
send_buffer(msg, 17, cork_message);
send_buffer(&piece_list_buf[0], piece_list_buf.size(), cork_message);
send_buffer(msg, 17);
send_buffer(&piece_list_buf[0], piece_list_buf.size());
}
else
{
send_buffer(msg, 13, cork_message);
send_buffer(msg, 13);
}
append_send_buffer(buffer.get(), r.length

32
src/peer_connection.cpp
View File

@@ -162,6 +162,7 @@ namespace libtorrent
, m_sent_suggests(false)
, m_holepunch_mode(false)
, m_ignore_stats(false)
, m_corked(false)
#if defined TORRENT_DEBUG || TORRENT_RELEASE_ASSERTS
, m_in_constructor(true)
, m_disconnect_started(false)
@@ -312,6 +313,7 @@ namespace libtorrent
, m_sent_suggests(false)
, m_holepunch_mode(false)
, m_ignore_stats(false)
, m_corked(false)
#if defined TORRENT_DEBUG || TORRENT_RELEASE_ASSERTS
, m_in_constructor(true)
, m_disconnect_started(false)
@@ -2550,6 +2552,11 @@ namespace libtorrent
#endif
TORRENT_ASSERT(m_ses.is_network_thread());
// flush send buffer at the end of this scope
// TODO: peers should really be corked/uncorked outside of
// all completed disk operations
cork _c(*this);
INVARIANT_CHECK;
m_outstanding_writing_bytes -= p.length;
@@ -4405,6 +4412,11 @@ namespace libtorrent
void peer_connection::on_disk_read_complete(int ret, disk_io_job const& j, peer_request r)
{
// flush send buffer at the end of this scope
// TODO: peers should really be corked/uncorked outside of
// all completed disk operations
cork _c(*this);
#ifdef TORRENT_STATS
++m_ses.m_num_messages[aux::session_impl::on_disk_read_counter];
#endif
@@ -4570,6 +4582,13 @@ namespace libtorrent
, priority , bwc1, bwc2, bwc3, bwc4);
}
void peer_connection::uncork_socket()
{
if (!m_corked) return;
m_corked = false;
setup_send();
}
void peer_connection::setup_send()
{
if (m_channel_state[upload_channel] != peer_info::bw_idle
@@ -4676,6 +4695,14 @@ namespace libtorrent
TORRENT_ASSERT(amount_to_send > 0);
if (m_corked)
{
#ifdef TORRENT_VERBOSE_LOGGING
peer_log(">>> CORKED WRITE [ bytes: %d ]", amount_to_send);
#endif
return;
}
#ifdef TORRENT_VERBOSE_LOGGING
peer_log(">>> ASYNC_WRITE [ bytes: %d ]", amount_to_send);
#endif
@@ -5004,7 +5031,7 @@ namespace libtorrent
, boost::bind(&session_impl::free_buffer, boost::ref(m_ses), _1));
++i;
}
if ((flags & cork_message) == 0) setup_send();
setup_send();
}
template<class T>
@@ -5042,6 +5069,9 @@ namespace libtorrent
// to keep the object alive through the exit check
boost::intrusive_ptr<peer_connection> me(self());
// flush the send buffer at the end of this function
cork _c(*this);
INVARIANT_CHECK;
#ifdef TORRENT_VERBOSE_LOGGING