diff options
author | Mauro Sardara <msardara@cisco.com> | 2019-01-19 01:29:33 +0100 |
---|---|---|
committer | Mauro Sardara <msardara@cisco.com> | 2019-01-21 12:03:48 +0100 |
commit | 9e5f41ed6ebe64a789916794626485460078c420 (patch) | |
tree | d2ac3090026ec8929558e88eca533f8787a6ff0b /libtransport/src/hicn/transport/protocols | |
parent | d13d37534d9449dd54277af664310d5f957dc44a (diff) |
- Code style fix
- Improved vpp binary api interface
- Correction in object pool destructor
- Fix error in Memif Connector
Change-Id: Id1dd9219fc1ac0b3717ae019ebff17373bebc635
Signed-off-by: Mauro Sardara <msardara@cisco.com>
Diffstat (limited to 'libtransport/src/hicn/transport/protocols')
-rw-r--r--[-rwxr-xr-x] | libtransport/src/hicn/transport/protocols/rtc.cc | 40 | ||||
-rw-r--r--[-rwxr-xr-x] | libtransport/src/hicn/transport/protocols/rtc_data_path.h | 2 | ||||
-rw-r--r--[-rwxr-xr-x] | libtransport/src/hicn/transport/protocols/vegas.cc | 16 |
3 files changed, 24 insertions, 34 deletions
diff --git a/libtransport/src/hicn/transport/protocols/rtc.cc b/libtransport/src/hicn/transport/protocols/rtc.cc index 1f42cf230..ee90e5d9e 100755..100644 --- a/libtransport/src/hicn/transport/protocols/rtc.cc +++ b/libtransport/src/hicn/transport/protocols/rtc.cc @@ -48,9 +48,7 @@ RTCTransportProtocol::~RTCTransportProtocol() { void RTCTransportProtocol::start( utils::SharableVector<uint8_t> &content_buffer) { - - if(is_running_) - return; + if (is_running_) return; is_running_ = true; content_buffer_ = content_buffer.shared_from_this(); @@ -63,29 +61,26 @@ void RTCTransportProtocol::start( } void RTCTransportProtocol::stop() { - if(!is_running_) - return; + if (!is_running_) return; is_running_ = false; portal_->stopEventsLoop(); } -void RTCTransportProtocol::resume(){ - if(is_running_) - return; - - is_running_ = true; - - lastRoundBegin_ = std::chrono::steady_clock::now(); - inflightInterestsCount_ = 0; - if(content_buffer_) - content_buffer_->clear(); +void RTCTransportProtocol::resume() { + if (is_running_) return; - scheduleNextInterest(); - - portal_->runEventsLoop(); + is_running_ = true; - is_running_ = false; + lastRoundBegin_ = std::chrono::steady_clock::now(); + inflightInterestsCount_ = 0; + if (content_buffer_) content_buffer_->clear(); + + scheduleNextInterest(); + + portal_->runEventsLoop(); + + is_running_ = false; } void RTCTransportProtocol::onRTCPPacket(uint8_t *packet, size_t len) { @@ -452,8 +447,7 @@ void RTCTransportProtocol::sendInterest() { void RTCTransportProtocol::scheduleNextInterest() { checkRound(); - if(!is_running_) - return; + if (!is_running_) return; uint32_t MAX_RECOVER = 40; // if the packet is more than MAX_RECOVER seq in the past we drop it @@ -573,8 +567,8 @@ void RTCTransportProtocol::onNack(const ContentObject &content_object) { estimatedBw_ = (double)productionRate; // if(inflightInterests_[segmentNumber % - // default_values::default_buffer_size].retransmissions != 0){ ignore nacks for - // retransmissions + // default_values::default_buffer_size].retransmissions != 0){ ignore nacks + // for retransmissions // return; //} diff --git a/libtransport/src/hicn/transport/protocols/rtc_data_path.h b/libtransport/src/hicn/transport/protocols/rtc_data_path.h index ace16ff12..b55139d52 100755..100644 --- a/libtransport/src/hicn/transport/protocols/rtc_data_path.h +++ b/libtransport/src/hicn/transport/protocols/rtc_data_path.h @@ -15,8 +15,8 @@ #pragma once -#include <stdint.h> #include <hicn/transport/utils/min_filter.h> +#include <stdint.h> #include <climits> #define ALPHA_RTC 0.125 diff --git a/libtransport/src/hicn/transport/protocols/vegas.cc b/libtransport/src/hicn/transport/protocols/vegas.cc index b6d79bfcc..1431020a6 100755..100644 --- a/libtransport/src/hicn/transport/protocols/vegas.cc +++ b/libtransport/src/hicn/transport/protocols/vegas.cc @@ -95,9 +95,7 @@ void VegasTransportProtocol::reset() { void VegasTransportProtocol::start( utils::SharableVector<uint8_t> &content_buffer) { - - if(is_running_) - return; + if (is_running_) return; socket_->t0_ = std::chrono::steady_clock::now(); @@ -110,15 +108,13 @@ void VegasTransportProtocol::start( portal_->runEventsLoop(); removeAllPendingInterests(); is_running_ = false; - } -void VegasTransportProtocol::resume(){ - if(is_running_) - return; +void VegasTransportProtocol::resume() { + if (is_running_) return; is_running_ = true; - sendInterest(next_suffix_++); + sendInterest(next_suffix_++); portal_->runEventsLoop(); removeAllPendingInterests(); is_running_ = false; @@ -539,7 +535,7 @@ void VegasTransportProtocol::reassemble() { uint64_t index = last_reassembled_segment_; auto it = receive_buffer_.find(index); - do { + while (it != receive_buffer_.end()) { if (it->second->getPayloadType() == PayloadType::CONTENT_OBJECT) { copyContent(*it->second); receive_buffer_.erase(it); @@ -547,7 +543,7 @@ void VegasTransportProtocol::reassemble() { index = ++last_reassembled_segment_; it = receive_buffer_.find(index); - } while (it != receive_buffer_.end()); + } } void VegasTransportProtocol::partialDownload() { |