commit 1888f749ae4b925cba19f5e6301f2e3dde148ce0
author Zhenkai Zhu <zhenkai@cs.ucla.edu> Mon Jan 28 12:47:33 2013 -0800
committer Zhenkai Zhu <zhenkai@cs.ucla.edu> Mon Jan 28 12:47:33 2013 -0800
tree 656b5dfa8ecae7986e709098bbe83fe9bdcb5b49
parent b3d4cd590de5755dc3caa24133336ebe50e2c110

Run ccnx interest and data callback in executor
Run scheduler task in executor

scheduler/scheduler.h

diff --git a/scheduler/scheduler.h b/scheduler/scheduler.h
index 18bd9bd..096be98 100644
--- a/scheduler/scheduler.h
+++ b/scheduler/scheduler.h
@@ -39,6 +39,7 @@
 
 #include "task.h"
 #include "interval-generator.h"
+#include "executor.h"
 
 class Scheduler;
 typedef boost::shared_ptr<Scheduler> SchedulerPtr;
@@ -110,6 +111,9 @@
   rescheduleTaskAt (TaskPtr task, double time);
 
   void
+  execute(Executor::Job);
+
+  void
   eventLoop();
 
   event_base *
@@ -135,6 +139,7 @@
   event_base *m_base;
   event *m_ev;
   boost::thread m_thread;
+  Executor m_executor;
 };
 
 struct SchedulerException : virtual boost::exception, virtual std::exception { };