#include <cstddef>
-#include <exception>
#include <string>
#include <utility>
#include <memory>
#include <functional>
#include <future>
-#include <type_traits>
#include <xbt/function_types.h>
+#include <xbt/future.hpp>
+
#include <simgrid/simix.h>
XBT_PUBLIC(void) simcall_run_kernel(std::function<void()> const& code);
-namespace simgrid {
-namespace simix {
+/** Execute some code in the kernel and block
+ *
+ * run_blocking() is a generic blocking simcall. It is given a callback
+ * which is executed immediately in the SimGrid kernel. The callback is
+ * responsible for setting the suitable logic for waking up the process
+ * when needed.
+ *
+ * @ref simix::kernelSync() is a higher level wrapper for this.
+ */
+XBT_PUBLIC(void) simcall_run_blocking(std::function<void()> const& code);
-/** Fulfill a promise by executing a given code */
-template<class R, class F>
-void fulfill_promise(std::promise<R>& promise, F&& code)
+template<class F> inline
+void simcall_run_kernel(F& f)
{
- try {
- promise.set_value(std::forward<F>(code)());
- }
- catch(...) {
- promise.set_exception(std::current_exception());
- }
+ simcall_run_kernel(std::function<void()>(std::ref(f)));
}
-
-/** Fulfill a promise by executing a given code
- *
- * This is a special version for `std::promise<void>` because the default
- * version does not compile in this case.
- */
-template<class F>
-void fulfill_promise(std::promise<void>& promise, F&& code)
+template<class F> inline
+void simcall_run_blocking(F& f)
{
- try {
- std::forward<F>(code)();
- promise.set_value();
- }
- catch(...) {
- promise.set_exception(std::current_exception());
- }
+ simcall_run_blocking(std::function<void()>(std::ref(f)));
}
+namespace simgrid {
+
+namespace simix {
+
/** Execute some code in the kernel/maestro
*
* This can be used to enforce mutual exclusion with other simcall.
* of the operation with respect to other simcalls.
*/
template<class F>
-typename std::result_of<F()>::type kernel(F&& code)
+typename std::result_of<F()>::type kernelImmediate(F&& code)
{
// If we are in the maestro, we take the fast path and execute the
// code directly without simcall mashalling/unmarshalling/dispatch:
if (SIMIX_is_maestro())
return std::forward<F>(code)();
- // If we are in the application, pass the code to the maestro which is
+ // If we are in the application, pass the code to the maestro which
// executes it for us and reports the result. We use a std::future which
// conveniently handles the success/failure value for us.
typedef typename std::result_of<F()>::type R;
- std::promise<R> promise;
+ simgrid::xbt::Result<R> result;
simcall_run_kernel([&]{
xbt_assert(SIMIX_is_maestro(), "Not in maestro");
- fulfill_promise(promise, std::forward<F>(code));
+ simgrid::xbt::fulfillPromise(result, std::forward<F>(code));
});
- return promise.get_future().get();
-}
-
-class args {
-private:
- int argc_ = 0;
- char** argv_ = nullptr;
-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)
- {
- 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]);
- argv[argc] = nullptr;
- return argv;
- }
-
- // Free
- void clear()
- {
- for (int i = 0; i < this->argc_; i++)
- free(this->argv_[i]);
- 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;
- }
-
- 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]; }
-};
-
-inline std::function<void()> wrap_main(
- xbt_main_func_t code, std::shared_ptr<simgrid::simix::args> args)
-{
- if (code) {
- return [=]() {
- code(args->argc(), args->argv());
- };
- }
- else return std::function<void()>();
-}
-
-inline
-std::function<void()> wrap_main(xbt_main_func_t code, simgrid::simix::args args)
-{
- if (code)
- return wrap_main(code, std::unique_ptr<simgrid::simix::args>(
- new simgrid::simix::args(std::move(args))));
- else return std::function<void()>();
-}
-
-inline
-std::function<void()> wrap_main(xbt_main_func_t code, int argc, const char*const* argv)
-{
- return wrap_main(code, simgrid::simix::args(argc, argv));
+ return result.get();
}
class Context;
std::string name_;
public:
- ContextFactory(std::string name) : name_(std::move(name)) {}
+ explicit ContextFactory(std::string name) : name_(std::move(name)) {}
virtual ~ContextFactory();
virtual Context* create_context(std::function<void()> code,
void_pfn_smxprocess_t cleanup, smx_process_t process) = 0;
: Context(std::move(code), cleanup_func, process)
{}
- ~AttachContext();
+ ~AttachContext() override;
/** Called by the context when it is ready to give control
* to the maestro.
*/
typedef smx_process_t (*smx_creation_func_t) (
/* name */ const char*,
- /* code */ xbt_main_func_t,
+ std::function<void()> code,
/* userdata */ void*,
/* hostname */ const char*,
/* kill_time */ double,
- simgrid::simix::args args,
/* props */ xbt_dict_t,
/* auto_restart */ int,
/* parent_process */ smx_process_t);
XBT_PUBLIC(void) SIMIX_function_register_process_create(smx_creation_func_t function);
XBT_PUBLIC(smx_process_t) simcall_process_create(const char *name,
- xbt_main_func_t code,
+ std::function<void()> code,
void *data,
const char *hostname,
double kill_time,
- simgrid::simix::args args,
xbt_dict_t properties,
int auto_restart);
+XBT_PUBLIC(smx_timer_t) SIMIX_timer_set(double date, std::packaged_task<void()> callback);
+
+template<class F> inline
+XBT_PUBLIC(smx_timer_t) SIMIX_timer_set(double date, F callback)
+{
+ return SIMIX_timer_set(date, std::packaged_task<void()>(std::move(callback)));
+}
+
+template<class R, class T> inline
+XBT_PUBLIC(smx_timer_t) SIMIX_timer_set(double date, R(*callback)(T*), T* arg)
+{
+ return SIMIX_timer_set(date, [=](){ callback(arg); });
+}
+
#endif
