core: use markers in StatusDataset and NotificationStream
This commit also refactors FaceMonitor as generic NotificationSubscriber,
and refactors AutoregServer to use FaceMonitor.
refs #1837 #1838
Change-Id: I8b40dfae118853d1224c8290cf92e7cc0daa116f
diff --git a/core/face-monitor.hpp b/core/face-monitor.hpp
index 459b181..521fc23 100644
--- a/core/face-monitor.hpp
+++ b/core/face-monitor.hpp
@@ -1,12 +1,12 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/**
- * Copyright (c) 2014 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
+ * Copyright (c) 2014, 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.
@@ -21,83 +21,26 @@
*
* 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/>.
- **/
+ */
#ifndef NFD_CORE_FACE_MONITOR_HPP
#define NFD_CORE_FACE_MONITOR_HPP
-#include "common.hpp"
+#include "notification-subscriber.hpp"
#include <ndn-cxx/management/nfd-face-event-notification.hpp>
-namespace ndn {
-class Face;
-class PendingInterestId;
-}
-
namespace nfd {
using ndn::nfd::FaceEventNotification;
-/**
- * \brief Helper class to subscribe to face notification events
- *
- * \todo Write test cases
- */
-class FaceMonitor : noncopyable
+class FaceMonitor : public NotificationSubscriber<FaceEventNotification>
{
public:
- typedef function<void(const ndn::nfd::FaceEventNotification&)> NotificationCallback;
- typedef function<void()> TimeoutCallback;
-
- typedef std::vector<NotificationCallback> NotificationCallbacks;
- typedef std::vector<TimeoutCallback> TimeoutCallbacks;
-
- explicit
- FaceMonitor(ndn::Face& face);
-
- ~FaceMonitor();
-
- /** \brief Stops all notifications. This method doesn't remove registered callbacks.
- */
- void
- stopNotifications();
-
- /** \brief Resumes notifications for added subscribers.
- */
- void
- startNotifications();
-
- /** \brief Removes all notification subscribers.
- */
- void
- removeAllSubscribers();
-
- /** \brief Adds a notification subscriber. This method doesn't return on timeouts.
- */
- void
- addSubscriber(const NotificationCallback& notificationCallback);
-
- /** \brief Adds a notification subscriber.
- */
- void
- addSubscriber(const NotificationCallback& notificationCallback,
- const TimeoutCallback& timeoutCallback);
-
-private:
- void
- onTimeout();
-
- void
- onNotification(const Data& data);
-
-private:
- ndn::Face& m_face;
- uint64_t m_lastSequence;
- bool m_isStopped;
- NotificationCallbacks m_notificationCallbacks;
- TimeoutCallbacks m_timeoutCallbacks;
- const ndn::PendingInterestId* m_lastInterestId;
+ FaceMonitor(ndn::Face& face)
+ : NotificationSubscriber<FaceEventNotification>(face, "ndn:/localhost/nfd/faces/events")
+ {
+ }
};
} // namespace nfd