~ubuntu-branches/ubuntu/oneiric/libktorrent/oneiric

« back to all changes in this revision

Viewing changes to src/torrent/advancedchokealgorithm.cpp

Committer: Bazaar Package Importer
Author(s): Modestas Vainius
Date: 2011-05-26 00:33:38 UTC
mfrom: (5.1.7 experimental)
Revision ID: james.westby@ubuntu.com-20110526003338-2r4zwyzn8bovsxay

Tags: 1.1.1-2

Release to unstable.

files added:
RoadMap

cmake/modules/FindLibGcrypt.cmake

debian/libktorrent3.install

debian/libktorrent3.symbols

examples

examples/CMakeLists.txt

examples/ktcli

examples/ktcli/CMakeLists.txt

examples/ktcli/ktcli.cpp

examples/ktcli/ktcli.h

examples/ktcli/main.cpp

src/datachecker/CMakeLists.txt

src/datachecker/tests

src/datachecker/tests/CMakeLists.txt

src/datachecker/tests/datacheckertest.cpp

src/diskio/CMakeLists.txt

src/diskio/tests

src/diskio/tests/CMakeLists.txt

src/diskio/tests/chunkmanagertest.cpp

src/download/CMakeLists.txt

src/download/streamingchunkselector.cpp

src/download/streamingchunkselector.h

src/download/tests

src/download/tests/CMakeLists.txt

src/download/tests/streamingchunkselectortest.cpp

src/mse/CMakeLists.txt

src/mse/tests

src/mse/tests/CMakeLists.txt

src/mse/tests/rc4encryptortest.cpp

src/net/serversocket.cpp

src/net/serversocket.h

src/peer/CMakeLists.txt

src/peer/superseeder.cpp

src/peer/superseeder.h

src/peer/tests

src/peer/tests/CMakeLists.txt

src/peer/tests/superseedtest.cpp

src/torrent/tests/torrentfilestreammultitest.cpp

src/torrent/tests/torrentfilestreamtest.cpp

src/torrent/torrentfilestream.cpp

src/torrent/torrentfilestream.h

src/tracker/CMakeLists.txt

src/upnp

src/upnp/CMakeLists.txt

src/upnp/httprequest.cpp

src/upnp/httprequest.h

src/upnp/soap.cpp

src/upnp/soap.h

src/upnp/upnpdescriptionparser.cpp

src/upnp/upnpdescriptionparser.h

src/upnp/upnpmcastsocket.cpp

src/upnp/upnpmcastsocket.h

src/upnp/upnprouter.cpp

src/upnp/upnprouter.h

src/util/resourcemanager.cpp

src/util/resourcemanager.h

src/util/signalcatcher.cpp

src/util/signalcatcher.h

src/util/tests/fileopstest.cpp

src/util/tests/resourcemanagertest.cpp

src/util/tests/signalcatchertest.cpp

src/utp/outputqueue.cpp

src/utp/outputqueue.h

src/utp/utpserver_p.h

testlib

testlib/CMakeLists.txt

testlib/dummytorrentcreator.cpp

testlib/dummytorrentcreator.h

files removed:
debian/libktorrent2.install

debian/libktorrent2.symbols

src/datachecker/datacheckerlistener.cpp

src/datachecker/datacheckerlistener.h

files modified:
CMakeLists.txt

ChangeLog

debian/changelog

debian/control

debian/copyright

debian/rules

po/ar/libktorrent.po

po/ast/libktorrent.po

po/be/libktorrent.po

po/bg/libktorrent.po

po/ca/libktorrent.po

po/ca@valencia/libktorrent.po

po/cs/libktorrent.po

po/da/libktorrent.po

po/de/libktorrent.po

po/el/libktorrent.po

po/en_GB/libktorrent.po

po/eo/libktorrent.po

po/es/libktorrent.po

po/et/libktorrent.po

po/eu/libktorrent.po

po/fi/libktorrent.po

po/fr/libktorrent.po

po/ga/libktorrent.po

po/gl/libktorrent.po

po/hi/libktorrent.po

po/hne/libktorrent.po

po/hr/libktorrent.po

po/hu/libktorrent.po

po/is/libktorrent.po

po/it/libktorrent.po

po/ja/libktorrent.po

po/km/libktorrent.po

po/ku/libktorrent.po

po/lt/libktorrent.po

po/lv/libktorrent.po

po/ms/libktorrent.po

po/nb/libktorrent.po

po/nds/libktorrent.po

po/nl/libktorrent.po

po/nn/libktorrent.po

po/oc/libktorrent.po

po/pl/libktorrent.po

po/pt/libktorrent.po

po/pt_BR/libktorrent.po

po/ro/libktorrent.po

po/ru/libktorrent.po

po/se/libktorrent.po

po/si/libktorrent.po

po/sk/libktorrent.po

po/sl/libktorrent.po

po/sr/libktorrent.po

po/sr@ijekavian/libktorrent.po

po/sr@ijekavianlatin/libktorrent.po

po/sr@latin/libktorrent.po

po/sv/libktorrent.po

