Simplified cpp version

cpp/Makefile

@@ -1,5 +1,5 @@
-CXX = g++
-CXXFLAGS = -Wall -g -O2 -pthread -std=c++0x
+CXX=g++
+CXXFLAGS=-Wall -g -O2 -pthread -std=c++11
 INCLUDES=-I$(MESOS_INSTALL)/include
 LIBRARY_PATH=$(MESOS_INSTALL)/lib
 LDFLAGS += -L$(LIBRARY_PATH) -lmesos -lpthread -lprotobuf

cpp/crawl_executor.cpp

@@ -108,20 +108,6 @@ static void runTask(ExecutorDriver* driver, const TaskInfo& task)
   };
 
   driver->sendFrameworkMessage(vectorToString(result));
-
-  TaskStatus status;
-  status.mutable_task_id()->MergeFrom(task.task_id());
-  status.set_state(TASK_FINISHED);
-  driver->sendStatusUpdate(status);
-}
-
-
-void* start(void* arg)
-{
-  lambda::function<void(void)>* thunk = (lambda::function<void(void)>*) arg;
-  (*thunk)();
-  delete thunk;
-  return NULL;
 }
 
 class CrawlExecutor : public Executor
@@ -150,25 +136,20 @@ class CrawlExecutor : public Executor
     {
       cout << "Starting task " << task.task_id().value() << endl;
 
-      lambda::function<void(void)>* thunk =
-        new lambda::function<void(void)>(lambda::bind(&runTask, driver, task));
+      TaskStatus status;
+      status.mutable_task_id()->MergeFrom(task.task_id());
+      status.set_state(TASK_RUNNING);
+
+      driver->sendStatusUpdate(status);
 
-      pthread_t pthread;
-      if (pthread_create(&pthread, NULL, &start, thunk) != 0) {
-        TaskStatus status;
-        status.mutable_task_id()->MergeFrom(task.task_id());
-        status.set_state(TASK_FAILED);
+      runTask(driver, task);
 
-        driver->sendStatusUpdate(status);
-      } else {
-        pthread_detach(pthread);
+      cout << "Finishing task " << task.task_id().value() << endl;
 
-        TaskStatus status;
-        status.mutable_task_id()->MergeFrom(task.task_id());
-        status.set_state(TASK_RUNNING);
+      status.mutable_task_id()->MergeFrom(task.task_id());
+      status.set_state(TASK_FINISHED);
 
-        driver->sendStatusUpdate(status);
-      }
+      driver->sendStatusUpdate(status);
     }
 
   virtual void killTask(ExecutorDriver* driver, const TaskID& taskId) {}

cpp/render_executor.cpp

@@ -58,19 +58,6 @@ static void runTask(ExecutorDriver* driver, const TaskInfo& task)
   assert(system(cmd.c_str()) != -1);
 
   driver->sendFrameworkMessage(vectorToString(result));
-
-  TaskStatus status;
-  status.mutable_task_id()->MergeFrom(task.task_id());
-  status.set_state(TASK_FINISHED);
-  driver->sendStatusUpdate(status);
-}
-
-void* start(void* arg)
-{
-  lambda::function<void(void)>* thunk = (lambda::function<void(void)>*) arg;
-  (*thunk)();
-  delete thunk;
-  return NULL;
 }
 
 class RenderExecutor : public Executor
@@ -100,25 +87,20 @@ class RenderExecutor : public Executor
     {
       cout << "Starting task " << task.task_id().value() << endl;
 
-      lambda::function<void(void)>* thunk =
-        new lambda::function<void(void)>(lambda::bind(&runTask, driver, task));
+      TaskStatus status;
+      status.mutable_task_id()->MergeFrom(task.task_id());
+      status.set_state(TASK_RUNNING);
+
+      driver->sendStatusUpdate(status);
 
-      pthread_t pthread;
-      if (pthread_create(&pthread, NULL, &start, thunk) != 0) {
-        TaskStatus status;
-        status.mutable_task_id()->MergeFrom(task.task_id());
-        status.set_state(TASK_FAILED);
+      runTask(driver, task);
 
-        driver->sendStatusUpdate(status);
-      } else {
-        pthread_detach(pthread);
+      cout << "Finishing task " << task.task_id().value() << endl;
 
-        TaskStatus status;
-        status.mutable_task_id()->MergeFrom(task.task_id());
-        status.set_state(TASK_RUNNING);
+      status.mutable_task_id()->MergeFrom(task.task_id());
+      status.set_state(TASK_FINISHED);
 
-        driver->sendStatusUpdate(status);
-      }
+      driver->sendStatusUpdate(status);
     }
 
     virtual void killTask(ExecutorDriver* driver, const TaskID& taskId) {}

cpp/rendler.cpp

@@ -34,6 +34,7 @@
 using namespace mesos;
 
 using std::cout;
+using std::cerr;
 using std::endl;
 using std::string;
 using std::vector;
@@ -280,7 +281,7 @@ static void SIGINTHandler(int signum)
 #define shift argc--,argv++
 int main(int argc, char** argv)
 {
-  string seedUrl, master;
+  string master, seedUrl;
   shift;
   while (true) {
     string s = argc>0 ? argv[0] : "--help";
@@ -319,30 +320,32 @@ int main(int argc, char** argv)
   renderer.set_name("Render Executor (C++)");
   renderer.set_source("cpp");
 
-  Rendler scheduler(crawler, renderer, seedUrl);
-
   FrameworkInfo framework;
   framework.set_user(""); // Have Mesos fill in the current user.
   framework.set_name("Rendler Framework (C++)");
   //framework.set_role(role);
   framework.set_principal("rendler-cpp");
-
+  
   // Set up the signal handler for SIGINT for clean shutdown.
   struct sigaction action;
   action.sa_handler = SIGINTHandler;
   sigemptyset(&action.sa_mask);
   action.sa_flags = 0;
   sigaction(SIGINT, &action, NULL);
 
-  schedulerDriver = new MesosSchedulerDriver(&scheduler, framework, master);
+  Rendler scheduler(crawler, renderer, seedUrl);
 
+  schedulerDriver = new MesosSchedulerDriver(
+      &scheduler,
+      framework,
+      master);
+
   int status = schedulerDriver->run() == DRIVER_STOPPED ? 0 : 1;
 
   // Ensure that the driver process terminates.
-  schedulerDriver->stop();
-
+  schedulerDriver->stop();  
   shutdown();
-
+  
   delete schedulerDriver;
   return status;
 }