commit 0b5fbbb4ff5522b11d62643da21ad275a5e58cb3
author Junxiao Shi <git@mail1.yoursunny.com> Thu Feb 20 15:54:03 2014 -0700
committer Alex Afanasyev <afanasev@cs.ucla.edu> Wed Feb 26 23:53:53 2014 -0800
tree 442c75f7885674206537ae7233a2852975dab374
parent 9b27bd2d926af73da404f0316fc115bb61efa427

fw: NccStrategy

refs #1242

Change-Id: I21f870728b7b361547adbde9d64357c93aeb1ed9

daemon/table/measurements.cpp

diff --git a/daemon/table/measurements.cpp b/daemon/table/measurements.cpp
index ed01018..8caf343 100644
--- a/daemon/table/measurements.cpp
+++ b/daemon/table/measurements.cpp
@@ -19,6 +19,11 @@
 
 Measurements::~Measurements()
 {
+  for (std::map<Name, shared_ptr<measurements::Entry> >::iterator it = m_table.begin();
+       it != m_table.end(); ++it) {
+    shared_ptr<measurements::Entry> entry = it->second;
+    scheduler::cancel(entry->m_cleanup);
+  }
 }
 
 shared_ptr<measurements::Entry>