pit: add EndpointId field in in-record and out-record
refs: #4842
Change-Id: Id4bca4ad9c2d7c8a2fd975c0b052fb9271b6e47d
diff --git a/tests/daemon/fw/retx-suppression.t.cpp b/tests/daemon/fw/retx-suppression.t.cpp
index dce6da9..c96ac67 100644
--- a/tests/daemon/fw/retx-suppression.t.cpp
+++ b/tests/daemon/fw/retx-suppression.t.cpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/*
- * Copyright (c) 2014-2017, Regents of the University of California,
+ * Copyright (c) 2014-2019, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
@@ -60,31 +60,31 @@
time::duration_cast<time::nanoseconds>(MIN_RETX_INTERVAL * 0.1);
// @ time 0
- pitEntry->insertOrUpdateInRecord(*face1, *interest);
+ pitEntry->insertOrUpdateInRecord(*face1, 0, *interest);
BOOST_CHECK(rs.decidePerPitEntry(*pitEntry) == RetxSuppressionResult::NEW);
- pitEntry->insertOrUpdateOutRecord(*face3, *interest);
+ pitEntry->insertOrUpdateOutRecord(*face3, 0, *interest);
this->advanceClocks(RETRANSMISSION_10P, 5); // @ time 0.5 interval
- pitEntry->insertOrUpdateInRecord(*face1, *interest);
+ pitEntry->insertOrUpdateInRecord(*face1, 0, *interest);
BOOST_CHECK(rs.decidePerPitEntry(*pitEntry) == RetxSuppressionResult::SUPPRESS);
- pitEntry->insertOrUpdateInRecord(*face2, *interest);
+ pitEntry->insertOrUpdateInRecord(*face2, 0, *interest);
BOOST_CHECK(rs.decidePerPitEntry(*pitEntry) == RetxSuppressionResult::SUPPRESS);
this->advanceClocks(RETRANSMISSION_10P, 6); // @ time 1.1 interval
- pitEntry->insertOrUpdateInRecord(*face2, *interest);
+ pitEntry->insertOrUpdateInRecord(*face2, 0, *interest);
BOOST_CHECK(rs.decidePerPitEntry(*pitEntry) == RetxSuppressionResult::FORWARD);
// but strategy decides not to forward
this->advanceClocks(RETRANSMISSION_10P, 1); // @ time 1.2 interval
- pitEntry->insertOrUpdateInRecord(*face1, *interest);
+ pitEntry->insertOrUpdateInRecord(*face1, 0, *interest);
BOOST_CHECK(rs.decidePerPitEntry(*pitEntry) == RetxSuppressionResult::FORWARD);
// retransmission suppress shall still give clearance for forwarding
- pitEntry->insertOrUpdateOutRecord(*face3, *interest); // and strategy forwards
+ pitEntry->insertOrUpdateOutRecord(*face3, 0, *interest); // and strategy forwards
this->advanceClocks(RETRANSMISSION_10P, 2); // @ time 1.4 interval
- pitEntry->insertOrUpdateInRecord(*face1, *interest);
+ pitEntry->insertOrUpdateInRecord(*face1, 0, *interest);
BOOST_CHECK(rs.decidePerPitEntry(*pitEntry) == RetxSuppressionResult::SUPPRESS);
- pitEntry->insertOrUpdateInRecord(*face2, *interest);
+ pitEntry->insertOrUpdateInRecord(*face2, 0, *interest);
BOOST_CHECK(rs.decidePerPitEntry(*pitEntry) == RetxSuppressionResult::SUPPRESS);
}
@@ -103,13 +103,13 @@
shared_ptr<pit::Entry> pitEntry = pit.insert(*interest).first;
// @ 0ms
- pitEntry->insertOrUpdateInRecord(*face1, *interest);
+ pitEntry->insertOrUpdateInRecord(*face1, 0, *interest);
BOOST_CHECK(rs.decidePerPitEntry(*pitEntry) == RetxSuppressionResult::NEW);
- pitEntry->insertOrUpdateOutRecord(*face2, *interest);
+ pitEntry->insertOrUpdateOutRecord(*face2, 0, *interest);
// suppression interval is 10ms, until 10ms
this->advanceClocks(time::milliseconds(5)); // @ 5ms
- pitEntry->insertOrUpdateInRecord(*face1, *interest);
+ pitEntry->insertOrUpdateInRecord(*face1, 0, *interest);
BOOST_CHECK(rs.decidePerPitEntry(*pitEntry) == RetxSuppressionResult::SUPPRESS);
// suppression interval is 10ms, until 10ms
@@ -117,42 +117,42 @@
// note: what happens at *exactly* 10ms does not matter so it's untested,
// because in reality network timing won't be exact:
// incoming Interest is processed either before or after 10ms point
- pitEntry->insertOrUpdateInRecord(*face1, *interest);
+ pitEntry->insertOrUpdateInRecord(*face1, 0, *interest);
BOOST_CHECK(rs.decidePerPitEntry(*pitEntry) == RetxSuppressionResult::FORWARD);
- pitEntry->insertOrUpdateOutRecord(*face2, *interest);
+ pitEntry->insertOrUpdateOutRecord(*face2, 0, *interest);
// suppression interval is 30ms, until 41ms
this->advanceClocks(time::milliseconds(25)); // @ 36ms
- pitEntry->insertOrUpdateInRecord(*face1, *interest);
+ pitEntry->insertOrUpdateInRecord(*face1, 0, *interest);
BOOST_CHECK(rs.decidePerPitEntry(*pitEntry) == RetxSuppressionResult::SUPPRESS);
// suppression interval is 30ms, until 41ms
this->advanceClocks(time::milliseconds(6)); // @ 42ms
- pitEntry->insertOrUpdateInRecord(*face1, *interest);
+ pitEntry->insertOrUpdateInRecord(*face1, 0, *interest);
BOOST_CHECK(rs.decidePerPitEntry(*pitEntry) == RetxSuppressionResult::FORWARD);
// strategy decides not to forward, but suppression interval is increased nevertheless
// suppression interval is 90ms, until 101ms
this->advanceClocks(time::milliseconds(58)); // @ 100ms
- pitEntry->insertOrUpdateInRecord(*face1, *interest);
+ pitEntry->insertOrUpdateInRecord(*face1, 0, *interest);
BOOST_CHECK(rs.decidePerPitEntry(*pitEntry) == RetxSuppressionResult::SUPPRESS);
// suppression interval is 90ms, until 101ms
this->advanceClocks(time::milliseconds(3)); // @ 103ms
- pitEntry->insertOrUpdateInRecord(*face1, *interest);
+ pitEntry->insertOrUpdateInRecord(*face1, 0, *interest);
BOOST_CHECK(rs.decidePerPitEntry(*pitEntry) == RetxSuppressionResult::FORWARD);
- pitEntry->insertOrUpdateOutRecord(*face2, *interest);
+ pitEntry->insertOrUpdateOutRecord(*face2, 0, *interest);
// suppression interval is 100ms, until 203ms
this->advanceClocks(time::milliseconds(99)); // @ 202ms
- pitEntry->insertOrUpdateInRecord(*face1, *interest);
+ pitEntry->insertOrUpdateInRecord(*face1, 0, *interest);
BOOST_CHECK(rs.decidePerPitEntry(*pitEntry) == RetxSuppressionResult::SUPPRESS);
// suppression interval is 100ms, until 203ms
this->advanceClocks(time::milliseconds(2)); // @ 204ms
- pitEntry->insertOrUpdateInRecord(*face1, *interest);
+ pitEntry->insertOrUpdateInRecord(*face1, 0, *interest);
BOOST_CHECK(rs.decidePerPitEntry(*pitEntry) == RetxSuppressionResult::FORWARD);
- pitEntry->insertOrUpdateOutRecord(*face2, *interest);
+ pitEntry->insertOrUpdateOutRecord(*face2, 0, *interest);
// suppression interval is 100ms, until 304ms
}
@@ -171,28 +171,28 @@
shared_ptr<pit::Entry> pitEntry = pit.insert(*interest).first;
// @ 0ms
- pitEntry->insertOrUpdateInRecord(*face1, *interest);
+ pitEntry->insertOrUpdateInRecord(*face1, 0, *interest);
BOOST_CHECK(rs.decidePerUpstream(*pitEntry, *face2) == RetxSuppressionResult::NEW);
// Simluate forwarding an interest to face2
- pitEntry->insertOrUpdateOutRecord(*face2, *interest);
+ pitEntry->insertOrUpdateOutRecord(*face2, 0, *interest);
this->advanceClocks(time::milliseconds(5)); // @ 5ms
- pitEntry->insertOrUpdateInRecord(*face1, *interest);
+ pitEntry->insertOrUpdateInRecord(*face1, 0, *interest);
BOOST_CHECK(rs.decidePerUpstream(*pitEntry, *face2) == RetxSuppressionResult::SUPPRESS);
// Return NEW since no outRecord for face1
- pitEntry->insertOrUpdateInRecord(*face2, *interest);
+ pitEntry->insertOrUpdateInRecord(*face2, 0, *interest);
BOOST_CHECK(rs.decidePerUpstream(*pitEntry, *face1) == RetxSuppressionResult::NEW);
this->advanceClocks(time::milliseconds(6)); // @ 11ms
- pitEntry->insertOrUpdateInRecord(*face1, *interest);
+ pitEntry->insertOrUpdateInRecord(*face1, 0, *interest);
BOOST_CHECK(rs.decidePerUpstream(*pitEntry, *face2) == RetxSuppressionResult::FORWARD);
// Assume interest is sent and increment interval
- rs.incrementIntervalForOutRecord(*pitEntry->getOutRecord(*face2));
+ rs.incrementIntervalForOutRecord(*pitEntry->getOutRecord(*face2, 0));
- pitEntry->insertOrUpdateInRecord(*face2, *interest);
+ pitEntry->insertOrUpdateInRecord(*face2, 0, *interest);
BOOST_CHECK(rs.decidePerUpstream(*pitEntry, *face2) == RetxSuppressionResult::SUPPRESS);
}