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

« back to all changes in this revision

Viewing changes to src/download/chunkdownload.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/download/chunkdownload.cpp

#include <util/file.h>

#include <util/log.h>

#include <util/array.h>

#include <util/error.h>

#include <diskio/chunk.h>

#include <diskio/piecedata.h>

#include <download/piece.h>

pieces = BitSet(num);

pieces.clear();

piece_data = new PieceDataPtr[num]; // array of pointers to the piece data

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

{

piece_data[i] = 0;

}

piece_data = new PieceData::Ptr[num]; // array of pointers to the piece data

dstatus.setAutoDelete(true);

102

timer.update();

103

104

100

Uint32 pp = p.getOffset() / MAX_PIECE_LEN;

105

if (pieces.get(pp))

101

Uint32 len = pp == num - 1 ? last_size : MAX_PIECE_LEN;

102

if (pp >= num || pieces.get(pp) || p.getLength() != len)

106

103

return false;

107

104

108

105

110

107

if (ds)

111

108

ds->remove(pp);

112

109

113

PieceDataPtr buf = chunk->getPiece(p.getOffset(),p.getLength(),false);

114

if (buf)

115

{

110

PieceData::Ptr buf = chunk->getPiece(p.getOffset(),p.getLength(),false);

111

if (buf && buf->write(p.getData(),p.getLength()) == p.getLength())

112

{

116

113

piece_data[pp] = buf;

117

114

ok = true;

118

memcpy(buf->data(),p.getData(),p.getLength());

119

115

pieces.set(pp,true);

120

116

piece_providers.insert(p.getPieceDownloader());

121

117

num_downloaded++;

166

162

return true;

167

163

}

168

164

165

void ChunkDownload::release(PieceDownloader* pd)

166

{

167

if (!pdown.contains(pd))

168

return;

169

170

pd->release();

171

sendCancels(pd);

172

disconnect(pd,SIGNAL(timedout(const bt::Request& )),this,SLOT(onTimeout(const bt::Request& )));

173

disconnect(pd,SIGNAL(rejected( const bt::Request& )),this,SLOT(onRejected( const bt::Request& )));

174

dstatus.erase(pd);

175

pdown.removeAll(pd);

176

}

177

178

169

179

void ChunkDownload::notDownloaded(const Request & r,bool reject)

170

180

{

171

181

// find the peer

399

409

// save how many PieceHeader structs are to be written

400

410

Uint32 num_pieces_to_follow = 0;

401

411

for (Uint32 i = 0;i < hdr.num_bits;i++)

402

if (piece_data[i])

412

if (piece_data[i] && piece_data[i]->ok())

403

413

num_pieces_to_follow++;

404

414

405

415

file.write(&num_pieces_to_follow,sizeof(Uint32));

407

417

// save all buffered pieces

408

418

for (Uint32 i = 0;i < hdr.num_bits;i++)

409

419

{

410

if (!piece_data[i])

420

if (!piece_data[i] || !piece_data[i]->ok())

411

421

continue;

412

422

413

PieceDataPtr pd = piece_data[i];

423

PieceData::Ptr pd = piece_data[i];

414

424

PieceHeader phdr;

415

425

phdr.piece = i;

416

426

phdr.size = pd->length();

418

428

file.write(&phdr,sizeof(PieceHeader));

419

429

if (!pd->mapped()) // buffered pieces need to be saved

420

430

{

421

file.write(pd->data(),pd->length());

431

pd->writeToFile(file,pd->length());

422

432

}

423

433

}

424

434

}

447

457

if (phdr.piece >= num)

448

458

return false;

449

459

450

PieceDataPtr p = chunk->getPiece(phdr.piece * MAX_PIECE_LEN,phdr.size,false);

460

PieceData::Ptr p = chunk->getPiece(phdr.piece * MAX_PIECE_LEN,phdr.size,false);

451

461

if (!p)

452

462

return false;

453

463

454

464

if (!phdr.mapped)

455

465

{

456

if (file.read(p->data(),p->length()) != p->length())

466

if (p->readFromFile(file,p->length()) != p->length())

457

467

{

458

468

return false;

459

469

}

544

554

545

555

for (Uint32 i = num_pieces_in_hash;i < nn;i++)

546

556

{

547

PieceDataPtr piece = piece_data[i];

557

PieceData::Ptr piece = piece_data[i];

548

558

Uint32 len = i == num - 1 ? last_size : MAX_PIECE_LEN;

549

559

if (!piece)

550

560

piece = chunk->getPiece(i*MAX_PIECE_LEN,len,true);

551

561

552

piece_data[i] = 0;

553

if (piece)

562

if (piece && piece->ok())

554

563

{

555

hash_gen.update(piece->data(),len);

564

piece->updateHash(hash_gen);

556

565

chunk->savePiece(piece);

557

566

}

558

567

}

Older »