SunnyQjm/NFD
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

rib: keep AutoPrefixPropagator log levels symmetric

Browse Source 
Change-Id: Iabf254706dba0ea7843495912be4154321a91993
refs: #3524
This commit is contained in:
Yanbiao Li
2016-09-03 07:16:46 +00:00
committed by Junxiao Shi
parent 88f5f7392b
commit 5ad19febad
2 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rib/auto-prefix-propagator.cpp
+13 -13
View File
@@ -251,7 +251,7 @@ AutoPrefixPropagator::redoPropagation(PropagatedEntryIt entryIt,
if (doesCurrentPropagatedPrefixWork(parameters.getName())) {
// PROPAGATED / PROPAGATE_FAIL --> PROPAGATING
entryIt->second.startPropagation();
return startPropagation(parameters, options, retryWaitTime);
return advertise(parameters, options, retryWaitTime);
}
NFD_LOG_INFO("current propagated prefix does not work any more");
@@ -266,11 +266,11 @@ AutoPrefixPropagator::redoPropagation(PropagatedEntryIt entryIt,
}
void
AutoPrefixPropagator::startPropagation(const ControlParameters& parameters,
const CommandOptions& options,
time::seconds retryWaitTime)
AutoPrefixPropagator::advertise(const ControlParameters& parameters,
const CommandOptions& options,
time::seconds retryWaitTime)
{
NFD_LOG_TRACE("start propagate " << parameters.getName());
NFD_LOG_INFO("advertise " << parameters.getName());
ndn::Scheduler::Event refreshEvent =
bind(&AutoPrefixPropagator::onRefreshTimer, this, parameters, options);
@@ -287,11 +287,11 @@ AutoPrefixPropagator::startPropagation(const ControlParameters& parameters,
}
void
AutoPrefixPropagator::startRevocation(const ControlParameters& parameters,
const CommandOptions& options,
time::seconds retryWaitTime)
AutoPrefixPropagator::withdraw(const ControlParameters& parameters,
const CommandOptions& options,
time::seconds retryWaitTime)
{
NFD_LOG_INFO("start revoke propagation of " << parameters.getName());
NFD_LOG_INFO("withdraw " << parameters.getName());
m_nfdController.start<ndn::nfd::RibUnregisterCommand>(
parameters,
@@ -317,7 +317,7 @@ AutoPrefixPropagator::afterRibInsert(const ControlParameters& parameters,
// NEW --> PROPAGATING
entry.startPropagation();
startPropagation(parameters, options, m_baseRetryWait);
advertise(parameters, options, m_baseRetryWait);
}
void
@@ -342,7 +342,7 @@ AutoPrefixPropagator::afterRibErase(const ControlParameters& parameters,
return;
}
startRevocation(parameters, options, m_baseRetryWait);
withdraw(parameters, options, m_baseRetryWait);
}
void
@@ -390,7 +390,7 @@ AutoPrefixPropagator::afterPropagateSucceed(const ControlParameters& parameters,
// propagation should be revoked if this entry has been erased (i.e., be in RELEASED state)
NFD_LOG_DEBUG("Already erased!");
ControlParameters newParameters = parameters;
return startRevocation(newParameters.unsetCost(), options, m_baseRetryWait);
return withdraw(newParameters.unsetCost(), options, m_baseRetryWait);
}
// PROPAGATING --> PROPAGATED
@@ -437,7 +437,7 @@ AutoPrefixPropagator::afterRevokeSucceed(const ControlParameters& parameters,
entryIt->second.startPropagation();
ControlParameters newParameters = parameters;
startPropagation(newParameters.setCost(m_controlParameters.getCost()), options, retryWaitTime);
advertise(newParameters.setCost(m_controlParameters.getCost()), options, retryWaitTime);
}
}
rib/auto-prefix-propagator.hpp
+8 -8
View File
@@ -202,9 +202,9 @@ private:
* @param retryWaitTime the current wait time before retrying propagation
*/
void
startPropagation(const ndn::nfd::ControlParameters& parameters,
const ndn::nfd::CommandOptions& options,
time::seconds retryWaitTime);
advertise(const ndn::nfd::ControlParameters& parameters,
const ndn::nfd::CommandOptions& options,
time::seconds retryWaitTime);
/**
* @brief send out the unregistration command to revoke the corresponding propagation.
@@ -214,9 +214,9 @@ private:
* @param retryWaitTime the current wait time before retrying propagation
*/
void
startRevocation(const ndn::nfd::ControlParameters& parameters,
const ndn::nfd::CommandOptions& options,
time::seconds retryWaitTime);
withdraw(const ndn::nfd::ControlParameters& parameters,
const ndn::nfd::CommandOptions& options,
time::seconds retryWaitTime);
/**
* @brief invoked when Rib::afterInsertEntry signal is emitted
@@ -301,7 +301,7 @@ PUBLIC_WITH_TESTS_ELSE_PRIVATE: // PropagatedEntry state changes
* rib.auto_prefix_propagate.refresh_interval.
*
* Otherwise, make a copy of the ControlParameters @p parameters, unset its Cost field, and then
* invoke startRevocation with this new ControlParameters.
* invoke withdraw with this new ControlParameters.
*
* @param parameters the ControlParameters used by the registration command for propagation
* @param options the CommandOptions used by the registration command for propagation
@@ -341,7 +341,7 @@ PUBLIC_WITH_TESTS_ELSE_PRIVATE: // PropagatedEntry state changes
*
* If the PropagatedEntry still exists and is not in PROPAGATE_FAIL state, switch it to
* PROPAGATING. Then make a copy of the ControlParameters @p parameters, reset its Cost, and
* invoke startPropagation with this new ControlParameters.
* invoke advertise with this new ControlParameters.
*
* @param parameters the ControlParameters used by the unregistration command for revocation
* @param options the CommandOptions used by the unregistration command for revocation