Throttle working.

git-svn-id: svn://rakshasa.no/libtorrent/trunk/libtorrent@9 e378c898-3ddf-0310-93e7-cc216c733640

Author: rakshasa

NEWS

@@ -0,0 +1 @@
+If you want news, watch CNN or something.

TODO

@@ -41,3 +41,5 @@ fix socketBase setAsync
 We're counting bytes we haven't downloaded, fixme.
 
 Recursively update the up/down rates in throttle.
+
+Implement min size of chunks sent in peer_connection

client/README

@@ -10,6 +10,20 @@ If your system doesn't have "execinfo.h", uncomment "#define
 USE_EXECINFO" in rtorrent.cc. This will be handled by an autoconf
 script later.
 
+All:
+
+  Ctrl-C  - Quit
+
+  A       - Increase Throttle by 1 KiB
+  Z       - Decrease Throttle by 1 KiB
+
+  S       - Increase Throttle by 5 KiB
+  X       - Decrease Throttle by 5 KiB
+
+  D       - Increase Throttle by 50 KiB
+  C       - Decrease Throttle by 50 KiB
+
+
 Main:
 
   Up/Down - Select a download

client/display.cc

@@ -75,9 +75,10 @@ void Display::drawDownloads(torrent::DList::const_iterator mark) {
 	     torrent::get(first, torrent::TRACKER_MSG).c_str());
   }
 
