fujin/rtorrent
1
0
Fork 0
mirror of https://github.com/rakshasa/rtorrent.git synced 2026-08-14 14:12:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

* Added "max_{up,down}loads_{div,global}" options and man page entries.

Browse Source 
* PCB::should_request() didn't check if m_downUnchoked was true, just
m_downChoke.choked(). This would cause requests to be sent while we
were still choked by remote.


git-svn-id: svn://rakshasa.no/libtorrent/trunk/rtorrent@871 e378c898-3ddf-0310-93e7-cc216c733640
This commit is contained in:
rakshasa
2007-03-20 16:13:20 +00:00
parent 3b13fc7f05
commit 59c6f97cb9
4 changed files with 137 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ui/root.cc
+58 -5
View File
@@ -64,7 +64,10 @@ Root::Root() :
m_windowTitle(NULL),
m_windowHttpQueue(NULL),
m_windowInput(NULL),
m_windowStatusbar(NULL) {
m_windowStatusbar(NULL),
m_maxUploadsGlobal(0),
m_maxDownloadsGlobal(0) {
}
void
@@ -162,6 +165,27 @@ Root::set_down_throttle(unsigned int throttle) {
m_windowStatusbar->mark_dirty();
torrent::set_down_throttle(throttle * 1024);
int64_t div = control->variable()->get_value("max_downloads_div");
if (throttle == 0 || div <= 0) {
torrent::set_max_download_unchoked(m_maxDownloadsGlobal);
return;
}
throttle /= control->variable()->get_value("max_downloads_div");
unsigned int maxUnchoked;
if (throttle <= 10)
maxUnchoked = 1 + throttle / 1;
else
maxUnchoked = 10 + throttle / 5;
if (m_maxDownloadsGlobal != 0)
torrent::set_max_download_unchoked(std::min(maxUnchoked, m_maxDownloadsGlobal));
else
torrent::set_max_download_unchoked(maxUnchoked);
}
void
@@ -171,17 +195,26 @@ Root::set_up_throttle(unsigned int throttle) {
torrent::set_up_throttle(throttle * 1024);
if (throttle == 0) {
torrent::set_max_unchoked(0);
int64_t div = control->variable()->get_value("max_uploads_div");
if (throttle == 0 || div <= 0) {
torrent::set_max_unchoked(m_maxUploadsGlobal);
return;
}
throttle /= control->variable()->get_value("max_uploads_div");
unsigned int maxUnchoked;
if (throttle <= 10)
torrent::set_max_unchoked(1 + throttle / 1);
maxUnchoked = 1 + throttle / 1;
else
torrent::set_max_unchoked(10 + throttle / 5);
maxUnchoked = 10 + throttle / 5;
if (m_maxUploadsGlobal != 0)
torrent::set_max_unchoked(std::min(maxUnchoked, m_maxUploadsGlobal));
else
torrent::set_max_unchoked(maxUnchoked);
}
void
@@ -194,6 +227,26 @@ Root::adjust_up_throttle(int throttle) {
set_up_throttle(std::max<int>(torrent::up_throttle() / 1024 + throttle, 0));
}
void
Root::set_max_uploads_global(int64_t slots) {
if (slots < 0)
throw torrent::input_error("Out of range.");
m_maxUploadsGlobal = slots;
set_up_throttle(torrent::up_throttle() / 1024);
}
void
Root::set_max_downloads_global(int64_t slots) {
if (slots < 0)
throw torrent::input_error("Out of range.");
m_maxDownloadsGlobal = slots;
set_down_throttle(torrent::down_throttle() / 1024);
}
void
Root::enable_input(const std::string& title, input::TextInput* input) {
if (m_windowInput->input() != NULL)