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

made bandwidth_manager build without exceptions

This commit is contained in:
Arvid Norberg 2007-12-29 05:43:19 +00:00
parent 8b76457b80
commit a279e8c9ec
1 changed files with 7 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
include/libtorrent/bandwidth_manager.hpp
View File

@ -285,10 +285,8 @@ private:
void add_history_entry(history_entry<PeerConnection, Torrent> const& e) throw() void add_history_entry(history_entry<PeerConnection, Torrent> const& e) throw()
{ {
#ifndef NDEBUG
try {
#endif
INVARIANT_CHECK; INVARIANT_CHECK;
m_history.push_front(e); m_history.push_front(e);
m_current_quota += e.amount; m_current_quota += e.amount;
// in case the size > 1 there is already a timer // in case the size > 1 there is already a timer
@ -297,19 +295,13 @@ private:
if (m_abort) return; if (m_abort) return;
m_history_timer.expires_at(e.expires_at); asio::error_code ec;
m_history_timer.expires_at(e.expires_at, ec);
m_history_timer.async_wait(bind(&bandwidth_manager::on_history_expire, this, _1)); m_history_timer.async_wait(bind(&bandwidth_manager::on_history_expire, this, _1));
#ifndef NDEBUG
}
catch (std::exception&) { TORRENT_ASSERT(false); }
#endif
} }
void on_history_expire(asio::error_code const& e) throw() void on_history_expire(asio::error_code const& e) throw()
{ {
#ifndef NDEBUG
try {
#endif
INVARIANT_CHECK; INVARIANT_CHECK;
if (e) return; if (e) return;
@ -332,7 +324,8 @@ private:
// now, wait for the next chunk to expire // now, wait for the next chunk to expire
if (!m_history.empty() && !m_abort) if (!m_history.empty() && !m_abort)
{ {
m_history_timer.expires_at(m_history.back().expires_at); asio::error_code ec;
m_history_timer.expires_at(m_history.back().expires_at, ec);
m_history_timer.async_wait(bind(&bandwidth_manager::on_history_expire, this, _1)); m_history_timer.async_wait(bind(&bandwidth_manager::on_history_expire, this, _1));
} }
@ -340,24 +333,15 @@ private:
// means we can hand out more (in case there // means we can hand out more (in case there
// are still consumers in line) // are still consumers in line)
if (!m_queue.empty()) hand_out_bandwidth(); if (!m_queue.empty()) hand_out_bandwidth();
#ifndef NDEBUG
}
catch (std::exception&)
{
TORRENT_ASSERT(false);
}
#endif
} }
void hand_out_bandwidth() throw() void hand_out_bandwidth()
{ {
// if we're already handing out bandwidth, just return back // if we're already handing out bandwidth, just return back
// to the loop further down on the callstack // to the loop further down on the callstack
if (m_in_hand_out_bandwidth) return; if (m_in_hand_out_bandwidth) return;
m_in_hand_out_bandwidth = true; m_in_hand_out_bandwidth = true;
#ifndef NDEBUG
try {
#endif
INVARIANT_CHECK; INVARIANT_CHECK;
ptime now(time_now()); ptime now(time_now());
@ -467,11 +451,6 @@ private:
qe.peer, t, hand_out_amount, now + bw_window_size)); qe.peer, t, hand_out_amount, now + bw_window_size));
TORRENT_ASSERT(amount == limit - m_current_quota); TORRENT_ASSERT(amount == limit - m_current_quota);
} }
#ifndef NDEBUG
}
catch (std::exception& e)
{ TORRENT_ASSERT(false); };
#endif
m_in_hand_out_bandwidth = false; m_in_hand_out_bandwidth = false;
} }