fw: replace straggler timer with per-strategy decision
remove onInterestReject pipeline
refs: #4200
Change-Id: I184d7ef7f732efda3d1066eef6cd89e36a6a8802
diff --git a/tests/daemon/fw/pit-expiry.t.cpp b/tests/daemon/fw/pit-expiry.t.cpp
new file mode 100644
index 0000000..4eacd9e
--- /dev/null
+++ b/tests/daemon/fw/pit-expiry.t.cpp
@@ -0,0 +1,284 @@
+/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
+/*
+ * Copyright (c) 2014-2018, Regents of the University of California,
+ * Arizona Board of Regents,
+ * Colorado State University,
+ * University Pierre & Marie Curie, Sorbonne University,
+ * Washington University in St. Louis,
+ * Beijing Institute of Technology,
+ * The University of Memphis.
+ *
+ * This file is part of NFD (Named Data Networking Forwarding Daemon).
+ * See AUTHORS.md for complete list of NFD authors and contributors.
+ *
+ * NFD is free software: you can redistribute it and/or modify it under the terms
+ * of the GNU General Public License as published by the Free Software Foundation,
+ * either version 3 of the License, or (at your option) any later version.
+ *
+ * NFD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE. See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * NFD, e.g., in COPYING.md file. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "dummy-strategy.hpp"
+#include "choose-strategy.hpp"
+#include "tests/daemon/face/dummy-face.hpp"
+
+#include "tests/test-common.hpp"
+
+namespace nfd {
+namespace fw {
+namespace tests {
+
+using namespace nfd::tests;
+
+BOOST_AUTO_TEST_SUITE(Fw)
+BOOST_FIXTURE_TEST_SUITE(TestPitExpiry, UnitTestTimeFixture)
+
+class PitExpiryTestStrategy : public DummyStrategy
+{
+public:
+ static Name
+ getStrategyName(uint64_t version)
+ {
+ return Name("/PitExpiryTestStrategy").appendVersion(version);
+ }
+
+ static void
+ registerAs(const Name& strategyName)
+ {
+ registerAsImpl<PitExpiryTestStrategy>(strategyName);
+ }
+
+ explicit
+ PitExpiryTestStrategy(Forwarder& forwarder, const Name& name = getStrategyName(1))
+ : DummyStrategy(forwarder, name)
+ {
+ }
+
+ void
+ afterReceiveInterest(const Face& inFace, const Interest& interest,
+ const shared_ptr<pit::Entry>& pitEntry) override
+ {
+ ++afterReceiveInterest_count;
+
+ if (afterReceiveInterest_count <= 1) {
+ setExpiryTimer(pitEntry, 190_ms);
+ }
+ }
+
+ void
+ beforeSatisfyInterest(const shared_ptr<pit::Entry>& pitEntry,
+ const Face& inFace, const Data& data) override
+ {
+ ++beforeSatisfyInterest_count;
+
+ if (beforeSatisfyInterest_count <= 1 ) {
+ setExpiryTimer(pitEntry, 190_ms);
+ }
+ }
+
+ void
+ afterReceiveNack(const Face& inFace, const lp::Nack& nack,
+ const shared_ptr<pit::Entry>& pitEntry) override
+ {
+ ++afterReceiveNack_count;
+
+ if (afterReceiveNack_count <= 1) {
+ setExpiryTimer(pitEntry, 50_ms);
+ }
+ }
+};
+
+BOOST_AUTO_TEST_CASE(UnsatisfiedInterest)
+{
+ Forwarder forwarder;
+
+ auto face1 = make_shared<DummyFace>();
+ auto face2 = make_shared<DummyFace>();
+ forwarder.addFace(face1);
+ forwarder.addFace(face2);
+
+ Pit& pit = forwarder.getPit();
+
+ shared_ptr<Interest> interest1 = makeInterest("/A/0");
+ shared_ptr<Interest> interest2 = makeInterest("/A/1");
+ interest1->setInterestLifetime(90_ms);
+ interest2->setInterestLifetime(90_ms);
+
+ face1->receiveInterest(*interest1);
+ face2->receiveInterest(*interest2);
+ BOOST_CHECK_EQUAL(pit.size(), 2);
+
+ this->advanceClocks(100_ms);
+ BOOST_CHECK_EQUAL(pit.size(), 0);
+}
+
+BOOST_AUTO_TEST_CASE(SatisfiedInterest)
+{
+ Forwarder forwarder;
+
+ auto face1 = make_shared<DummyFace>();
+ auto face2 = make_shared<DummyFace>();
+ forwarder.addFace(face1);
+ forwarder.addFace(face2);
+
+ Pit& pit = forwarder.getPit();
+
+ shared_ptr<Interest> interest = makeInterest("/A/0");
+ interest->setInterestLifetime(90_ms);
+ shared_ptr<Data> data = makeData("/A/0");
+
+ face1->receiveInterest(*interest);
+
+ this->advanceClocks(30_ms);
+ face2->receiveData(*data);
+
+ this->advanceClocks(1_ms);
+ BOOST_CHECK_EQUAL(pit.size(), 0);
+}
+
+BOOST_AUTO_TEST_CASE(ReceiveNack)
+{
+ Forwarder forwarder;
+
+ auto face1 = make_shared<DummyFace>();
+ auto face2 = make_shared<DummyFace>();
+ auto face3 = make_shared<DummyFace>();
+ forwarder.addFace(face1);
+ forwarder.addFace(face2);
+ forwarder.addFace(face3);
+
+ Name strategyA("/strategyA/%FD%01");
+ PitExpiryTestStrategy::registerAs(strategyA);
+ choose<PitExpiryTestStrategy>(forwarder, "/A", strategyA);
+
+ Pit& pit = forwarder.getPit();
+
+ shared_ptr<Interest> interest = makeInterest("/A/0", 562);
+ interest->setInterestLifetime(90_ms);
+ lp::Nack nack = makeNack("/A/0", 562, lp::NackReason::CONGESTION);
+
+ face1->receiveInterest(*interest);
+ auto entry = pit.find(*interest);
+ entry->insertOrUpdateOutRecord(*face2, *interest);
+ entry->insertOrUpdateOutRecord(*face3, *interest);
+
+ this->advanceClocks(10_ms);
+ face2->receiveNack(nack);
+
+ this->advanceClocks(1_ms);
+ BOOST_CHECK_EQUAL(pit.size(), 1);
+
+ this->advanceClocks(50_ms);
+ BOOST_CHECK_EQUAL(pit.size(), 0);
+}
+
+BOOST_AUTO_TEST_CASE(ResetTimerAfterReceiveInterest)
+{
+ Forwarder forwarder;
+
+ auto face = make_shared<DummyFace>();
+ forwarder.addFace(face);
+
+ Name strategyA("/strategyA/%FD%01");
+ PitExpiryTestStrategy::registerAs(strategyA);
+ choose<PitExpiryTestStrategy>(forwarder, "/A", strategyA);
+
+ Pit& pit = forwarder.getPit();
+
+ shared_ptr<Interest> interest = makeInterest("/A/0");
+ interest->setInterestLifetime(90_ms);
+
+ face->receiveInterest(*interest);
+ BOOST_CHECK_EQUAL(pit.size(), 1);
+
+ this->advanceClocks(100_ms);
+ BOOST_CHECK_EQUAL(pit.size(), 1);
+
+ this->advanceClocks(100_ms);
+ BOOST_CHECK_EQUAL(pit.size(), 0);
+}
+
+BOOST_AUTO_TEST_CASE(ResetTimerBeforeSatisfyInterest)
+{
+ Forwarder forwarder;
+
+ auto face1 = make_shared<DummyFace>();
+ auto face2 = make_shared<DummyFace>();
+ forwarder.addFace(face1);
+ forwarder.addFace(face2);
+
+ Name strategyA("/strategyA/%FD%01");
+ PitExpiryTestStrategy::registerAs(strategyA);
+ choose<PitExpiryTestStrategy>(forwarder, "/A", strategyA);
+
+ Pit& pit = forwarder.getPit();
+
+ shared_ptr<Interest> interest = makeInterest("/A/0");
+ interest->setInterestLifetime(90_ms);
+ shared_ptr<Data> data = makeData("/A/0");
+
+ face1->receiveInterest(*interest);
+
+ this->advanceClocks(30_ms);
+ face2->receiveData(*data);
+
+ this->advanceClocks(1_ms);
+ BOOST_CHECK_EQUAL(pit.size(), 1);
+
+ this->advanceClocks(30_ms);
+ face2->receiveData(*data);
+
+ this->advanceClocks(1_ms);
+ BOOST_CHECK_EQUAL(pit.size(), 0);
+}
+
+BOOST_AUTO_TEST_CASE(ReceiveNackAfterResetTimer)
+{
+ Forwarder forwarder;
+
+ auto face1 = make_shared<DummyFace>();
+ auto face2 = make_shared<DummyFace>();
+ auto face3 = make_shared<DummyFace>();
+ forwarder.addFace(face1);
+ forwarder.addFace(face2);
+ forwarder.addFace(face3);
+
+ Name strategyA("/strategyA/%FD%01");
+ PitExpiryTestStrategy::registerAs(strategyA);
+ choose<PitExpiryTestStrategy>(forwarder, "/A", strategyA);
+
+ Pit& pit = forwarder.getPit();
+
+ shared_ptr<Interest> interest = makeInterest("/A/0", 562);
+ interest->setInterestLifetime(90_ms);
+ lp::Nack nack = makeNack("/A/0", 562, lp::NackReason::CONGESTION);
+
+ face1->receiveInterest(*interest);
+ auto entry = pit.find(*interest);
+ entry->insertOrUpdateOutRecord(*face2, *interest);
+ entry->insertOrUpdateOutRecord(*face3, *interest);
+
+ //pitEntry is not erased after receiving the first Nack
+ this->advanceClocks(10_ms);
+ face2->receiveNack(nack);
+ this->advanceClocks(1_ms);
+ BOOST_CHECK_EQUAL(pit.size(), 1);
+
+ //pitEntry is erased after receiving the second Nack
+ this->advanceClocks(10_ms);
+ face3->receiveNack(nack);
+ this->advanceClocks(1_ms);
+ BOOST_CHECK_EQUAL(pit.size(), 0);
+}
+
+BOOST_AUTO_TEST_SUITE_END() // TestPitExpiry
+BOOST_AUTO_TEST_SUITE_END() // Fw
+
+} // namespace tests
+} // namespace fw
+} // namespace nfd