commit 7599db43617ccdf7c5406027ac614e625bb72a8c
author Zhenkai Zhu <zhenkai@cs.ucla.edu> Mon Jan 28 10:32:53 2013 -0800
committer Zhenkai Zhu <zhenkai@cs.ucla.edu> Mon Jan 28 10:32:53 2013 -0800
tree 57504bfee90b6d1e02e7b7e4b985c79c4e26b3a3
parent f8b22bfe5568813f22fc22baea6eb494144f66e1

small changes to ccnx mutex (limit scope a little bit)

ccnx/ccnx-wrapper.cpp

diff --git a/ccnx/ccnx-wrapper.cpp b/ccnx/ccnx-wrapper.cpp
index 697901c..d168dba 100644
--- a/ccnx/ccnx-wrapper.cpp
+++ b/ccnx/ccnx-wrapper.cpp
@@ -61,7 +61,7 @@
   //}
 
   m_handle = ccn_create ();
-  UniqueRecLock lock(m_mutex);
+  //UniqueRecLock lock(m_mutex);
   if (ccn_connect(m_handle, NULL) < 0)
   {
     BOOST_THROW_EXCEPTION (CcnxOperationException() << errmsg_info_str("connection to ccnd failed"));
@@ -319,9 +319,11 @@
 
 int CcnxWrapper::sendInterest (const Name &interest, const Closure &closure, const Selectors &selectors)
 {
-  UniqueRecLock lock(m_mutex);
-  if (!m_running || !m_connected)
-    return -1;
+  {
+    UniqueRecLock lock(m_mutex);
+    if (!m_running || !m_connected)
+      return -1;
+  }
 
   CcnxCharbufPtr namePtr = interest.toCcnxCharbuf();
   ccn_charbuf *pname = namePtr->getBuf();
@@ -339,6 +341,7 @@
     templ = selectorsPtr->getBuf();
   }
 
+  UniqueRecLock lock(m_mutex);
   if (ccn_express_interest (m_handle, pname, dataClosure, templ) < 0)
   {
   }
@@ -348,9 +351,11 @@
 
 int CcnxWrapper::setInterestFilter (const Name &prefix, const InterestCallback &interestCallback)
 {
-  UniqueRecLock lock(m_mutex);
-  if (!m_running || !m_connected)
-    return -1;
+  {
+    UniqueRecLock lock(m_mutex);
+    if (!m_running || !m_connected)
+      return -1;
+  }
 
   CcnxCharbufPtr ptr = prefix.toCcnxCharbuf();
   ccn_charbuf *pname = ptr->getBuf();
@@ -358,6 +363,8 @@
 
   interestClosure->data = new InterestCallback (interestCallback); // should be removed when closure is removed
   interestClosure->p = &incomingInterest;
+
+  UniqueRecLock lock(m_mutex);
   int ret = ccn_set_interest_filter (m_handle, pname, interestClosure);
   if (ret < 0)
   {