X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ce517cabcabd7b677a79b6c782a220ee8b5151a6..bc37fe765c04a93a0a7e9c5530558aa38589b70c:/include/xbt/functional.hpp

diff --git a/include/xbt/functional.hpp b/include/xbt/functional.hpp
index d9146a3f0a..99cba0d7e1 100644
--- a/include/xbt/functional.hpp
+++ b/include/xbt/functional.hpp
@@ -7,13 +7,19 @@
 #ifndef XBT_FUNCTIONAL_HPP
 #define XBT_FUNCTIONAL_HPP
 
+#include <cstddef>
 #include <cstdlib>
+#include <cstring>
 
+#include <array>
 #include <exception>
 #include <functional>
-#include <future>
-#include <utility>
+#include <memory>
+#include <string>
 #include <tuple>
+#include <type_traits>
+#include <utility>
+#include <vector>
 
 #include <xbt/sysdep.h>
 #include <xbt/utility.hpp>
@@ -21,102 +27,39 @@
 namespace simgrid {
 namespace xbt {
 
-class args {
+template<class F>
+class MainFunction {
 private:
-  int argc_ = 0;
-  char** argv_ = nullptr;
+  F code_;
+  std::shared_ptr<const std::vector<std::string>> args_;
 public:
-
-  // Main constructors
-  args() {}
-
-  void assign(int argc, const char*const* argv)
-  {
-    clear();
-    char** new_argv = xbt_new(char*,argc + 1);
-    for (int i = 0; i < argc; i++)
-      new_argv[i] = xbt_strdup(argv[i]);
-    new_argv[argc] = nullptr;
-    this->argc_ = argc;
-    this->argv_ = new_argv;
-  }
-  args(int argc, const char*const* argv)
+  MainFunction(F code, std::vector<std::string> args) :
+    code_(std::move(code)),
+    args_(std::make_shared<const std::vector<std::string>>(std::move(args)))
+  {}
+  void operator()() const
   {
-    this->assign(argc, argv);
-  }
-
-  char** to_argv() const
-  {
-    const int argc = argc_;
-    char** argv = xbt_new(char*, argc + 1);
-    for (int i=0; i< argc; i++)
-      argv[i] = xbt_strdup(argv_[i]);
+    const int argc = args_->size();
+    std::vector<std::string> args = *args_;
+    std::unique_ptr<char*[]> argv(new char*[argc + 1]);
+    for (int i = 0; i != argc; ++i)
+      argv[i] = args[i].empty() ? const_cast<char*>(""): &args[i].front();
     argv[argc] = nullptr;
-    return argv;
-  }
-
-  // Free
-  void clear()
-  {
-    for (int i = 0; i < this->argc_; i++)
-      std::free(this->argv_[i]);
-    std::free(this->argv_);
-    this->argc_ = 0;
-    this->argv_ = nullptr;
-  }
-  ~args() { clear(); }
-
-  // Copy
-  args(args const& that)
-  {
-    this->assign(that.argc(), that.argv());
-  }
-  args& operator=(args const& that)
-  {
-    this->assign(that.argc(), that.argv());
-    return *this;
-  }
-
-  // Move:
-  args(args&& that) : argc_(that.argc_), argv_(that.argv_)
-  {
-    that.argc_ = 0;
-    that.argv_ = nullptr;
-  }
-  args& operator=(args&& that)
-  {
-    this->argc_ = that.argc_;
-    this->argv_ = that.argv_;
-    that.argc_ = 0;
-    that.argv_ = nullptr;
-    return *this;
+    code_(argc, argv.get());
   }
-
-  int    argc()            const { return argc_; }
-  char** argv()                  { return argv_; }
-  const char*const* argv() const { return argv_; }
-  char* operator[](std::size_t i) { return argv_[i]; }
 };
 
 template<class F> inline
-std::function<void()> wrapMain(F code, std::shared_ptr<simgrid::xbt::args> args)
-{
-  return [=]() {
-    code(args->argc(), args->argv());
-  };
-}
-
-template<class F> inline
-std::function<void()> wrapMain(F code, simgrid::xbt::args args)
+std::function<void()> wrapMain(F code, std::vector<std::string> args)
 {
-  return wrapMain(std::move(code),
-    std::unique_ptr<simgrid::xbt::args>(new simgrid::xbt::args(std::move(args))));
+  return MainFunction<F>(std::move(code), std::move(args));
 }
 
 template<class F> inline
-std::function<void()> wrapMain(F code, int argc, const char*const* argv)
+std::function<void()> wrapMain(F code, int argc, const char*const argv[])
 {
-  return wrapMain(std::move(code), args(argc, argv));
+  std::vector<std::string> args(argv, argv + argc);
+  return MainFunction<F>(std::move(code), std::move(args));
 }
 
 namespace bits {
@@ -166,42 +109,174 @@ template<class T> class Task;
 template<class R, class... Args>
 class Task<R(Args...)> {
 private:
-  // Type-erasure for the code:
-  class Base {
-  public:
-    virtual ~Base() {}
-    virtual R operator()(Args...) = 0;
-  };
+
+  // Placeholder for some class type:
+  struct whatever {};
+
+  // Union used for storage:
+  typedef typename std::aligned_union<0,
+    void*,
+    std::pair<void(*)(),void*>,
+    std::pair<void(whatever::*)(), whatever*>
+  >::type TaskUnion;
+
+  // Is F suitable for small buffer optimization?
   template<class F>
-  class Impl : public Base {
-  public:
-    Impl(F&& code) : code_(std::move(code)) {}
-    Impl(F const& code) : code_(code) {}
-    ~Impl() override {}
-    R operator()(Args... args) override
-    {
-      return code_(std::forward<Args>(args)...);
-    }
-  private:
-    F code_;
+  static constexpr bool canSBO()
+  {
+    return sizeof(F) <= sizeof(TaskUnion) &&
+      alignof(F) <= alignof(TaskUnion);
+  }
+
+  static_assert(canSBO<std::reference_wrapper<whatever>>(),
+    "SBO not working for reference_wrapper");
+
+  // Call (and possibly destroy) the function:
+  typedef R (*call_function)(TaskUnion&, Args...);
+  // Destroy the function (of needed):
+  typedef void (*destroy_function)(TaskUnion&);
+  // Move the function (otherwise memcpy):
+  typedef void (*move_function)(TaskUnion& dest, TaskUnion& src);
+
+  // Vtable of functions for manipulating whatever is in the TaskUnion:
+  struct TaskVtable {
+    call_function call;
+    destroy_function destroy;
+    move_function move;
   };
-  std::unique_ptr<Base> code_;
+
+  TaskUnion buffer_;
+  const TaskVtable* vtable_ = nullptr;
+
+  void clear()
+  {
+    if (vtable_ && vtable_->destroy)
+      vtable_->destroy(buffer_);
+  }
+
 public:
+
   Task() {}
   Task(std::nullptr_t) {}
+  ~Task()
+  {
+    this->clear();
+  }
+
+  Task(Task const&) = delete;
+
+  Task(Task&& that)
+  {
+    if (that.vtable_ && that.vtable_->move)
+      that.vtable_->move(buffer_, that.buffer_);
+    else
+      std::memcpy(&buffer_, &that.buffer_, sizeof(buffer_));
+    vtable_ = that.vtable_;
+    that.vtable_ = nullptr;
+  }
+  Task& operator=(Task that)
+  {
+    this->clear();
+    if (that.vtable_ && that.vtable_->move)
+      that.vtable_->move(buffer_, that.buffer_);
+    else
+      std::memcpy(&buffer_, &that.buffer_, sizeof(buffer_));
+    vtable_ = that.vtable_;
+    that.vtable_ = nullptr;
+    return *this;
+  }
+
+private:
 
   template<class F>
-  Task(F&& code) :
-    code_(new Impl<F>(std::forward<F>(code))) {}
+  typename std::enable_if<canSBO<F>()>::type
+  init(F code)
+  {
+    const static TaskVtable vtable {
+      // Call:
+      [](TaskUnion& buffer, Args... args) -> R {
+        F* src = reinterpret_cast<F*>(&buffer);
+        F code = std::move(*src);
+        src->~F();
+        code(std::forward<Args>(args)...);
+      },
+      // Destroy:
+      std::is_trivially_destructible<F>::value ?
+      static_cast<destroy_function>(nullptr) :
+      [](TaskUnion& buffer) {
+        F* code = reinterpret_cast<F*>(&buffer);
+        code->~F();
+      },
+      // Move:
+      [](TaskUnion& dst, TaskUnion& src) {
+        F* src_code = reinterpret_cast<F*>(&src);
+        F* dst_code = reinterpret_cast<F*>(&dst);
+        new(dst_code) F(std::move(*src_code));
+        src_code->~F();
+      }
+    };
+    new(&buffer_) F(std::move(code));
+    vtable_ = &vtable;
+  }
 
-  operator bool() const { return code_ != nullptr; }
-  bool operator!() const { return code_ == nullptr; }
+  template<class F>
+  typename std::enable_if<!canSBO<F>()>::type
+  init(F code)
+  {
+    const static TaskVtable vtable {
+      // Call:
+      [](TaskUnion& buffer, Args... args) -> R {
+        // Delete F when we go out of scope:
+        std::unique_ptr<F> code(*reinterpret_cast<F**>(&buffer));
+        (*code)(std::forward<Args>(args)...);
+      },
+      // Destroy:
+      [](TaskUnion& buffer) {
+        F* code = *reinterpret_cast<F**>(&buffer);
+        delete code;
+      },
+      // Move:
+      nullptr
+    };
+    *reinterpret_cast<F**>(&buffer_) = new F(std::move(code));
+    vtable_ = &vtable;
+  }
+
+public:
+
+  template<class F>
+  Task(F code)
+  {
+    this->init(std::move(code));
+  }
+
+  operator bool() const { return vtable_ != nullptr; }
+  bool operator!() const { return vtable_ == nullptr; }
 
-  template<class... OtherArgs>
-  R operator()(OtherArgs&&... args)
+  R operator()(Args... args)
   {
-    std::unique_ptr<Base> code = std::move(code_);
-    return (*code)(std::forward<OtherArgs>(args)...);
+    if (vtable_ == nullptr)
+      throw std::bad_function_call();
+    const TaskVtable* vtable = vtable_;
+    vtable_ = nullptr;
+    return vtable->call(buffer_, std::forward<Args>(args)...);
+  }
+};
+
+template<class F, class... Args>
+class TaskImpl {
+private:
+  F code_;
+  std::tuple<Args...> args_;
+  typedef decltype(simgrid::xbt::apply(std::move(code_), std::move(args_))) result_type;
+public:
+  TaskImpl(F code, std::tuple<Args...> args) :
+    code_(std::move(code)),
+    args_(std::move(args))
+  {}
+  result_type operator()()
+  {
+    return simgrid::xbt::apply(std::move(code_), std::move(args_));
   }
 };
 
@@ -209,23 +284,8 @@ template<class F, class... Args>
 auto makeTask(F code, Args... args)
 -> Task< decltype(code(std::move(args)...))() >
 {
-  typedef decltype(code(std::move(args)...)) result_type;
-
-  class Impl {
-  private:
-    F code_;
-    std::tuple<Args...> args_;
-  public:
-    Impl(F code, std::tuple<Args...> args) :
-      code_(std::move(code)),
-      args_(std::move(args)) {}
-    result_type operator()()
-    {
-      return simgrid::xbt::apply(std::move(code_), std::move(args_));
-    }
-  };
-
-  return Impl(std::move(code), std::make_tuple(std::move(args)...));
+  TaskImpl<F, Args...> task(std::move(code), std::make_tuple(std::move(args)...));
+  return std::move(task);
 }
 
 }