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

made connection queue build without exception support

Browse Source
This commit is contained in:
Arvid Norberg
2007-12-29 22:45:42 +00:00
parent 6c42830f97
commit e528577e65
1 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/connection_queue.cpp
View File

@@ -88,7 +88,8 @@ namespace libtorrent
void connection_queue::close() void connection_queue::close()
{ {
m_timer.cancel(); asio::error_code ec;
m_timer.cancel(ec);
} }
void connection_queue::limit(int limit) void connection_queue::limit(int limit)
@@ -121,7 +122,8 @@ namespace libtorrent
if (m_queue.empty()) if (m_queue.empty())
{ {
m_timer.cancel(); asio::error_code ec;
m_timer.cancel(ec);
return; return;
} }
@@ -133,7 +135,8 @@ namespace libtorrent
ptime expire = time_now() + i->timeout; ptime expire = time_now() + i->timeout;
if (m_num_connecting == 0) if (m_num_connecting == 0)
{ {
m_timer.expires_at(expire); asio::error_code ec;
m_timer.expires_at(expire, ec);
m_timer.async_wait(boost::bind(&connection_queue::on_timeout, this, _1)); m_timer.async_wait(boost::bind(&connection_queue::on_timeout, this, _1));
} }
i->connecting = true; i->connecting = true;
@@ -144,7 +147,13 @@ namespace libtorrent
entry& ent = *i; entry& ent = *i;
++i; ++i;
try { ent.on_connect(ent.ticket); } catch (std::exception&) {} #ifndef BOOST_NO_EXCEPTIONS
try {
#endif
ent.on_connect(ent.ticket);
#ifndef BOOST_NO_EXCEPTIONS
} catch (std::exception&) {}
#endif
if (!free_slots()) break; if (!free_slots()) break;
i = std::find_if(i, m_queue.end(), boost::bind(&entry::connecting, _1) == false); i = std::find_if(i, m_queue.end(), boost::bind(&entry::connecting, _1) == false);
@@ -206,7 +215,8 @@ namespace libtorrent
if (next_expire < max_time()) if (next_expire < max_time())
{ {
m_timer.expires_at(next_expire); asio::error_code ec;
m_timer.expires_at(next_expire, ec);
m_timer.async_wait(boost::bind(&connection_queue::on_timeout, this, _1)); m_timer.async_wait(boost::bind(&connection_queue::on_timeout, this, _1));
} }
try_connect(); try_connect();