X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c529a2898e4b141aa20eaf1561ff8afb5e0cc259..273b2533b20dcd3ec93b159e4507d76e4a4731b8:/include/simgrid/simix.hpp

diff --git a/include/simgrid/simix.hpp b/include/simgrid/simix.hpp
index 8e147d0f8f..1829bad3a3 100644
--- a/include/simgrid/simix.hpp
+++ b/include/simgrid/simix.hpp
@@ -7,8 +7,12 @@
 #ifndef SIMGRID_SIMIX_HPP
 #define SIMGRID_SIMIX_HPP
 
+#include <cstddef>
+
+#include <string>
 #include <utility>
 #include <memory>
+#include <functional>
 
 #include <xbt/function_types.h>
 #include <simgrid/simix.h>
@@ -26,10 +30,8 @@ public:
 
   ContextFactory(std::string name) : name_(std::move(name)) {}
   virtual ~ContextFactory();
-  virtual Context* create_context(
-    xbt_main_func_t, int, char **, void_pfn_smxprocess_t,
-    smx_process_t process
-    ) = 0;
+  virtual Context* create_context(std::function<void()> code,
+    void_pfn_smxprocess_t cleanup, smx_process_t process) = 0;
   virtual void run_all() = 0;
   virtual Context* self();
   std::string const& name() const
@@ -38,7 +40,7 @@ public:
   }
 private:
   void declare_context(void* T, std::size_t size);
-public:
+protected:
   template<class T, class... Args>
   T* new_context(Args&&... args)
   {
@@ -50,26 +52,31 @@ public:
 
 class Context {
 private:
-  xbt_main_func_t code_ = nullptr;
-  int argc_ = 0;
-  char **argv_ = nullptr;
+  std::function<void()> code_;
   void_pfn_smxprocess_t cleanup_func_ = nullptr;
   smx_process_t process_ = nullptr;
 public:
   bool iwannadie;
 public:
-  Context(xbt_main_func_t code,
-          int argc, char **argv,
+  Context(std::function<void()> code,
           void_pfn_smxprocess_t cleanup_func,
           smx_process_t process);
-  int operator()()
+  void operator()()
+  {
+    code_();
+  }
+  bool has_code() const
   {
-    return code_(argc_, argv_);
+    return (bool) code_;
   }
   smx_process_t process()
   {
     return this->process_;
   }
+  void set_cleanup(void_pfn_smxprocess_t cleanup)
+  {
+    cleanup_func_ = cleanup;
+  }
 
   // Virtual methods
   virtual ~Context();