Changeset 1172

Timestamp:

08/25/10 03:14:19 (18 months ago)

Author:

rakshasa

Message:

* Some debugging tools added.

Location:

trunk

Files:

• libtorrent/src/data/chunk.cc (modified) (2 diffs)
• libtorrent/src/data/chunk.h (modified) (1 diff)
• libtorrent/src/data/chunk_part.cc (modified) (1 diff)
• libtorrent/src/data/chunk_part.h (modified) (1 diff)
• libtorrent/src/protocol/peer_connection_base.cc (modified) (4 diffs)
• rtorrent/doc/debugging (added)
• rtorrent/doc/log_rtorrent.sh (added)
• rtorrent/doc/log_stats.plot (added)
• rtorrent/src/command_network.cc (modified) (1 diff)

trunk/libtorrent/src/data/chunk.cc

@@ -114 +114 @@
 
 uint32_t
-Chunk::incore_length(uint32_t pos) {
-  uint32_t lengthIncore = 0;
+Chunk::incore_length(uint32_t pos, uint32_t length) {
+  uint32_t result = 0;
   iterator itr = at_position(pos);
 
@@ -121 +121 @@
     throw internal_error("Chunk::incore_length(...) at end()");
 
-  do {
-    uint32_t length = itr->incore_length(pos);
-
-    pos += length;
-    lengthIncore += length;
+  length = std::min(length, chunk_size() - pos);
+
+  do {
+    uint32_t incore_len = itr->incore_length(pos, length);
+
+    if (incore_len > length)
+      throw internal_error("Chunk::incore_length(...) incore_len > length.");
+
+    pos += incore_len;
+    length -= incore_len;
+    result += incore_len;
 
   } while (pos == itr->position() + itr->size() && ++itr != end());
 
-  return lengthIncore;
+  return result;
 }
 

trunk/libtorrent/src/data/chunk.h

@@ -85 +85 @@
 
   // Check how much of the chunk is incore from pos.
-  uint32_t            incore_length(uint32_t pos);
+  uint32_t            incore_length(uint32_t pos, uint32_t length = ~uint32_t());
 
   bool                sync(int flags);

trunk/libtorrent/src/data/chunk_part.cc

@@ -62 +62 @@
 
 uint32_t
-ChunkPart::incore_length(uint32_t pos) {
+ChunkPart::incore_length(uint32_t pos, uint32_t length) {
   // Do we want to use this?
-  pos -= m_position;
+  length = std::min(length, remaining_from(pos));
+  pos = pos - m_position;
 
   if (pos >= size())
     throw internal_error("ChunkPart::incore_length(...) got invalid position");
 
-  int length = size() - pos;
   int touched = m_chunk.pages_touched(pos, length);
   char buf[touched];

trunk/libtorrent/src/data/chunk_part.h

@@ -65 +65 @@
   uint32_t            position() const                      { return m_position; }
 
-  uint32_t            incore_length(uint32_t pos);
+  uint32_t            remaining_from(uint32_t pos) const    { return size() - (pos - m_position); }
+
+  uint32_t            incore_length(uint32_t pos, uint32_t length = ~uint32_t());
 
 private:

trunk/libtorrent/src/protocol/peer_connection_base.cc

@@ -38 +38 @@
 
 #include <cstdio>
+#include <fcntl.h>
 #include <rak/error_number.h>
+#include <rak/string_manip.h>
 
 #include "torrent/exceptions.h"
@@ -277 +279 @@
 }
 
+inline static void
+log_upload_chunk_mincore(Chunk* chunk, const Piece& piece, bool new_index) {
+#ifdef LT_LOG_MINCORE_FILE
+  static int mincore_fd = -1;
+  static int32_t ticker = rak::timer::current().seconds() / 10 * 10;
+
+  static int counter_incore = 0;
+  static int counter_not_incore = 0;
+  static int counter_incore_new = 0;
+  static int counter_not_incore_new = 0;
+
+  if (rak::timer::current().seconds() >= ticker + 10) {
+    char buffer[256];
+
+    if (mincore_fd == -1) {
+      snprintf(buffer, 256, "%s.%u", LT_LOG_MINCORE_FILE, getpid());
+    
+      if ((mincore_fd = open(buffer, O_WRONLY | O_CREAT | O_TRUNC)) == -1)
+        throw internal_error("Could not open mincore log file.");
+    }
+
+    // Log the result of mincore for every piece uploaded to a file.
+    unsigned int buf_lenght = snprintf(buffer, 256, "%i %u %u %u %u\n",
+                                       ticker, counter_incore, counter_incore_new, counter_not_incore, counter_not_incore_new);
+
+    write(mincore_fd, buffer, buf_lenght);
+    
+    ticker = rak::timer::current().seconds() / 10 * 10;
+
+    counter_incore = 0;
+    counter_not_incore = 0;
+    counter_incore_new = 0;
+    counter_not_incore_new = 0;
+  }
+
+  bool is_incore = (chunk->incore_length(piece.offset(), piece.length()) == piece.length());
+
+  counter_incore += !new_index && is_incore;
+  counter_incore_new += new_index && is_incore;
+  counter_not_incore += !new_index && !is_incore;
+  counter_not_incore_new += new_index && !is_incore;
+#endif
+}
+
 void
 PeerConnectionBase::load_up_chunk() {
@@ -282 +328 @@
     // Better checking needed.
     //     m_upChunk.chunk()->preload(m_upPiece.offset(), m_upChunk.chunk()->size());
+    log_upload_chunk_mincore(m_upChunk.chunk(), m_upPiece, false);
     return;
   }
@@ -296 +343 @@
     m_encryptBuffer->reset();
   }
+
+  log_upload_chunk_mincore(m_upChunk.chunk(), m_upPiece, true);
 
   // Also check if we've already preloaded in the recent past, even

trunk/rtorrent/src/command_network.cc

@@ -421 +421 @@
   CMD2_VAR_STRING("connection_seed", "seed");
 
+  CMD2_ANY         ("throttle.unchoked_uploads", std::tr1::bind(&torrent::currently_unchoked));
+  CMD2_ANY         ("throttle.unchoked_downloads", std::tr1::bind(&torrent::download_unchoked));
+
   CMD2_VAR_VALUE   ("throttle.min_peers.normal", 40);
   CMD2_VAR_VALUE   ("throttle.max_peers.normal", 100);