-  mvprintw(maxY - 1, 0, "Port: %i Handshakes: %i Loops: %i",
+  mvprintw(maxY - 1, 0, "Port: %i Handshakes: %i Throttle: %i KiB Loops: %i",
 	   (int)torrent::get(torrent::LISTEN_PORT),
 	   (int)torrent::get(torrent::HANDSHAKES_TOTAL),
+	   (int)torrent::get(torrent::THROTTLE_ROOT_CONST_RATE) / 1000,
 	   loops);
 
   refresh();

client/download.cc

@@ -57,20 +57,21 @@ void Download::draw() {
     break;
   }
 
-  mvprintw(maxY - 3, 0, "Torrent: %.1f / %.1f MiB Rate:%5.1f /%5.1f KiB Uploaded: %.1f MiB",
+  mvprintw(maxY - 3, 0, "Torrent: %.1f / %.1f MiB Rate: %5.1f/%5.1f KiB Uploaded: %.1f MiB",
 	   (double)torrent::get(m_dItr, torrent::BYTES_DONE) / 1000000.0,
 	   (double)torrent::get(m_dItr, torrent::BYTES_TOTAL) / 1000000.0,
-	   (double)torrent::get(m_dItr, torrent::RATE_DOWN) / 1000.0,
 	   (double)torrent::get(m_dItr, torrent::RATE_UP) / 1000.0,
+	   (double)torrent::get(m_dItr, torrent::RATE_DOWN) / 1000.0,
 	   (double)torrent::get(m_dItr, torrent::BYTES_UPLOADED) / 1000000.0);
 
 
-  mvprintw(maxY - 2, 0, "Peers: %i(%i) Min/Max: %i/%i Uploads: %i",
+  mvprintw(maxY - 2, 0, "Peers: %i(%i) Min/Max: %i/%i Uploads: %i Throttle: %i KiB",
 	   (int)torrent::get(m_dItr, torrent::PEERS_CONNECTED),
 	   (int)torrent::get(m_dItr, torrent::PEERS_NOT_CONNECTED),
 	   (int)torrent::get(m_dItr, torrent::PEERS_MIN),
 	   (int)torrent::get(m_dItr, torrent::PEERS_MAX),
-	   (int)torrent::get(m_dItr, torrent::UPLOADS_MAX));
+	   (int)torrent::get(m_dItr, torrent::UPLOADS_MAX),
+	   (int)torrent::get(torrent::THROTTLE_ROOT_CONST_RATE) / 1000);
 
   mvprintw(maxY - 1, 0, "Tracker: [%c:%i] %s",
 	   torrent::get(m_dItr, torrent::TRACKER_CONNECTING) ? 'C' : ' ',

client/rtorrent.cc

@@ -39,7 +39,7 @@ void signal_handler(int signum) {
   switch (signum) {
   case SIGINT:
     if (shutdown) {
-      torrent::cleanup();
+      //torrent::cleanup();
       exit(0);
     }
 
@@ -173,53 +173,85 @@ int main(int argc, char** argv) {
     if (!FD_ISSET(0, &rset))
       continue;
 
-    switch (displayState) {
-    case DISPLAY_MAIN:
-      switch (getch()) {
-      case KEY_DOWN:
-	++curDownload;
+    lastDraw -= (1 << 30);
+
+    int c = getch();
+    int64_t constRate = torrent::get(torrent::THROTTLE_ROOT_CONST_RATE);
+
+    switch (c) {
+    case 'a':
+      torrent::set(torrent::THROTTLE_ROOT_CONST_RATE, constRate + 1000);
+      break;
+
+    case 'z':
+      torrent::set(torrent::THROTTLE_ROOT_CONST_RATE, constRate - 1000);
+      break;
+
+    case 's':
+      torrent::set(torrent::THROTTLE_ROOT_CONST_RATE, constRate + 5000);
+      break;
+
+    case 'x':
+      torrent::set(torrent::THROTTLE_ROOT_CONST_RATE, constRate - 5000);
+      break;
+
+    case 'd':
+      torrent::set(torrent::THROTTLE_ROOT_CONST_RATE, constRate + 50000);
+      break;
+
+    case 'c':
+      torrent::set(torrent::THROTTLE_ROOT_CONST_RATE, constRate - 50000);
+      break;
+
+    default:
+      switch (displayState) {
+      case DISPLAY_MAIN:
+	switch (c) {
+	case KEY_DOWN:
+	  ++curDownload;
 
-	break;
+	  break;
 
-      case KEY_UP:
-	--curDownload;
+	case KEY_UP:
+	  --curDownload;
 
-	break;
+	  break;
 
-      case KEY_RIGHT:
-	if (curDownload != torrent::downloads().end()) {
-	  download = Download(curDownload);
-	  displayState = DISPLAY_DOWNLOAD;
+	case KEY_RIGHT:
+	  if (curDownload != torrent::downloads().end()) {
+	    download = Download(curDownload);
+	    displayState = DISPLAY_DOWNLOAD;
+	  }
+
+	  break;
+
+	case 'l':
+	  displayState = DISPLAY_LOG;
+	  break;
+
+	default:
+	  break;
 	}
 
 	break;
 
-      case 'l':
-	displayState = DISPLAY_LOG;
+      case DISPLAY_DOWNLOAD:
+	displayState = download.key(c) ? DISPLAY_DOWNLOAD : DISPLAY_MAIN;
 	break;
 
-      default:
-	break;
+      case DISPLAY_LOG:
+	switch (getch()) {
+	case '\n':
+	case ' ':
+	  displayState = DISPLAY_MAIN;
+	  break;
+	default:
+	  break;
+	}
       }
 
       break;
-
-    case DISPLAY_DOWNLOAD:
-      displayState = download.key(getch()) ? DISPLAY_DOWNLOAD : DISPLAY_MAIN;
-      break;
-
-    case DISPLAY_LOG:
-      switch (getch()) {
-      case '\n':
-      case ' ':
-	displayState = DISPLAY_MAIN;
-	break;
-      default:
-	break;
-      }
     }
-
-    lastDraw -= (1 << 30);
   }
 
   delete display;

torrent/Makefile.am

@@ -32,8 +32,6 @@ libtorrent_la_SOURCES = \
         peer_connection_extra.h \
 	rate.cc \
 	rate.h \
-        service.cc \
-        service.h \
 	settings.cc \
 	settings.h \
         socket_base.cc \
@@ -49,7 +47,9 @@ libtorrent_la_SOURCES = \
         tracker_query.cc \
         tracker_query.h \
         torrent.cc \
-        torrent.h
+        torrent.h \
+        service.cc \
+        service.h
 
 libtorrentincludedir = $(includedir)/torrent
 libtorrentinclude_HEADERS = torrent.h exceptions.h

torrent/peer_connection.cc

@@ -525,8 +525,6 @@ void PeerConnection::parseReadBuf() {
       m_up.list.push_back(Piece(index, offset, length));
       insertWrite();
 
-      m_throttle.activate();
-
     } else if (rItr != m_up.list.end()) {
 
       if (m_up.state != WRITE_MSG || rItr != m_up.list.begin())
@@ -567,14 +565,6 @@ void PeerConnection::fillWriteBuf() {
   if (m_sendChoked) {
     m_sendChoked = false;
 
-    if (m_up.choked) {
-      // Clear the request queue and mmaped chunk.
-      m_up.list.clear();
-      m_up.data = Chunk();
-
-      m_throttle.idle();
-    }
-
     if ((Timer::cache() - m_lastChoked).seconds() < 10) {
       // Wait with the choke message.
       insertService(m_lastChoked + 10 * 1000000,
@@ -585,6 +575,17 @@ void PeerConnection::fillWriteBuf() {
       bufCmd(m_up.choked ? CHOKE : UNCHOKE, 1);
 
       m_lastChoked = Timer::cache();
+
+      if (m_up.choked) {
+	// Clear the request queue and mmaped chunk.
+	m_up.list.clear();
+	m_up.data = Chunk();
+	
+	m_throttle.idle();
+	
+      } else {
+	m_throttle.activate();
+      }
     }
   }
 

torrent/rate.h

@@ -24,8 +24,11 @@ class Rate {
 
     // We don't need to clean up old entries here since bytes() is called
     // every 30 seconds by Download::CHOKE_CYCLE.
-    m_entries.push_front(std::make_pair(Timer::cache(), bytes));
     m_bytes += bytes;
+
+    // Todo: Only create a new entry each seconds or something (right-shift the
+    // time or something)
+    m_entries.push_front(std::make_pair(Timer::cache(), bytes));
   }
 
   bool operator < (Rate& r) {

torrent/settings.cc

@@ -27,8 +27,11 @@ DownloadSettings::DownloadSettings() :
   chokeGracePeriod(55 * 1000000)
 {}
 
-int ThrottleSettings::minPeriod = 500000;
+int ThrottleSettings::minPeriod = 1000000;
 int ThrottleSettings::wakeupPoint = 2048;
+int ThrottleSettings::starvePoint = 2048;
+int ThrottleSettings::starveBuffer = 1024;
+
 int ThrottleSettings::minChunk = 512;
 
 ThrottleSettings::ThrottleSettings() :

torrent/settings.h

@@ -45,6 +45,15 @@ class ThrottleSettings {
 
   static int minPeriod;
   static int wakeupPoint;
+
+  // If greater than 'starvePoint' bytes was left then limit the amount
+  // allocated.
+  static int starvePoint;
+
+  // Each turn give spent + starveBuffer bytes if not starved.
+  static int starveBuffer;
+
+  // Min size of chunks to send out.
   static int minChunk;
 };