po/tr/libktorrent.po

po/uk/libktorrent.po

po/zh_CN/libktorrent.po

po/zh_TW/libktorrent.po

scripts/gen_pkg.rb

src/CMakeLists.txt

src/bcodec/value.h

src/datachecker/datachecker.cpp

src/datachecker/datachecker.h

src/datachecker/datacheckerjob.cpp

src/datachecker/datacheckerjob.h

src/datachecker/datacheckerthread.cpp

src/datachecker/datacheckerthread.h

src/datachecker/multidatachecker.cpp

src/datachecker/multidatachecker.h

src/datachecker/singledatachecker.cpp

src/datachecker/singledatachecker.h

src/dht/announcetask.cpp

src/dht/announcetask.h

src/dht/dht.cpp

src/dht/dht.h

src/dht/kbucket.cpp

src/dht/kbucket.h

src/dht/node.cpp

src/dht/node.h

src/dht/nodelookup.cpp

src/dht/nodelookup.h

src/dht/rpccall.cpp

src/dht/rpccall.h

src/dht/rpcmsg.cpp

src/dht/rpcmsg.h

src/dht/rpcserver.cpp

src/dht/rpcserver.h

src/dht/task.cpp

src/dht/task.h

src/diskio/cache.cpp

src/diskio/cache.h

src/diskio/cachefile.cpp

src/diskio/chunk.cpp

src/diskio/chunk.h

src/diskio/chunkmanager.cpp

src/diskio/chunkmanager.h

src/diskio/dndfile.cpp

src/diskio/movedatafilesjob.cpp

src/diskio/movedatafilesjob.h

src/diskio/multifilecache.cpp

src/diskio/multifilecache.h

src/diskio/piecedata.cpp

src/diskio/piecedata.h

src/diskio/singlefilecache.cpp

src/diskio/singlefilecache.h

src/download/chunkdownload.cpp

src/download/chunkdownload.h

src/download/chunkselector.cpp

src/download/chunkselector.h

src/download/downloader.cpp

src/download/downloader.h

src/download/httpconnection.cpp

src/download/httpconnection.h

src/download/packet.cpp

src/download/webseed.cpp

src/download/webseed.h

src/interfaces/chunkselectorinterface.cpp

src/interfaces/chunkselectorinterface.h

src/interfaces/peerinterface.cpp

src/interfaces/peerinterface.h

src/interfaces/piecedownloader.h

src/interfaces/serverinterface.cpp

src/interfaces/serverinterface.h

src/interfaces/torrentfileinterface.cpp

src/interfaces/torrentfileinterface.h

src/interfaces/torrentinterface.h

src/interfaces/trackerinterface.cpp

src/interfaces/trackerinterface.h

src/magnet/magnetdownloader.cpp

src/magnet/magnetdownloader.h

src/magnet/magnetlink.cpp

src/magnet/magnetlink.h

src/magnet/tests/magnetlinktest.cpp

src/mse/encryptedauthenticate.cpp

src/mse/encryptedauthenticate.h

src/mse/encryptedserverauthenticate.cpp

src/mse/encryptedserverauthenticate.h

src/mse/rc4encryptor.cpp

src/mse/rc4encryptor.h

src/mse/streamsocket.cpp

src/mse/streamsocket.h

src/net/CMakeLists.txt

src/net/downloadthread.h

src/net/socket.cpp

src/net/socket.h

src/net/socketdevice.cpp

src/net/socketdevice.h

src/net/socketmonitor.cpp

src/net/socketmonitor.h

src/net/socks.cpp

src/net/socks.h

src/net/uploadthread.h

src/net/wakeuppipe.cpp

src/peer/authenticate.cpp

src/peer/authenticate.h

src/peer/authenticatebase.cpp

src/peer/authenticatebase.h

src/peer/authenticationmonitor.cpp

src/peer/authenticationmonitor.h

src/peer/chunkcounter.h

src/peer/packetreader.cpp

src/peer/packetreader.h

src/peer/packetwriter.cpp

src/peer/peer.cpp

src/peer/peer.h

src/peer/peerconnector.cpp

src/peer/peerconnector.h

src/peer/peerdownloader.cpp

src/peer/peermanager.cpp

src/peer/peermanager.h

src/peer/peeruploader.cpp

src/peer/peeruploader.h

src/peer/serverauthenticate.cpp

src/peer/serverauthenticate.h

src/peer/utpex.cpp

src/peer/utpex.h

src/torrent/CMakeLists.txt

src/torrent/advancedchokealgorithm.cpp

src/torrent/globals.cpp

src/torrent/job.cpp

src/torrent/job.h

src/torrent/jobqueue.cpp

src/torrent/server.cpp

src/torrent/server.h

src/torrent/tests/CMakeLists.txt

src/torrent/timeestimator.cpp

src/torrent/torrent.cpp

src/torrent/torrentcontrol.cpp

src/torrent/torrentcontrol.h

src/torrent/torrentfile.cpp

src/torrent/torrentfile.h

src/torrent/torrentstats.cpp

