optimistic hash skipping

git-svn-id: https://ttuki.vtt.fi/svn/p2p-next/TUD/p2tp/trunk@534 e16421f0-f15b-0410-abcd-98678b794739

diff --git a/p2tp.cpp b/p2tp.cpp
index b8f41d3..3f0243e 100644 (file)
--- a/p2tp.cpp
+++ b/p2tp.cpp
@@ -37,6 +37,7 @@ PeerSelector* Channel::peer_selector = new SimpleSelector();
 Channel::Channel       (FileTransfer* transfer, int socket, Address peer_addr) :
        transfer_(transfer), peer_(peer_addr), peer_channel_id_(0), pex_out_(0),
     socket_(socket==-1?sockets[0]:socket), // FIXME
+    data_out_cap_(bin64_t::ALL),
     own_id_mentioned_(false), next_send_time_(0), last_send_time_(0),
     last_recv_time_(0), rtt_avg_(TINT_SEC), dev_avg_(0), dip_avg_(TINT_SEC)
 {

diff --git a/p2tp.h b/p2tp.h
index 180d075..12940f2 100644 (file)
--- a/p2tp.h
+++ b/p2tp.h
@@ -249,10 +249,11 @@ namespace p2tp {
                tintbin         data_in_;
         /** The history of data sent and still unacknowledged. */
         tbqueue     data_out_;
+        bin64_t     data_out_cap_;
         /** Index in the history array. */
                bins        ack_out_;
                /**     Transmit schedule: in most cases filled with the peer's hints */
-               binqueue    hint_in_;
+               tbqueue    hint_in_;
                /** Hints sent (to detect and reschedule ignored hints). */
                tbqueue         hint_out_;
                /** The congestion control strategy. */

diff --git a/sendrecv.cpp b/sendrecv.cpp
index 7610ed8..5a91e65 100644 (file)
--- a/sendrecv.cpp
+++ b/sendrecv.cpp
@@ -40,7 +40,8 @@ void  Channel::AddPeakHashes (Datagram& dgram) {
 
 void   Channel::AddUncleHashes (Datagram& dgram, bin64_t pos) {
     bin64_t peak = file().peak_for(pos);
-    while (pos!=peak && ack_in_.get(pos.parent())==bins::EMPTY) {
+    while (pos!=peak && !data_out_cap_.within(pos.parent()) &&
+            ack_in_.get(pos.parent())==bins::EMPTY) {
         bin64_t uncle = pos.sibling();
                dgram.Push8(P2TP_HASH);
                dgram.Push32((uint32_t)uncle);
@@ -55,8 +56,11 @@ void Channel::AddUncleHashes (Datagram& dgram, bin64_t pos) {
 bin64_t                Channel::DequeueHint () { // TODO: resilience
     bin64_t send = bin64_t::NONE;
     while (!hint_in_.empty() && send==bin64_t::NONE) {
-        bin64_t hint = hint_in_.front();
+        bin64_t hint = hint_in_.front().bin;
+        tint time = hint_in_.front().time;
         hint_in_.pop_front();
+        if (time < NOW-8*rtt_avg_)
+            continue;
         send = file().ack_out().find_filtered
             (ack_in_,hint,0,bins::FILLED);
         dprintf("%s #%i dequeued %lli\n",tintstr(),id,send.base_offset());
@@ -102,8 +106,10 @@ void    Channel::ClearStaleDataOut() {
     while ( data_out_.size() && data_out_.front().time < 
            NOW - rtt_avg_ - dev_avg_*4 )
         data_out_.pop_front();
-    if (data_out_.size()!=oldsize)
+    if (data_out_.size()!=oldsize) {
         cc_->OnAckRcvd(bin64_t::NONE);
+        data_out_cap_ = bin64_t::ALL;
+    }
     while (data_out_.size() && ack_in_.get(data_out_.front().bin)==bins::FILLED)
         data_out_.pop_front();
 }
@@ -220,6 +226,7 @@ bin64_t             Channel::AddData (Datagram& dgram) {
     dgram.Push(buf,r);
     dprintf("%s #%i +data (%lli)\n",tintstr(),id,tosend.base_offset());
     data_out_.push_back(tosend);
+    data_out_cap_ = tosend;
     // FIXME BUG this makes data_out_ all stale  ack_in_.set(tosend);
        return tosend;
 }
@@ -307,7 +314,7 @@ bin64_t Channel::OnData (Datagram& dgram) {
     if (ok) {
         data_in_ = tintbin(NOW,pos);
         if (last_recv_time_) {
-            tint dip = NOW - last_recv_time_;
+            tint dip = NOW - last_recv_time_; // FIXME: was it an ACK?
             dip_avg_ = ( dip_avg_*3 + dip ) >> 2;
         }
         transfer().picker().Received(pos); // so dirty; FIXME FIXME FIXME