commit 97b5d401e9d2efc2d085bb159924041cc158accb
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Thu Jun 07 10:30:12 2012 -0700
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Thu Jun 07 10:30:12 2012 -0700
tree a941c70117db6e2b5c10b573e9fae978ab4305c8
parent 641c079c45d49177068d0648c4b7df0351167c63

Synchronization correction in scheduler

ccnx/sync-scheduler.cc

diff --git a/ccnx/sync-scheduler.cc b/ccnx/sync-scheduler.cc
index 866f742..65739d5 100644
--- a/ccnx/sync-scheduler.cc
+++ b/ccnx/sync-scheduler.cc
@@ -110,10 +110,9 @@
 void
 Scheduler::schedule (const TimeDuration &reltime, Event event, uint32_t label)
 {
-  {
-    lock_guard<mutex> lock (m_eventsMutex);
-    m_events.insert (LogicEvent (boost::get_system_time () + reltime, event, label));
-  }
+  lock_guard<mutex> lock (m_eventsMutex);
+  m_events.insert (LogicEvent (boost::get_system_time () + reltime, event, label));
+
   m_eventsCondition.notify_one ();
   m_thread.interrupt (); // interrupt sleep, if currently sleeping
 }
@@ -121,12 +120,11 @@
 void
 Scheduler::cancel (uint32_t label)
 {
-  {
-    // cout << "Canceling label " << label << " size: " << m_events.size () << endl;
-    lock_guard<mutex> lock (m_eventsMutex);
-    m_events.get<byLabel> ().erase (label);
-    // cout << "Canceled label " << label << " size: " << m_events.size () << endl;
-  }
+  // cout << "Canceling label " << label << " size: " << m_events.size () << endl;
+  lock_guard<mutex> lock (m_eventsMutex);
+  m_events.get<byLabel> ().erase (label);
+  // cout << "Canceled label " << label << " size: " << m_events.size () << endl;
+
   m_eventsCondition.notify_one ();
   m_thread.interrupt (); // interrupt sleep, if currently sleeping
 }