src/torrent/torrentstats.h

src/torrent/uploader.cpp

src/torrent/uploader.h

src/tracker/httpannouncejob.cpp

src/tracker/httpannouncejob.h

src/tracker/httptracker.cpp

src/tracker/udptracker.cpp

src/tracker/udptracker.h

src/tracker/udptrackersocket.cpp

src/tracker/udptrackersocket.h

src/util/CMakeLists.txt

src/util/file.cpp

src/util/file.h

src/util/fileops.cpp

src/util/fileops.h

src/util/functions.cpp

src/util/functions.h

src/util/log.cpp

src/util/log.h

src/util/pipe.cpp

src/util/sha1hashgen.cpp

src/util/sha1hashgen.h

src/util/tests/CMakeLists.txt

src/util/waitjob.cpp

src/util/waitjob.h

src/utp/connection.cpp

src/utp/connection.h

src/utp/delaywindow.cpp

src/utp/delaywindow.h

src/utp/localwindow.cpp

src/utp/localwindow.h

src/utp/pollpipe.h

src/utp/remotewindow.cpp

src/utp/remotewindow.h

src/utp/tests/congestiontest.cpp

src/utp/tests/connectiontest.cpp

src/utp/tests/connecttest.cpp

src/utp/tests/fintest.cpp

src/utp/tests/localwindowtest.cpp

src/utp/tests/packetlosstest.cpp

src/utp/tests/remotewindowtest.cpp

src/utp/tests/sendtest.cpp

src/utp/tests/sockettest.cpp

src/utp/tests/transmittest.cpp

src/utp/tests/utppolltest.cpp

src/utp/utpserver.cpp

src/utp/utpserver.h

src/utp/utpserverthread.cpp

src/utp/utpsocket.cpp

src/utp/utpsocket.h

src/version.cpp

src/version.h

Show diffs side-by-side

added added

removed removed

src/torrent/advancedchokealgorithm.cpp

124

125

void AdvancedChokeAlgorithm::doChokingLeechingState(PeerManager & pman,ChunkManager & cman,const TorrentStats & stats)

126

{

127

QList<Peer*> ppl;

128

Uint32 np = pman.getNumConnectedPeers();

129

// add all non seeders

130

for (Uint32 i = 0;i < np;i++)

127

QList<Peer*> ppl = pman.getPeers();

128

for (QList<Peer*>::iterator i = ppl.begin();i != ppl.end();)

131

129

{

132

Peer* p = pman.getPeer(i);

133

if (p)

130

Peer* p = *i;

131

if (!calcACAScore(p,cman,stats))

134

132

{

135

if (calcACAScore(p,cman,stats))

136

ppl.append(p);

137

else

138

// choke seeders they do not want to download from us anyway

139

p->choke();

133

// choke seeders they do not want to download from us anyway

134

p->choke();

135

i = ppl.erase(i);

140

136

}

137

else

138

i++;

141

139

}

142

140

143

141

// sort list by ACA score

180

178

181

179

void AdvancedChokeAlgorithm::doChokingSeedingState(PeerManager & pman,ChunkManager & cman,const TorrentStats & stats)

182

180

{

183

QList<Peer*> ppl;

184

Uint32 np = pman.getNumConnectedPeers();

185

// add all non seeders

186

for (Uint32 i = 0;i < np;i++)

181

QList<Peer*> ppl = pman.getPeers();

182

for (QList<Peer*>::iterator i = ppl.begin();i != ppl.end();)

187

183

{

188

Peer* p = pman.getPeer(i);

189

if (p)

184

Peer* p = *i;

185

if (!calcACAScore(p,cman,stats))

190

186

{

191

// update the ACA score in the process

192

if (calcACAScore(p,cman,stats))

193

ppl.append(p);

194

else

195

// choke seeders they do not want to download from us anyway

196

p->choke();

187

// choke seeders they do not want to download from us anyway

188

p->choke();

189

i = ppl.erase(i);

197

190

}

191

else

192

i++;

198

193

}

194

199

195

qSort(ppl.begin(), ppl.end(),UploadRateGreaterThan);

200

196

201

197

doUnchoking(ppl,updateOptimisticPeer(pman,ppl));

203

199

204

200

static Uint32 FindPlannedOptimisticUnchokedPeer(PeerManager& pman,const QList<Peer*> & ppl)

205

201

{

206

Uint32 num_peers = pman.getNumConnectedPeers();

202

Uint32 num_peers = ppl.size();

207

203

if (num_peers == 0)

208

204

return UNDEFINED_ID;

209

205

210

206

// find a random peer that is choked and interested

211

207

Uint32 start = KRandom::random() % num_peers;

212

208

Uint32 i = (start + 1) % num_peers;

213

209

while (i != start)

214

210

{

215

Peer* p = pman.getPeer(i);

211

Peer* p = ppl.at(i);

216

212

if (p && p->isChoked() && p->isInterested() && !p->isSeeder() && ppl.contains(p))

217

213

return p->getID();

218

214

i = (i + 1) % num_peers;

Older »