face: LpFace counters
FaceCounters for LpFace consist of LinkService::Counters and
Transport::Counters. Old FaceCounters class from 2014 face architecture is
renamed as OldFaceCounters, and can be wrapped with new FaceCounters class.
OldFaceCounters is only used in old Face subclasses.
This commit also updates existing face test suites to use new FaceCounters,
updates ForwarderStatus so that it does not rely on FaceCounters,
and moves the logic of copying face properties and counters into management
structs from face system into FaceManager.
refs #3177
Change-Id: I587e8a32fa72bac3af9d750b2c88342740aa08d6
diff --git a/daemon/mgmt/face-manager.hpp b/daemon/mgmt/face-manager.hpp
index 57788b7..da217b2 100644
--- a/daemon/mgmt/face-manager.hpp
+++ b/daemon/mgmt/face-manager.hpp
@@ -118,6 +118,18 @@
bool
doesMatchFilter(const ndn::nfd::FaceQueryFilter& filter, shared_ptr<Face> face);
+ /** \brief copy face properties into traits
+ * \tparam FaceTraits either FaceStatus or FaceEventNotification
+ */
+ template<typename FaceTraits>
+ static void
+ collectFaceProperties(const Face& face, FaceTraits& traits);
+
+ /** \brief copy face counters into FaceStatus
+ */
+ static void
+ collectFaceCounters(const Face& face, ndn::nfd::FaceStatus& status);
+
private: // NotificationStream
void
afterFaceAdded(shared_ptr<Face> face,