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

fix CPU busy loop issue in tracker announce logic

This commit is contained in:
Arvid Norberg 2011-09-12 05:21:16 +00:00
parent 469414d486
commit 460799d600
2 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -91,6 +91,7 @@
incoming connection incoming connection
* added more detailed instrumentation of the disk I/O thread * added more detailed instrumentation of the disk I/O thread
* fix CPU busy loop issue in tracker announce logic
* honor IOV_MAX when using writev and readv * honor IOV_MAX when using writev and readv
* don't post 'operation aborted' UDP errors when changing listen port * don't post 'operation aborted' UDP errors when changing listen port
* fix tracker retry logic, where in some configurations the next tier would not be tried * fix tracker retry logic, where in some configurations the next tier would not be tried

39
src/torrent.cpp
View File

@ -2329,14 +2329,8 @@ ctx->set_verify_callback(verify_function, ec);
if (ae.is_working()) { tier = ae.tier; sent_announce = false; } if (ae.is_working()) { tier = ae.tier; sent_announce = false; }
if (!ae.can_announce(now, is_seed())) if (!ae.can_announce(now, is_seed()))
{ {
if (ae.is_working()) // this counts
{ if (ae.is_working()) sent_announce = true;
sent_announce = true; // this counts
if (!settings().announce_to_all_trackers
&& !settings().announce_to_all_tiers)
break;
}
continue; continue;
} }
@ -2399,8 +2393,8 @@ ctx->set_verify_callback(verify_function, ec);
} }
else else
#endif #endif
m_ses.m_tracker_manager.queue_request(m_ses.m_io_service, m_ses.m_half_open, req m_ses.m_tracker_manager.queue_request(m_ses.m_io_service, m_ses.m_half_open, req
, tracker_login() , shared_from_this()); , tracker_login() , shared_from_this());
ae.updating = true; ae.updating = true;
ae.next_announce = now + seconds(20); ae.next_announce = now + seconds(20);
ae.min_announce = now + seconds(10); ae.min_announce = now + seconds(10);
@ -6944,14 +6938,20 @@ ctx->set_verify_callback(verify_function, ec);
if (i->tier > tier && !settings().announce_to_all_tiers) break; if (i->tier > tier && !settings().announce_to_all_tiers) break;
if (i->is_working()) { tier = i->tier; found_working = false; } if (i->is_working()) { tier = i->tier; found_working = false; }
if (i->fails >= i->fail_limit && i->fail_limit != 0) continue; if (i->fails >= i->fail_limit && i->fail_limit != 0) continue;
if (i->updating) { found_working = true; continue; } if (i->updating)
ptime next_tracker_announce = (std::max)(i->next_announce, i->min_announce); {
if (!i->updating found_working = true;
&& next_tracker_announce < next_announce }
&& (!found_working || i->is_working())) else
next_announce = next_tracker_announce; {
ptime next_tracker_announce = (std::max)(i->next_announce, i->min_announce);
if (next_tracker_announce < next_announce
&& (!found_working || i->is_working()))
next_announce = next_tracker_announce;
}
if (i->is_working()) found_working = true; if (i->is_working()) found_working = true;
if (!settings().announce_to_all_trackers if (found_working
&& !settings().announce_to_all_trackers
&& !settings().announce_to_all_tiers) break; && !settings().announce_to_all_tiers) break;
} }
@ -6968,9 +6968,8 @@ ctx->set_verify_callback(verify_function, ec);
error_code ec; error_code ec;
boost::weak_ptr<torrent> self(shared_from_this()); boost::weak_ptr<torrent> self(shared_from_this());
// since we don't know if we have to re-issue the async_wait or not // don't re-issue the timer if it's the same expiration time as last time
// always do it if (m_tracker_timer.expires_at() == next_announce) return;
// if (m_tracker_timer.expires_at() <= next_announce) return;
#if defined TORRENT_ASIO_DEBUGGING #if defined TORRENT_ASIO_DEBUGGING
add_outstanding_async("tracker::on_tracker_announce_disp"); add_outstanding_async("tracker::on_tracker_announce_disp");