fujin/rtorrent
1
0
Fork 0
mirror of https://github.com/rakshasa/rtorrent.git synced 2026-10-22 09:06:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

* Compare the block data downloaded by a non-leader with the current

Browse Source 
and mark the block transfer if they do not match.

* Erase handshakes in DownloadMain::stop() rather than
Manager::cleanup_download(). This was causing exceptions in PeerList.

* Add 1000ns to the timeout when polling to avoid rounding errors
messing up scheduling.


git-svn-id: svn://rakshasa.no/libtorrent/trunk/rtorrent@724 e378c898-3ddf-0310-93e7-cc216c733640
This commit is contained in:
rakshasa
2006-06-17 23:46:00 +00:00
parent c95eb62802
commit f1c9188d55
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/poll_manager_epoll.cc
+2 -2
View File
@@ -65,7 +65,7 @@ PollManagerEPoll::poll(rak::timer timeout) {
// Add 1ms to ensure we don't idle loop due to the lack of // Add 1ms to ensure we don't idle loop due to the lack of
// resolution. // resolution.
torrent::perform(); torrent::perform();
timeout = std::min(timeout, rak::timer(torrent::next_timeout())); timeout = std::min(timeout, rak::timer(torrent::next_timeout())) + 1000;
if (m_httpStack.is_busy()) { if (m_httpStack.is_busy()) {
// When we're using libcurl we need to use select, but as this is // When we're using libcurl we need to use select, but as this is
@@ -82,7 +82,7 @@ PollManagerEPoll::poll(rak::timer timeout) {
FD_SET(static_cast<torrent::PollEPoll*>(m_poll)->file_descriptor(), m_readSet); FD_SET(static_cast<torrent::PollEPoll*>(m_poll)->file_descriptor(), m_readSet);
unsigned int maxFd = std::max((unsigned int)static_cast<torrent::PollEPoll*>(m_poll)->file_descriptor(), unsigned int maxFd = std::max((unsigned int)static_cast<torrent::PollEPoll*>(m_poll)->file_descriptor(),
m_httpStack.fdset(m_readSet, m_writeSet, m_errorSet)); m_httpStack.fdset(m_readSet, m_writeSet, m_errorSet));
timeval t = timeout.tval(); timeval t = timeout.tval();
src/core/poll_manager_select.cc
+1 -1
View File
@@ -63,7 +63,7 @@ PollManagerSelect::~PollManagerSelect() {
void void
PollManagerSelect::poll(rak::timer timeout) { PollManagerSelect::poll(rak::timer timeout) {
torrent::perform(); torrent::perform();
timeout = std::min(timeout, rak::timer(torrent::next_timeout())); timeout = std::min(timeout, rak::timer(torrent::next_timeout())) + 1000;
#if defined USE_VARIABLE_FDSET #if defined USE_VARIABLE_FDSET
std::memset(m_readSet, 0, m_setSize); std::memset(m_readSet, 0, m_setSize);