Massively reduce CPU when Readers are blocked on unavailable data

diff --git a/reader.go b/reader.go
index 999bd70d5a5b781fe3b6bc8c9290f2a0b662661f..b73b8bad4aeb57865086189a67f76ca26bc82616 100644 (file)
--- a/reader.go
+++ b/reader.go
@@ -98,7 +98,6 @@ func (r *Reader) tickleClient() {
 func (r *Reader) waitReadable(off int64) {
        // We may have been sent back here because we were told we could read but
        // it failed.
-       r.tickleClient()
        r.t.cl.event.Wait()
 }
 

diff --git a/t.go b/t.go
index 8454d02bec73d9f9dbf3ee7d1c28d89132d0e47a..ed810a5fd08d98d3d1f50babbc1063105d7c851e 100644 (file)
--- a/t.go
+++ b/t.go
@@ -36,7 +36,6 @@ func (t *Torrent) NewReader() (ret *Reader) {
                t:         t,
                readahead: 5 * 1024 * 1024,
        }
-       ret.pieces = ret.piecesUncached()
        t.addReader(ret)
        return
 }