commit f75a0aad5dba72d9bfcbb2207194ec5bec711c0a
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Thu Jan 09 14:29:22 2014 -0800
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Thu Jan 09 15:14:30 2014 -0800
tree 749c61c27ee34286f7f2e9017c299420ae255067
parent bf08211d28926ab40838c1638cf96a91d72ce99b

node: Extending processEvents API to allow processing thread management flexibility

The application now can request that the processing thread exists even
if there are no events to process.  Face::shutdown need to be called to
terminate thread processing.

Change-Id: I2973d088edbb3765b6f33cb1324055b9dc2c50ec

src/node.cpp

diff --git a/src/node.cpp b/src/node.cpp
index dcbcf84..5dcbd7b 100644
--- a/src/node.cpp
+++ b/src/node.cpp
@@ -224,21 +224,34 @@
 }
 
 void 
-Node::processEvents(Milliseconds timeout/* = 0 */)
+Node::processEvents(Milliseconds timeout/* = 0 */, bool keepThread/* = false*/)
 {
-  if (timeout > 0)
-    {
-      processEventsTimeoutTimer_->expires_from_now(boost::posix_time::milliseconds(timeout));
-      processEventsTimeoutTimer_->async_wait(fireProcessEventsTimeout);
-    }
   try
     {
+      if (timeout < 0)
+        {
+          // do not block if timeout is negative, but process pending events
+          ioService_->poll();
+          return;
+        }
+
+      if (timeout > 0)
+        {
+          processEventsTimeoutTimer_->expires_from_now(boost::posix_time::milliseconds(timeout));
+          processEventsTimeoutTimer_->async_wait(fireProcessEventsTimeout);
+        }
+      
+      if (keepThread) {
+        // work will ensure that ioService_ is running until work object exists
+        ioServiceWork_ = ptr_lib::make_shared<boost::asio::io_service::work>(boost::ref(*ioService_));
+      }
+          
       ioService_->run();
-      ioService_->reset();
     }
   catch(Node::ProcessEventsTimeout &)
     {
       // break
+      ioService_->reset();
     }
 }
 
@@ -276,7 +289,9 @@
 
     if (registeredPrefixTable_.empty()) {
       transport_->close();
-      processEventsTimeoutTimer_->cancel();
+      if (!ioServiceWork_) {
+        processEventsTimeoutTimer_->cancel();
+      }
     }
   }
 }
@@ -318,6 +333,9 @@
   pitTimeoutCheckTimer_->cancel();
   processEventsTimeoutTimer_->cancel();
   pitTimeoutCheckTimerActive_ = false;
+  
+  // This will ensure that io_service::work will stop
+  ioServiceWork_.reset();
 }
 
 Node::PendingInterestTable::iterator