-/* Copyright (c) 2007-2010, 2012-2015. The SimGrid Team.
+/* Copyright (c) 2007-2018. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
#ifndef SIMGRID_SIMIX_HPP
#define SIMGRID_SIMIX_HPP
-#include <cstddef>
-
-#include <string>
-#include <utility>
-#include <memory>
-#include <functional>
-
-#include <xbt/function_types.h>
-#include <xbt/future.hpp>
+#include <simgrid/simix.h>
#include <xbt/functional.hpp>
+#include <xbt/future.hpp>
+#include <xbt/signal.hpp>
-#include <simgrid/simix.h>
+#include <string>
+#include <unordered_map>
-XBT_PUBLIC(void) simcall_run_kernel(std::function<void()> const& code);
+XBT_PUBLIC void simcall_run_kernel(std::function<void()> const& code);
/** Execute some code in the kernel and block
*
*
* @ref simix::kernelSync() is a higher level wrapper for this.
*/
-XBT_PUBLIC(void) simcall_run_blocking(std::function<void()> const& code);
+XBT_PUBLIC void simcall_run_blocking(std::function<void()> const& code);
template<class F> inline
void simcall_run_kernel(F& f)
* More importantly, this enforces a deterministic/reproducible ordering
* of the operation with respect to other simcalls.
*/
-template<class F>
-typename std::result_of<F()>::type kernelImmediate(F&& code)
+template <class F> typename std::result_of<F()>::type simcall(F&& code)
{
// If we are in the maestro, we take the fast path and execute the
// code directly without simcall mashalling/unmarshalling/dispatch:
// conveniently handles the success/failure value for us.
typedef typename std::result_of<F()>::type R;
simgrid::xbt::Result<R> result;
- simcall_run_kernel([&]{
- xbt_assert(SIMIX_is_maestro(), "Not in maestro");
- simgrid::xbt::fulfillPromise(result, std::forward<F>(code));
- });
+ simcall_run_kernel([&] { simgrid::xbt::fulfill_promise(result, std::forward<F>(code)); });
return result.get();
}
-
-XBT_PUBLIC(void) set_maestro(std::function<void()> code);
-XBT_PUBLIC(void) create_maestro(std::function<void()> code);
+XBT_PUBLIC const std::vector<smx_actor_t>& process_get_runnable();
// What's executed as SIMIX actor code:
typedef std::function<void()> ActorCode;
// Create ActorCode based on argv:
typedef std::function<ActorCode(std::vector<std::string> args)> ActorCodeFactory;
-XBT_PUBLIC(void) registerFunction(const char* name, ActorCodeFactory factory);
-
+XBT_PUBLIC void register_function(std::string name, ActorCodeFactory factory);
}
}
* void *data: data a pointer to any data one may want to attach to the new object.
* sg_host_t host: the location where the new process is executed
* int argc, char **argv: parameters passed to code
- * xbt_dict_t pros: properties
+ * std::map<std::string, std::string>* props: properties
*/
-typedef smx_actor_t (*smx_creation_func_t) (
- /* name */ const char*,
- std::function<void()> code,
- /* userdata */ void*,
- /* hostname */ const char*,
- /* kill_time */ double,
- /* props */ xbt_dict_t,
- /* auto_restart */ int,
- /* parent_process */ smx_actor_t);
-
-extern "C"
-XBT_PUBLIC(void) SIMIX_function_register_process_create(smx_creation_func_t function);
-
-XBT_PUBLIC(smx_actor_t) simcall_process_create(const char *name,
- std::function<void()> code,
- void *data,
- const char *hostname,
- double kill_time,
- xbt_dict_t properties,
- int auto_restart);
-
-XBT_PUBLIC(smx_timer_t) SIMIX_timer_set(double date, simgrid::xbt::Task<void()> callback);
+typedef smx_actor_t (*smx_creation_func_t)(
+ /* name */ std::string, simgrid::simix::ActorCode code,
+ /* userdata */ void*,
+ /* hostname */ sg_host_t,
+ /* props */ std::unordered_map<std::string, std::string>*,
+ /* parent_process */ smx_actor_t);
+
+XBT_PUBLIC void SIMIX_function_register_process_create(smx_creation_func_t function);
+
+XBT_PUBLIC smx_actor_t simcall_process_create(std::string name, simgrid::simix::ActorCode code, void* data,
+ sg_host_t host, std::unordered_map<std::string, std::string>* properties);
+
+XBT_PUBLIC smx_timer_t SIMIX_timer_set(double date, simgrid::xbt::Task<void()> callback);
template<class F> inline
-XBT_PUBLIC(smx_timer_t) SIMIX_timer_set(double date, F callback)
+smx_timer_t SIMIX_timer_set(double date, F callback)
{
return SIMIX_timer_set(date, simgrid::xbt::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)
+smx_timer_t SIMIX_timer_set(double date, R(*callback)(T*), T* arg)
{
return SIMIX_timer_set(date, [=](){ callback(arg); });
}