diff options
| author | Rich Roussel <rroussel@artandlogic.com> | 2017-10-11 06:54:38 -0700 |
|---|---|---|
| committer | Rich Roussel <rroussel@artandlogic.com> | 2017-10-11 06:54:38 -0700 |
| commit | ed97c08cd24f1c9484123357b831b89e4cfa9e44 (patch) | |
| tree | 51f888f3f7904a6c5ed32d5c82ae1e43b7bb46bc | |
| parent | 9252f71348091a25d2b4238d660d584aef9b672c (diff) | |
| download | Open-AVB-ed97c08cd24f1c9484123357b831b89e4cfa9e44.tar.gz | |
Remove unused experimental code.
| -rw-r--r-- | daemons/gptp/common/common_port.hpp | 63 | ||||
| -rw-r--r-- | daemons/gptp/common/ptp_message.cpp | 3 |
2 files changed, 0 insertions, 66 deletions
diff --git a/daemons/gptp/common/common_port.hpp b/daemons/gptp/common/common_port.hpp index 636d1a17..993d969c 100644 --- a/daemons/gptp/common/common_port.hpp +++ b/daemons/gptp/common/common_port.hpp @@ -384,11 +384,6 @@ private: signed char log_mean_announce_interval; signed char initialLogSyncInterval; - std::list<FrequencyRatio> fMasterSlaveRatios; - std::list<FrequencyRatio> fSlaveMasterRatios; - FrequencyRatio fLastRateAverageMasterSlave; - FrequencyRatio fLastRateAverageSlaveMaster; - FrequencyRatio fLastFilteredRateRatio; ALastTimestampKeeper fLastTimestamps; @@ -1455,30 +1450,6 @@ public: void AdjustedTime(FrequencyRatio t); - void PushRateRatio(std::list<FrequencyRatio>& ratioList, FrequencyRatio ratio) - { - size_t ratioCount = ratioList.size(); - // if (ratioCount > 0 && 0 == ratioCount % 1000) - // { - // GPTP_LOG_ERROR("///////////////////////////// Ratio sample size %d.", ratioCount); - // } - if (ratioCount > kMaxRateRatioSamples) - { - ratioList.pop_back(); - } - ratioList.push_front(ratio); - } - - void PushMasterSlaveRateRatio(FrequencyRatio ratio) - { - PushRateRatio(fMasterSlaveRatios, ratio); - } - - void PushSlaveMasterRateRatio(FrequencyRatio ratio) - { - PushRateRatio(fSlaveMasterRatios, ratio); - } - FrequencyRatio LastFilteredRateRatio() const { return fLastFilteredRateRatio; @@ -1498,40 +1469,6 @@ public: fLastTimestamps = lastTimestamps; } - FrequencyRatio RateAverageMasterSlave() const - { - FrequencyRatio sum = std::accumulate(fMasterSlaveRatios.begin(), - fMasterSlaveRatios.end(), 0.0); - return sum / fMasterSlaveRatios.size(); - } - - FrequencyRatio RateAverageSlaveMaster() const - { - FrequencyRatio sum = std::accumulate(fSlaveMasterRatios.begin(), - fSlaveMasterRatios.end(), 0.0); - return sum / fSlaveMasterRatios.size(); - } - - FrequencyRatio LastRateAverageMasterSlave() const - { - return fLastRateAverageMasterSlave; - } - - FrequencyRatio LastRateAverageSlaveMaster() const - { - return fLastRateAverageSlaveMaster; - } - - void LastRateAverageMasterSlave(FrequencyRatio ratio) - { - fLastRateAverageMasterSlave = ratio; - } - - void LastRateAverageSlaveMaster(FrequencyRatio ratio) - { - fLastRateAverageSlaveMaster = ratio; - } - FrequencyRatio LastLocaltime() const { return fLastLocaltime; diff --git a/daemons/gptp/common/ptp_message.cpp b/daemons/gptp/common/ptp_message.cpp index 17aa0af3..f0178247 100644 --- a/daemons/gptp/common/ptp_message.cpp +++ b/daemons/gptp/common/ptp_message.cpp @@ -347,9 +347,6 @@ void PTPMessageCommon::MaybePerformCalculations(EtherPort *port) port->setLinkDelay(filteredMeanPathDelay); - port->PushMasterSlaveRateRatio(RR1); - port->PushSlaveMasterRateRatio(RR2); - GPTP_LOG_VERBOSE("lt1: %" PRIu64, lt1); GPTP_LOG_VERBOSE("lt2: %" PRIu64, lt2); GPTP_LOG_VERBOSE("lt3: %" PRIu64, lt3); |