fw: NccStrategy remembers only best face
refs #1961
Strategy::beforeSatisfyPendingInterest is renamed to
Strategy::beforeSatisfyInterest, so as to match the semantics of this trigger.
This is a backwards-incompatible change that requires function renaming in
all subclasses of Strategy class.
LimitedIo::afterOp gets a bugfix that allows it to be invoked out of
LimitedIo::run without leaving io_service unusable.
Change-Id: Ia4c632beb62c554724b83846a3d6358ae08779ad
diff --git a/tests/limited-io.cpp b/tests/limited-io.cpp
index b22be89..9df197c 100644
--- a/tests/limited-io.cpp
+++ b/tests/limited-io.cpp
@@ -1,11 +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
+ * 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.
@@ -20,7 +21,7 @@
*
* 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 "limited-io.hpp"
#include "core/logger.hpp"
@@ -43,6 +44,11 @@
LimitedIo::run(int nOpsLimit, const time::nanoseconds& nTimeLimit)
{
BOOST_ASSERT(!m_isRunning);
+
+ if (nOpsLimit <= 0) {
+ return EXCEED_OPS;
+ }
+
m_isRunning = true;
m_reason = NO_WORK;
@@ -69,6 +75,12 @@
void
LimitedIo::afterOp()
{
+ if (!m_isRunning) {
+ // Do not proceed further if .afterOp() is invoked out of .run(),
+ // because io_service.stop() without io_service.reset() would leave it unusable.
+ return;
+ }
+
--m_nOpsRemaining;
if (m_nOpsRemaining <= 0) {
m_reason = EXCEED_OPS;