summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/AnnounceList.cc4
-rw-r--r--src/BtDependency.cc4
-rw-r--r--src/BtLeecherStateChoke.cc6
-rw-r--r--src/BtSeederStateChoke.cc3
-rw-r--r--src/DHTConnectionImpl.cc3
-rw-r--r--src/DefaultBtRequestFactory.cc5
-rw-r--r--src/DefaultPieceStorage.cc4
-rw-r--r--src/MetalinkEntry.cc4
-rw-r--r--src/PeerListenCommand.cc3
-rw-r--r--src/PieceStatMan.cc4
-rw-r--r--src/RequestGroup.cc4
-rw-r--r--src/download_helper.cc4
12 files changed, 22 insertions, 26 deletions
diff --git a/src/AnnounceList.cc b/src/AnnounceList.cc
index 2fb1d351..b65106d3 100644
--- a/src/AnnounceList.cc
+++ b/src/AnnounceList.cc
@@ -222,8 +222,8 @@ void AnnounceList::moveToCompletedAllowedTier() {
void AnnounceList::shuffle() {
for (const auto& tier: tiers_) {
auto& urls = tier->urls;
- std::random_shuffle(std::begin(urls), std::end(urls),
- *SimpleRandomizer::getInstance());
+ std::shuffle(std::begin(urls), std::end(urls),
+ *SimpleRandomizer::getInstance());
}
}
diff --git a/src/BtDependency.cc b/src/BtDependency.cc
index 58d559e4..084b0f5b 100644
--- a/src/BtDependency.cc
+++ b/src/BtDependency.cc
@@ -120,8 +120,8 @@ bool BtDependency::resolve()
context->getFileEntries();
for (auto &fe : fileEntries) {
auto &uri = fe->getRemainingUris();
- std::random_shuffle(std::begin(uri), std::end(uri),
- *SimpleRandomizer::getInstance());
+ std::shuffle(std::begin(uri), std::end(uri),
+ *SimpleRandomizer::getInstance());
}
const std::vector<std::shared_ptr<FileEntry> >& dependantFileEntries =
dependant_->getDownloadContext()->getFileEntries();
diff --git a/src/BtLeecherStateChoke.cc b/src/BtLeecherStateChoke.cc
index dd352926..ba7a09f4 100644
--- a/src/BtLeecherStateChoke.cc
+++ b/src/BtLeecherStateChoke.cc
@@ -152,8 +152,7 @@ void BtLeecherStateChoke::plannedOptimisticUnchoke
auto i = std::partition(peerEntries.begin(), peerEntries.end(),
PeerFilter(true, true));
if(i != peerEntries.begin()) {
- std::random_shuffle(peerEntries.begin(), i,
- *SimpleRandomizer::getInstance());
+ std::shuffle(peerEntries.begin(), i, *SimpleRandomizer::getInstance());
(*peerEntries.begin()).enableOptUnchoking();
A2_LOG_INFO(fmt("POU: %s",
(*peerEntries.begin()).getPeer()->getIPAddress().c_str()));
@@ -183,8 +182,7 @@ void BtLeecherStateChoke::regularUnchoke(std::vector<PeerEntry>& peerEntries)
}
}
if(fastOptUnchoker) {
- std::random_shuffle(peerIter, peerEntries.end(),
- *SimpleRandomizer::getInstance());
+ std::shuffle(peerIter, peerEntries.end(), *SimpleRandomizer::getInstance());
for (auto& p : peerEntries) {
if(p.getPeer()->peerInterested()) {
p.enableOptUnchoking();
diff --git a/src/BtSeederStateChoke.cc b/src/BtSeederStateChoke.cc
index 29e4cc10..5839ce7d 100644
--- a/src/BtSeederStateChoke.cc
+++ b/src/BtSeederStateChoke.cc
@@ -141,8 +141,7 @@ void BtSeederStateChoke::unchoke
std::for_each(peers.begin(), peers.end(),
std::mem_fn(&PeerEntry::disableOptUnchoking));
if(r != peers.end()) {
- std::random_shuffle(r, peers.end(),
- *SimpleRandomizer::getInstance());
+ std::shuffle(r, peers.end(), *SimpleRandomizer::getInstance());
(*r).getPeer()->optUnchoking(true);
A2_LOG_INFO(fmt("POU: %s", (*r).getPeer()->getIPAddress().c_str()));
}
diff --git a/src/DHTConnectionImpl.cc b/src/DHTConnectionImpl.cc
index 89898423..b7abd417 100644
--- a/src/DHTConnectionImpl.cc
+++ b/src/DHTConnectionImpl.cc
@@ -61,8 +61,7 @@ bool DHTConnectionImpl::bind
while(sgl.hasNext()) {
ports.push_back(sgl.next());
}
- std::random_shuffle(ports.begin(), ports.end(),
- *SimpleRandomizer::getInstance());
+ std::shuffle(ports.begin(), ports.end(), *SimpleRandomizer::getInstance());
for (const auto& p : ports) {
port = p;
if(bind(port, addr)) {
diff --git a/src/DefaultBtRequestFactory.cc b/src/DefaultBtRequestFactory.cc
index 136f7689..beaac7de 100644
--- a/src/DefaultBtRequestFactory.cc
+++ b/src/DefaultBtRequestFactory.cc
@@ -211,9 +211,8 @@ DefaultBtRequestFactory::createRequestMessagesOnEndGame(size_t max)
}
}
}
- std::random_shuffle(std::begin(missingBlockIndexes),
- std::end(missingBlockIndexes),
- *SimpleRandomizer::getInstance());
+ std::shuffle(std::begin(missingBlockIndexes), std::end(missingBlockIndexes),
+ *SimpleRandomizer::getInstance());
for(auto bitr = std::begin(missingBlockIndexes),
eoi2 = std::end(missingBlockIndexes);
bitr != eoi2 && requests.size() < max; ++bitr) {
diff --git a/src/DefaultPieceStorage.cc b/src/DefaultPieceStorage.cc
index c8932810..012cf12b 100644
--- a/src/DefaultPieceStorage.cc
+++ b/src/DefaultPieceStorage.cc
@@ -67,6 +67,7 @@
#include "Notifier.h"
#include "WrDiskCache.h"
#include "RequestGroup.h"
+#include "SimpleRandomizer.h"
#ifdef ENABLE_BITTORRENT
# include "bittorrent_helper.h"
#endif // ENABLE_BITTORRENT
@@ -201,7 +202,8 @@ void DefaultPieceStorage::getMissingPiece
indexes.push_back(i);
}
}
- std::random_shuffle(indexes.begin(), indexes.end());
+ std::shuffle(indexes.begin(), indexes.end(),
+ *SimpleRandomizer::getInstance());
for(std::vector<size_t>::const_iterator i = indexes.begin(),
eoi = indexes.end(); i != eoi && misBlock < minMissingBlocks; ++i) {
std::shared_ptr<Piece> piece = checkOutPiece(*i, cuid);
diff --git a/src/MetalinkEntry.cc b/src/MetalinkEntry.cc
index 6961a910..7086e509 100644
--- a/src/MetalinkEntry.cc
+++ b/src/MetalinkEntry.cc
@@ -98,8 +98,8 @@ public:
} // namespace
void MetalinkEntry::reorderResourcesByPriority() {
- std::random_shuffle(std::begin(resources), std::end(resources),
- *SimpleRandomizer::getInstance());
+ std::shuffle(std::begin(resources), std::end(resources),
+ *SimpleRandomizer::getInstance());
std::sort(std::begin(resources), std::end(resources),
PriorityHigher<std::unique_ptr<MetalinkResource>>{});
}
diff --git a/src/PeerListenCommand.cc b/src/PeerListenCommand.cc
index 414fe6c4..17360b4f 100644
--- a/src/PeerListenCommand.cc
+++ b/src/PeerListenCommand.cc
@@ -70,8 +70,7 @@ bool PeerListenCommand::bindPort(uint16_t& port, SegList<int>& sgl)
while(sgl.hasNext()) {
ports.push_back(sgl.next());
}
- std::random_shuffle(ports.begin(), ports.end(),
- *SimpleRandomizer::getInstance());
+ std::shuffle(ports.begin(), ports.end(), *SimpleRandomizer::getInstance());
const int ipv = (family_ == AF_INET) ? 4 : 6;
for(std::vector<uint16_t>::const_iterator i = ports.begin(),
eoi = ports.end(); i != eoi; ++i) {
diff --git a/src/PieceStatMan.cc b/src/PieceStatMan.cc
index de467482..aa9e9dee 100644
--- a/src/PieceStatMan.cc
+++ b/src/PieceStatMan.cc
@@ -51,8 +51,8 @@ PieceStatMan::PieceStatMan(size_t pieceNum, bool randomShuffle):
}
// we need some randomness in ordering.
if(randomShuffle) {
- std::random_shuffle(order_.begin(), order_.end(),
- *SimpleRandomizer::getInstance());
+ std::shuffle(order_.begin(), order_.end(),
+ *SimpleRandomizer::getInstance());
}
}
diff --git a/src/RequestGroup.cc b/src/RequestGroup.cc
index 996ff53f..d43f4af3 100644
--- a/src/RequestGroup.cc
+++ b/src/RequestGroup.cc
@@ -565,8 +565,8 @@ void RequestGroup::initPieceStorage()
downloadContext_->getFileEntries(),
downloadContext_->getPieceLength());
if (!result.empty()) {
- std::random_shuffle(std::begin(result), std::end(result),
- *SimpleRandomizer::getInstance());
+ std::shuffle(std::begin(result), std::end(result),
+ *SimpleRandomizer::getInstance());
auto priSelector = make_unique<PriorityPieceSelector>
(ps->popPieceSelector());
priSelector->setPriorityPiece(std::begin(result), std::end(result));
diff --git a/src/download_helper.cc b/src/download_helper.cc
index ea7c7f8a..b85f444e 100644
--- a/src/download_helper.cc
+++ b/src/download_helper.cc
@@ -200,8 +200,8 @@ createBtRequestGroup(const std::string& metaInfoUri,
metaInfoUri.empty() ? "default" : metaInfoUri);
for (auto &fe : dctx->getFileEntries()) {
auto &uris = fe->getRemainingUris();
- std::random_shuffle(std::begin(uris), std::end(uris),
- *SimpleRandomizer::getInstance());
+ std::shuffle(std::begin(uris), std::end(uris),
+ *SimpleRandomizer::getInstance());
}
if(metaInfoUri.empty()) {
rg->setMetadataInfo(createMetadataInfoDataOnly());
generated by cgit (git 2.46.0) at 2026-10-12 04:48:47 +0000