-/* Copyright (c) 2015-2016. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2015-2018. 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. */
#ifndef XBT_FUNCTIONAL_HPP
#define XBT_FUNCTIONAL_HPP
+#include <xbt/sysdep.h>
+#include <xbt/utility.hpp>
+
#include <cstddef>
#include <cstdlib>
#include <cstring>
#include <utility>
#include <vector>
-#include <xbt/sysdep.h>
-#include <xbt/utility.hpp>
-
namespace simgrid {
namespace xbt {
-template<class F>
-class MainFunction {
+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) :
- code_(std::move(code)),
- args_(std::make_shared<const std::vector<std::string>>(std::move(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)))
+ {
+ }
void operator()() const
{
- const int argc = args_->size();
+ 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;
- code_(argc, argv.get());
+ if (not args.empty()) {
+ char noarg[] = {'\0'};
+ std::unique_ptr<char* []> argv(new char*[argc + 1]);
+ for (int i = 0; i != argc; ++i)
+ argv[i] = args[i].empty() ? noarg : &args[i].front();
+ argv[argc] = nullptr;
+ code_(argc, argv.get());
+ } else
+ code_(argc, nullptr);
}
};
-template<class F> inline
-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()> wrapMain(F code, int argc, const char*const argv[])
+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);
return MainFunction<F>(std::move(code), std::move(args));
*
* auto args = std::make_tuple(1, false);
* int res = apply(foo, args);
- * @encode
+ * @endcode
**/
template <class F, class Tuple>
constexpr auto apply(F&& f, Tuple&& t)
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>
}
public:
-
- Task() {}
- Task(std::nullptr_t) {}
+ Task() { /* Nothing to do */}
+ explicit Task(std::nullptr_t) { /* Nothing to do */}
~Task()
{
this->clear();
if (that.vtable_ && that.vtable_->move)
that.vtable_->move(buffer_, that.buffer_);
else
- std::memcpy(&buffer_, &that.buffer_, sizeof(buffer_));
+ std::memcpy(static_cast<void*>(&buffer_), static_cast<void*>(&that.buffer_), sizeof(buffer_));
+
vtable_ = that.vtable_;
that.vtable_ = nullptr;
}
if (that.vtable_ && that.vtable_->move)
that.vtable_->move(buffer_, that.buffer_);
else
- std::memcpy(&buffer_, &that.buffer_, sizeof(buffer_));
+ std::memcpy(static_cast<void*>(&buffer_), static_cast<void*>(&that.buffer_), sizeof(buffer_));
vtable_ = that.vtable_;
that.vtable_ = nullptr;
return *this;
{
const static TaskVtable vtable {
// Call:
- [](TaskUnion& buffer, Args... args) -> R {
+ [](TaskUnion& buffer, Args... args) {
F* src = reinterpret_cast<F*>(&buffer);
F code = std::move(*src);
src->~F();
- code(std::forward<Args>(args)...);
+
return code(std::forward<Args>(args)...);
},
// Destroy:
std::is_trivially_destructible<F>::value ?
vtable_ = &vtable;
}
- template<class F>
- typename std::enable_if<!canSBO<F>()>::type
- init(F code)
+ template <class F> typename std::enable_if<not canSBO<F>()>::type init(F code)
{
const static TaskVtable vtable {
// Call:
- [](TaskUnion& buffer, Args... args) -> R {
+ [](TaskUnion& buffer, Args... args) {
// Delete F when we go out of scope:
std::unique_ptr<F> code(*reinterpret_cast<F**>(&buffer));
- (*code)(std::forward<Args>(args)...);
+
return (*code)(std::forward<Args>(args)...);
},
// Destroy:
[](TaskUnion& buffer) {
}
public:
-
- template<class F>
- Task(F code)
- {
- this->init(std::move(code));
- }
+ template <class F> explicit Task(F code) { this->init(std::move(code)); }
operator bool() const { return vtable_ != nullptr; }
bool operator!() const { return vtable_ == nullptr; }
}
};
-template<class F, class... Args>
-auto makeTask(F code, Args... args)
--> Task< decltype(code(std::move(args)...))() >
+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));
+}
+
+// Deprecated
+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 std::move(task);
+ return Task<decltype(code(std::move(args)...))()>(std::move(task));
}
+template <class F>
+inline XBT_ATTRIB_DEPRECATED_v323("Please use wrap_main()") std::function<void()> wrapMain(
+ F code, std::vector<std::string> args)
+{
+ return MainFunction<F>(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));
}
+} // namespace xbt
+} // namespace simgrid
#endif
