aboutsummaryrefslogtreecommitdiffstats
path: root/libtransport/src/hicn
diff options
context:
space:
mode:
authorAlberto Compagno <acompagn+fdio@cisco.com>2019-11-22 13:50:37 +0000
committerGerrit Code Review <gerrit@fd.io>2019-11-22 13:50:37 +0000
commitfc47fb553d3ab61079bb288942b0328e4b3392fb (patch)
treed17c640227076b6bdb83ed761f498990a6c9890b /libtransport/src/hicn
parent843fba473ff35d026a7c4d39aa269b06c55e1f91 (diff)
parentd41e15b580287a26f6b58241eaec7957ee336050 (diff)
Merge "[HICN-411] Change how manifests are requested"
Diffstat (limited to 'libtransport/src/hicn')
-rw-r--r--libtransport/src/hicn/transport/protocols/manifest_indexing_manager.cc111
-rw-r--r--libtransport/src/hicn/transport/protocols/manifest_indexing_manager.h5
-rw-r--r--libtransport/src/hicn/transport/utils/suffix_strategy.h47
3 files changed, 73 insertions, 90 deletions
diff --git a/libtransport/src/hicn/transport/protocols/manifest_indexing_manager.cc b/libtransport/src/hicn/transport/protocols/manifest_indexing_manager.cc
index 05cabc6..0c3fd76 100644
--- a/libtransport/src/hicn/transport/protocols/manifest_indexing_manager.cc
+++ b/libtransport/src/hicn/transport/protocols/manifest_indexing_manager.cc
@@ -29,7 +29,6 @@ ManifestIndexManager::ManifestIndexManager(
interface::ConsumerSocket *icn_socket, TransportProtocol *next_interest)
: IncrementalIndexManager(icn_socket),
PacketManager<Interest>(1024),
- manifests_in_flight_(0),
next_reassembly_segment_(suffix_queue_.end()),
next_to_retrieve_segment_(suffix_queue_.end()),
suffix_manifest_(core::NextSegmentCalculationStrategy::INCREMENTAL, 0),
@@ -39,7 +38,6 @@ bool ManifestIndexManager::onManifest(
core::ContentObject::Ptr &&content_object) {
auto manifest =
std::make_unique<ContentObjectManifest>(std::move(*content_object));
-
bool manifest_verified = verification_manager_->onPacketToVerify(*manifest);
if (manifest_verified) {
@@ -54,14 +52,12 @@ bool ManifestIndexManager::onManifest(
case core::ManifestType::INLINE_MANIFEST: {
auto _it = manifest->getSuffixList().begin();
auto _end = --manifest->getSuffixList().end();
+ final_suffix_ = manifest->getFinalBlockNumber(); // final block number
if (TRANSPORT_EXPECT_FALSE(manifest->isFinalManifest())) {
_end++;
}
- // Get final block number
- final_suffix_ = manifest->getFinalBlockNumber();
-
suffix_hash_map_[_it->first] =
std::make_pair(std::vector<uint8_t>(_it->second, _it->second + 32),
manifest->getHashAlgorithm());
@@ -93,62 +89,13 @@ bool ManifestIndexManager::onManifest(
1);
suffix_manifest_.setSuffixStrategy(
manifest->getNextSegmentCalculationStrategy());
- } else if (manifests_in_flight_) {
- manifests_in_flight_--;
}
- if (TRANSPORT_EXPECT_FALSE(manifest->isFinalManifest() ||
- suffix_manifest_.getSuffix() >
- final_suffix_)) {
- break;
+ if (TRANSPORT_EXPECT_FALSE(manifest->isFinalManifest()) == 0) {
+ fillWindow(manifest->getWritableName(),
+ manifest->getName().getSuffix());
}
- // Get current window size
- double current_window_size = 0.;
- socket_->getSocketOption(GeneralTransportOptions::CURRENT_WINDOW_SIZE,
- current_window_size);
-
- // Get portal
- std::shared_ptr<interface::BasePortal> portal;
- socket_->getSocketOption(GeneralTransportOptions::PORTAL, portal);
-
- // Number of segments in manifest
- std::size_t segment_count = 0;
-
- // Manifest namespace
- Name &name = manifest->getWritableName();
-
- if (manifests_in_flight_ >= MAX_MANIFESTS_IN_FLIGHT) {
- break;
- }
-
- // Send as many manifest as required for filling window.
- do {
- segment_count += suffix_manifest_.getNbSegments();
- suffix_manifest_++;
-
- Interest::Ptr interest = getPacket();
- name.setSuffix(suffix_manifest_.getSuffix());
- interest->setName(name);
-
- uint32_t interest_lifetime;
- socket_->getSocketOption(GeneralTransportOptions::INTEREST_LIFETIME,
- interest_lifetime);
- interest->setLifetime(interest_lifetime);
-
- // Send requests for manifest out of the congestion window (no
- // in_flight_interests++)
- portal->sendInterest(
- std::move(interest),
- std::bind(&ManifestIndexManager::onManifestReceived, this,
- std::placeholders::_1, std::placeholders::_2),
- std::bind(&ManifestIndexManager::onManifestTimeout, this,
- std::placeholders::_1));
- manifests_in_flight_++;
- } while (segment_count < current_window_size &&
- suffix_manifest_.getSuffix() < final_suffix_ &&
- manifests_in_flight_ < MAX_MANIFESTS_IN_FLIGHT);
-
break;
}
case core::ManifestType::FLIC_MANIFEST: {
@@ -193,6 +140,56 @@ void ManifestIndexManager::onManifestTimeout(Interest::Ptr &&i) {
std::placeholders::_1));
}
+void ManifestIndexManager::fillWindow(Name &name, uint32_t current_manifest) {
+ /* Send as many manifest as required for filling window. */
+ uint32_t interest_lifetime;
+ double window_size;
+ std::shared_ptr<interface::BasePortal> portal;
+ Interest::Ptr interest;
+ uint32_t current_segment = *next_to_retrieve_segment_;
+ // suffix_manifest_ now points to the next manifest to request
+ uint32_t last_requested_manifest = (suffix_manifest_++).getSuffix();
+
+ socket_->getSocketOption(GeneralTransportOptions::PORTAL, portal);
+ socket_->getSocketOption(GeneralTransportOptions::INTEREST_LIFETIME,
+ interest_lifetime);
+ socket_->getSocketOption(GeneralTransportOptions::CURRENT_WINDOW_SIZE,
+ window_size);
+
+ if (TRANSPORT_EXPECT_FALSE(suffix_manifest_.getSuffix() >= final_suffix_)) {
+ suffix_manifest_.updateSuffix(last_requested_manifest);
+ return;
+ }
+
+ if (current_segment + window_size < suffix_manifest_.getSuffix() &&
+ current_manifest != last_requested_manifest) {
+ suffix_manifest_.updateSuffix(last_requested_manifest);
+ return;
+ }
+
+ do {
+ interest = getPacket();
+ name.setSuffix(suffix_manifest_.getSuffix());
+ interest->setName(name);
+ interest->setLifetime(interest_lifetime);
+
+ // Send interests for manifest out of the congestion window (no
+ // in_flight_interests++)
+ portal->sendInterest(
+ std::move(interest),
+ std::bind(&ManifestIndexManager::onManifestReceived, this,
+ std::placeholders::_1, std::placeholders::_2),
+ std::bind(&ManifestIndexManager::onManifestTimeout, this,
+ std::placeholders::_1));
+
+ last_requested_manifest = (suffix_manifest_++).getSuffix();
+ } while (current_segment + window_size >= suffix_manifest_.getSuffix() &&
+ suffix_manifest_.getSuffix() < final_suffix_);
+
+ // suffix_manifest_ now points to the last requested manifest
+ suffix_manifest_.updateSuffix(last_requested_manifest);
+}
+
bool ManifestIndexManager::onContentObject(
const core::ContentObject &content_object) {
bool verify_signature;
diff --git a/libtransport/src/hicn/transport/protocols/manifest_indexing_manager.h b/libtransport/src/hicn/transport/protocols/manifest_indexing_manager.h
index 74c86eb..cb88940 100644
--- a/libtransport/src/hicn/transport/protocols/manifest_indexing_manager.h
+++ b/libtransport/src/hicn/transport/protocols/manifest_indexing_manager.h
@@ -21,9 +21,6 @@
#include <list>
-/* #define MAX_MANIFESTS_IN_FLIGHT std::numeric_limits<uint32_t>::max() */
-#define MAX_MANIFESTS_IN_FLIGHT 10
-
namespace transport {
namespace protocol {
@@ -58,9 +55,9 @@ class ManifestIndexManager : public IncrementalIndexManager,
private:
void onManifestReceived(Interest::Ptr &&i, ContentObject::Ptr &&c);
void onManifestTimeout(Interest::Ptr &&i);
+ void fillWindow(Name &name, uint32_t current_manifest);
protected:
- uint32_t manifests_in_flight_;
SuffixQueue suffix_queue_;
SuffixQueue::iterator next_reassembly_segment_;
SuffixQueue::iterator next_to_retrieve_segment_;
diff --git a/libtransport/src/hicn/transport/utils/suffix_strategy.h b/libtransport/src/hicn/transport/utils/suffix_strategy.h
index 4358d12..3014855 100644
--- a/libtransport/src/hicn/transport/utils/suffix_strategy.h
+++ b/libtransport/src/hicn/transport/utils/suffix_strategy.h
@@ -38,8 +38,6 @@ class SuffixStrategy {
std::uint32_t getSuffix() { return suffix_; }
- virtual std::uint32_t getNextSuffix() = 0;
-
void updateSuffix(std::uint32_t new_suffix) { suffix_ = new_suffix; }
std::size_t getNbSegments() { return nb_segments_; }
@@ -57,6 +55,7 @@ class SuffixStrategy {
transport::core::NextSegmentCalculationStrategy suffix_stragegy_;
std::uint32_t suffix_;
std::size_t nb_segments_;
+ virtual std::uint32_t getNextSuffix() = 0;
};
class SuffixManifest : public SuffixStrategy {
@@ -66,27 +65,22 @@ class SuffixManifest : public SuffixStrategy {
std::uint32_t start_offset)
: SuffixStrategy(suffix_stragegy, start_offset) {}
- std::uint32_t getNextSuffix();
-
SuffixManifest operator++() {
- uint32_t next_suffix = getNextSuffix();
- updateSuffix(next_suffix);
- return SuffixManifest(suffix_stragegy_, next_suffix);
+ updateSuffix(getNextSuffix());
+ SuffixManifest temp_suffix(suffix_stragegy_, suffix_);
+ temp_suffix.setNbSegments(getNbSegments());
+ return temp_suffix;
}
SuffixManifest operator++(int) {
SuffixManifest temp_suffix(suffix_stragegy_, suffix_);
- uint32_t next_suffix = getNextSuffix();
- updateSuffix(next_suffix);
+ temp_suffix.setNbSegments(getNbSegments());
+ updateSuffix(getNextSuffix());
return temp_suffix;
}
- SuffixManifest operator+(uint32_t shift) {
- for (uint32_t i = 0; i < shift; i++) {
- updateSuffix(getNextSuffix());
- }
- return SuffixManifest(suffix_stragegy_, getSuffix());
- }
+ protected:
+ std::uint32_t getNextSuffix();
};
class SuffixContent : public SuffixStrategy {
@@ -101,28 +95,22 @@ class SuffixContent : public SuffixStrategy {
std::uint32_t start_offset)
: SuffixContent(suffix_stragegy, start_offset, false) {}
- std::uint32_t getNextSuffix();
-
SuffixContent operator++() {
- uint32_t next_suffix = getNextSuffix();
- updateSuffix(next_suffix);
- return SuffixContent(suffix_stragegy_, next_suffix, making_manifest_);
+ updateSuffix(getNextSuffix());
+ SuffixContent temp_suffix(suffix_stragegy_, suffix_, making_manifest_);
+ temp_suffix.setNbSegments(getNbSegments());
+ temp_suffix.content_counter_ = content_counter_;
+ return temp_suffix;
}
SuffixContent operator++(int) {
SuffixContent temp_suffix(suffix_stragegy_, suffix_, making_manifest_);
- uint32_t next_suffix = getNextSuffix();
- updateSuffix(next_suffix);
+ temp_suffix.setNbSegments(getNbSegments());
+ temp_suffix.content_counter_ = content_counter_;
+ updateSuffix(getNextSuffix());
return temp_suffix;
}
- SuffixContent operator+(uint32_t shift) {
- for (uint32_t i = 0; i < shift; i++) {
- updateSuffix(getNextSuffix());
- }
- return SuffixContent(suffix_stragegy_, getSuffix(), making_manifest_);
- }
-
void setUsingManifest(bool value) { making_manifest_ = value; }
void reset(std::uint32_t reset_suffix) {
@@ -135,5 +123,6 @@ class SuffixContent : public SuffixStrategy {
/* content_counter_ keeps track of the number of segments */
/* between two manifests */
uint32_t content_counter_;
+ std::uint32_t getNextSuffix();
};
} // namespace utils