X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7e2d0f730f1bdbc0b207f6ac26c0b5ff4f0765fa..6bd36833e0008d85ea07d076a90da2ea1fecc52e:/include/xbt/functional.hpp

diff --git a/include/xbt/functional.hpp b/include/xbt/functional.hpp
index a0c4f26500..b7e361e1da 100644
--- a/include/xbt/functional.hpp
+++ b/include/xbt/functional.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2015-2018. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2015-2020. The SimGrid Team. All rights reserved.          */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
@@ -27,12 +27,11 @@ namespace simgrid {
 namespace xbt {
 
 template <class F> class MainFunction {
-private:
   F code_;
   std::shared_ptr<const std::vector<std::string>> args_;
 
 public:
-  MainFunction(F code, std::vector<std::string> args)
+  MainFunction(F code, std::vector<std::string>&& args)
       : code_(std::move(code)), args_(std::make_shared<const std::vector<std::string>>(std::move(args)))
   {
   }
@@ -51,46 +50,12 @@ public:
       code_(argc, nullptr);
   }
 };
-class MainStdFunction {
-private:
-  void (*code_)(std::vector<std::string>);
-  std::shared_ptr<const std::vector<std::string>> args_;
 
-public:
-  MainStdFunction(void (*code)(std::vector<std::string>), std::vector<std::string> args)
-      : code_(std::move(code)), args_(std::make_shared<const std::vector<std::string>>(std::move(args)))
-  {
-  }
-  void operator()() const
-  {
-    std::vector<std::string> args = *args_;
-    code_(args);
-  }
-};
-
-template <class F>
-inline XBT_ATTRIB_DEPRECATED_v323("Please use wrap_main()") std::function<void()> wrapMain(
-    F code, std::vector<std::string> args)
+template <class F> inline std::function<void()> wrap_main(F code, std::vector<std::string>&& args)
 {
   return MainFunction<F>(std::move(code), std::move(args));
 }
 
-template <class F> inline std::function<void()> wrap_main(F code, std::vector<std::string> args)
-{
-  return MainFunction<F>(std::move(code), std::move(args));
-}
-inline std::function<void()> wrap_main(void (*code)(std::vector<std::string>), std::vector<std::string> args)
-{
-  return MainStdFunction(std::move(code), std::move(args));
-}
-
-template <class F>
-inline XBT_ATTRIB_DEPRECATED_v323("Please use wrap_main()") std::function<void()> wrapMain(F code, int argc,
-                                                                                           const char* const argv[])
-{
-  std::vector<std::string> args(argv, argv + argc);
-  return MainFunction<F>(std::move(code), std::move(args));
-}
 template <class F> inline std::function<void()> wrap_main(F code, int argc, const char* const argv[])
 {
   std::vector<std::string> args(argv, argv + argc);
@@ -143,29 +108,15 @@ template<class T> class Task;
  */
 template<class R, class... Args>
 class Task<R(Args...)> {
-private:
-
   // Placeholder for some class type:
   struct whatever {};
 
   // Union used for storage:
-#if 0
   typedef typename std::aligned_union<0,
     void*,
     std::pair<void(*)(),void*>,
     std::pair<void(whatever::*)(), whatever*>
   >::type TaskUnion;
-#else
-  union TaskUnion {
-    void* ptr;
-    std::pair<void(*)(),void*> funcptr;
-    std::pair<void(whatever::*)(), whatever*> memberptr;
-    char any1[sizeof(std::pair<void(*)(),void*>)];
-    char any2[sizeof(std::pair<void(whatever::*)(), whatever*>)];
-    TaskUnion() { /* Nothing to do */}
-    ~TaskUnion() { /* Nothing to do */}
-  };
-#endif
 
   // Is F suitable for small buffer optimization?
   template<class F>
@@ -217,24 +168,23 @@ public:
       that.vtable_->move(buffer_, that.buffer_);
     else
       std::memcpy(static_cast<void*>(&buffer_), static_cast<void*>(&that.buffer_), sizeof(buffer_));
-
-    vtable_ = that.vtable_;
+    vtable_      = std::move(that.vtable_);
     that.vtable_ = nullptr;
   }
-  Task& operator=(Task that)
+  Task& operator=(Task const& that) = delete;
+  Task& operator=(Task&& that)
   {
     this->clear();
     if (that.vtable_ && that.vtable_->move)
       that.vtable_->move(buffer_, that.buffer_);
     else
       std::memcpy(static_cast<void*>(&buffer_), static_cast<void*>(&that.buffer_), sizeof(buffer_));
-    vtable_ = that.vtable_;
+    vtable_      = std::move(that.vtable_);
     that.vtable_ = nullptr;
     return *this;
   }
 
 private:
-
   template<class F>
   typename std::enable_if<canSBO<F>()>::type
   init(F code)
@@ -245,6 +195,7 @@ private:
         F* src = reinterpret_cast<F*>(&buffer);
         F code = std::move(*src);
         src->~F();
+        // NOTE: std::forward<Args>(args)... is correct.
         return code(std::forward<Args>(args)...);
       },
       // Destroy:
@@ -273,6 +224,7 @@ private:
       [](TaskUnion& buffer, Args... args) {
         // Delete F when we go out of scope:
         std::unique_ptr<F> code(*reinterpret_cast<F**>(&buffer));
+        // NOTE: std::forward<Args>(args)... is correct.
         return (*code)(std::forward<Args>(args)...);
       },
       // Destroy:
@@ -299,13 +251,14 @@ public:
       throw std::bad_function_call();
     const TaskVtable* vtable = vtable_;
     vtable_ = nullptr;
+    // NOTE: std::forward<Args>(args)... is correct.
+    // see C++ [func.wrap.func.inv] for an example
     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;
@@ -320,20 +273,12 @@ public:
   }
 };
 
-template <class F, class... Args>
-XBT_ATTRIB_DEPRECATED_v323("Please use make_task()") auto makeTask(F code, Args... args)
-    -> Task<decltype(code(std::move(args)...))()>
-{
-  TaskImpl<F, Args...> task(std::move(code), std::make_tuple(std::move(args)...));
-  return Task<decltype(code(std::move(args)...))()>(std::move(task));
-}
-
 template <class F, class... Args> auto make_task(F code, Args... args) -> Task<decltype(code(std::move(args)...))()>
 {
   TaskImpl<F, Args...> task(std::move(code), std::make_tuple(std::move(args)...));
   return Task<decltype(code(std::move(args)...))()>(std::move(task));
 }
-}
-}
 
+} // namespace xbt
+} // namespace simgrid
 #endif