fixes: Remove sync scheduler; Use ndn::time; Passed all the test cases
Change-Id: I50e8cd94f71f463793e4d19d5bf65e190cac6e59
diff --git a/src/sync-interest-table.h b/src/sync-interest-table.h
index 824d1f9..9b7c46b 100644
--- a/src/sync-interest-table.h
+++ b/src/sync-interest-table.h
@@ -23,18 +23,16 @@
#ifndef SYNC_INTEREST_TABLE_H
#define SYNC_INTEREST_TABLE_H
+#include <ndn-cpp-dev/util/scheduler.hpp>
+
#include <string>
#include <vector>
-#include <boost/thread/recursive_mutex.hpp>
-#include <boost/thread/thread.hpp>
-#include <ctime>
-#include "sync-scheduler.h"
+
#include "sync-digest.h"
#include "sync-interest-container.h"
namespace Sync {
-
/**
* \ingroup sync
* @brief A table to keep unanswered Sync Interest
@@ -44,7 +42,7 @@
class SyncInterestTable
{
public:
- SyncInterestTable (TimeDuration lifetime);
+ SyncInterestTable (boost::asio::io_service& io, ndn::time::Duration lifetime);
~SyncInterestTable ();
/**
@@ -83,20 +81,16 @@
expireInterests ();
private:
- static const int m_checkPeriod = 4; // seconds
-
- TimeDuration m_entryLifetime;
+ ndn::time::Duration m_entryLifetime;
InterestContainer m_table;
- Scheduler m_scheduler;
- mutable boost::recursive_mutex m_mutex;
+ ndn::Scheduler m_scheduler;
};
namespace Error {
struct InterestTableIsEmpty : virtual boost::exception, virtual std::exception { };
}
-
} // Sync
#endif // SYNC_INTEREST_TABLE_H