Cleanup RequestGroup code a bit

This commit is contained in:
Nils Maier 2013-08-25 21:00:37 +02:00
parent 3590077d5c
commit 29d569eef9
2 changed files with 469 additions and 472 deletions

File diff suppressed because it is too large Load Diff

View File

@ -194,8 +194,8 @@ private:
// returns error_code::UNKNOWN_ERROR. // returns error_code::UNKNOWN_ERROR.
error_code::Value downloadResult() const; error_code::Value downloadResult() const;
void removeDefunctControlFile void removeDefunctControlFile(
(const std::shared_ptr<BtProgressInfoFile>& progressInfoFile); const std::shared_ptr<BtProgressInfoFile>& progressInfoFile);
public: public:
RequestGroup(const std::shared_ptr<GroupId>& gid, RequestGroup(const std::shared_ptr<GroupId>& gid,
@ -218,9 +218,8 @@ public:
void createInitialCommand(std::vector<std::unique_ptr<Command>>& commands, void createInitialCommand(std::vector<std::unique_ptr<Command>>& commands,
DownloadEngine* e); DownloadEngine* e);
void createNextCommandWithAdj void createNextCommandWithAdj(std::vector<std::unique_ptr<Command>>& commands,
(std::vector<std::unique_ptr<Command>>& commands, DownloadEngine* e, int numAdj);
DownloadEngine* e, int numAdj);
void createNextCommand(std::vector<std::unique_ptr<Command>>& commands, void createNextCommand(std::vector<std::unique_ptr<Command>>& commands,
DownloadEngine* e, int numCommand); DownloadEngine* e, int numCommand);
@ -290,7 +289,8 @@ public:
void setPieceStorage(const std::shared_ptr<PieceStorage>& pieceStorage); void setPieceStorage(const std::shared_ptr<PieceStorage>& pieceStorage);
void setProgressInfoFile(const std::shared_ptr<BtProgressInfoFile>& progressInfoFile); void setProgressInfoFile(
const std::shared_ptr<BtProgressInfoFile>& progressInfoFile);
void increaseStreamCommand(); void increaseStreamCommand();
@ -385,10 +385,10 @@ public:
void clearPreDownloadHandler(); void clearPreDownloadHandler();
void processCheckIntegrityEntry void processCheckIntegrityEntry(
(std::vector<std::unique_ptr<Command>>& commands, std::vector<std::unique_ptr<Command>>& commands,
std::unique_ptr<CheckIntegrityEntry> entry, std::unique_ptr<CheckIntegrityEntry> entry,
DownloadEngine* e); DownloadEngine* e);
// Initializes pieceStorage_ and segmentMan_. We guarantee that // Initializes pieceStorage_ and segmentMan_. We guarantee that
// either both of pieceStorage_ and segmentMan_ are initialized or // either both of pieceStorage_ and segmentMan_ are initialized or