diff options
| author | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2010-02-28 12:30:11 +0000 |
|---|---|---|
| committer | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2010-02-28 12:30:11 +0000 |
| commit | c342bde9627b434effbc0cd10b817670d1da0923 (patch) | |
| tree | 60d14bf448066b8dcd639adfa0db716d5a8258c8 /src/TrackerWatcherCommand.cc | |
| parent | 135f0a2a8c4ee04a5e96d84ba558245fabfc1f5c (diff) | |
2010-02-28 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>
Use vector instead of deque for containers which is used for
mostly read-only purpose.
Diffstat (limited to 'src/TrackerWatcherCommand.cc')
| -rw-r--r-- | src/TrackerWatcherCommand.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/TrackerWatcherCommand.cc b/src/TrackerWatcherCommand.cc index 39ed0fb0..f9875b0b 100644 --- a/src/TrackerWatcherCommand.cc +++ b/src/TrackerWatcherCommand.cc @@ -99,7 +99,7 @@ bool TrackerWatcherCommand::execute() { if(_trackerRequestGroup.isNull()) { _trackerRequestGroup = createAnnounce(); if(!_trackerRequestGroup.isNull()) { - std::deque<Command*> commands; + std::vector<Command*> commands; try { _trackerRequestGroup->createInitialCommand(commands, e); } catch(RecoverableException& ex) { @@ -140,7 +140,7 @@ bool TrackerWatcherCommand::execute() { } std::string TrackerWatcherCommand::getTrackerResponse -(const RequestGroupHandle& requestGroup) +(const SharedHandle<RequestGroup>& requestGroup) { std::stringstream strm; unsigned char data[2048]; @@ -164,7 +164,7 @@ void TrackerWatcherCommand::processTrackerResponse (reinterpret_cast<const unsigned char*>(trackerResponse.c_str()), trackerResponse.size()); while(!_btRuntime->isHalt() && _btRuntime->lessThanMinPeers()) { - PeerHandle peer = _peerStorage->getUnusedPeer(); + SharedHandle<Peer> peer = _peerStorage->getUnusedPeer(); if(peer.isNull()) { break; } @@ -182,8 +182,8 @@ void TrackerWatcherCommand::processTrackerResponse } } -RequestGroupHandle TrackerWatcherCommand::createAnnounce() { - RequestGroupHandle rg; +SharedHandle<RequestGroup> TrackerWatcherCommand::createAnnounce() { + SharedHandle<RequestGroup> rg; if(_btAnnounce->isAnnounceReady()) { rg = createRequestGroup(_btAnnounce->getAnnounceUrl()); _btAnnounce->announceStart(); // inside it, trackers++. @@ -209,12 +209,12 @@ static bool backupTrackerIsAvailable } } -RequestGroupHandle +SharedHandle<RequestGroup> TrackerWatcherCommand::createRequestGroup(const std::string& uri) { - std::deque<std::string> uris; + std::vector<std::string> uris; uris.push_back(uri); - RequestGroupHandle rg(new RequestGroup(getOption())); + SharedHandle<RequestGroup> rg(new RequestGroup(getOption())); // If backup tracker is available, only try 2 times for each tracker // and if they all fails, then try next one. if(backupTrackerIsAvailable(_requestGroup->getDownloadContext())) { |