Changeset 1172 for trunk/libtorrent/src/data/chunk.cc

Timestamp:

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

Author:

rakshasa

Message:

* Some debugging tools added.

Files:

• trunk/libtorrent/src/data/chunk.cc (modified) (2 diffs)

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;
 }