commit ff8d9dc9f6ff3cf3b3ccd74cbe603cab8517dae0
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Sat Jan 26 00:45:08 2013 -0800
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Sat Jan 26 00:45:08 2013 -0800
tree 320f83116fe1ff9c8787298ac37d32617df4870d
parent 0c545ed1cafdf953a50d7cf4e3f21ff28842d6e0

Adding executor to fetcher: there was a deadlock otherwise

src/fetcher.h

diff --git a/src/fetcher.h b/src/fetcher.h
index c86061f..1be6a27 100644
--- a/src/fetcher.h
+++ b/src/fetcher.h
@@ -25,7 +25,7 @@
 #include "ccnx-wrapper.h"
 #include "ccnx-name.h"
 
-#include "scheduler.h"
+#include "executor.h"
 #include <boost/intrusive/list.hpp>
 #include <boost/date_time/posix_time/posix_time_types.hpp>
 
@@ -58,6 +58,13 @@
   void
   SetForwardingHint (const Ccnx::Name &forwardingHint);
 
+  const Ccnx::Name &
+  GetForwardingHint () const { return m_forwardingHint; }
+
+  const Ccnx::Name &
+  GetName () const { return m_name; }
+
+
 private:
   void
   FillPipeline ();
@@ -99,7 +106,7 @@
   uint32_t m_activePipeline;
 
   boost::posix_time::ptime m_lastPositiveActivity;
-
+  Executor m_executor;
 };
 
 typedef boost::error_info<struct tag_errmsg, std::string> errmsg_info_str;