#include "src/simix/popping_private.hpp"
#include "src/surf/PropertyHolder.hpp"
#include <boost/intrusive/list.hpp>
+#include <functional>
#include <list>
#include <map>
struct s_smx_process_exit_fun_t {
- int_f_pvoid_pvoid_t fun;
+ std::function<void(int, void*)> fun;
void *arg;
};
namespace simgrid {
-namespace simix {
+namespace kernel {
+namespace actor {
class ProcessArg {
public:
void* data = nullptr;
s4u::Host* host = nullptr;
double kill_time = 0.0;
- std::shared_ptr<std::map<std::string, std::string>> properties;
+ std::shared_ptr<std::unordered_map<std::string, std::string>> properties;
bool auto_restart = false;
ProcessArg() = default;
explicit ProcessArg(std::string name, std::function<void()> code, void* data, s4u::Host* host, double kill_time,
- std::shared_ptr<std::map<std::string, std::string>> properties, bool auto_restart)
+ std::shared_ptr<std::unordered_map<std::string, std::string>> properties, bool auto_restart)
: name(name)
, code(std::move(code))
, data(data)
aid_t pid = 0;
aid_t ppid = -1;
simgrid::xbt::string name;
- const simgrid::xbt::string& getName() const { return name; }
- const char* getCname() const { return name.c_str(); }
+ const simgrid::xbt::string& get_name() const { return name; }
+ const char* get_cname() const { return name.c_str(); }
s4u::Host* host = nullptr; /* the host on which the process is running */
smx_context_t context = nullptr; /* the context (uctx/raw/thread) that executes the user function */
- // TODO, pack them
std::exception_ptr exception;
bool finished = false;
bool blocked = false;
smx_activity_t waiting_synchro = nullptr; /* the current blocking synchro if any */
std::list<smx_activity_t> comms; /* the current non-blocking communication synchros */
- s_smx_simcall_t simcall;
- void* userdata = nullptr; /* kept for compatibility, it should be replaced with moddata */
+ s_smx_simcall simcall;
std::vector<s_smx_process_exit_fun_t> on_exit; /* list of functions executed when the process dies */
std::function<void()> code;
smx_timer_t kill_timer = nullptr;
- /* Refcounting */
private:
+ void* userdata = nullptr; /* kept for compatibility, it should be replaced with moddata */
+ /* Refcounting */
std::atomic_int_fast32_t refcount_{0};
public:
typedef boost::intrusive::list<ActorImpl, boost::intrusive::member_hook<ActorImpl, boost::intrusive::list_member_hook<>,
&ActorImpl::smx_synchro_hook>>
SynchroList;
-}
-}
-typedef simgrid::simix::ActorImpl* smx_actor_t;
+XBT_PUBLIC void create_maestro(std::function<void()> code);
+}
+} // namespace kernel
+} // namespace simgrid
-extern "C" {
+typedef simgrid::kernel::actor::ActorImpl* smx_actor_t;
XBT_PRIVATE smx_actor_t SIMIX_process_create(const char* name, std::function<void()> code, void* data, sg_host_t host,
- std::map<std::string, std::string>* properties,
+ std::unordered_map<std::string, std::string>* properties,
smx_actor_t parent_process);
XBT_PRIVATE void SIMIX_process_runall();
XBT_PRIVATE void SIMIX_process_kill(smx_actor_t process, smx_actor_t issuer);
-XBT_PRIVATE void SIMIX_process_killall(smx_actor_t issuer, int reset_pid);
+XBT_PRIVATE void SIMIX_process_killall(smx_actor_t issuer);
XBT_PRIVATE void SIMIX_process_cleanup(smx_actor_t arg);
XBT_PRIVATE void SIMIX_process_empty_trash();
XBT_PRIVATE void SIMIX_process_yield(smx_actor_t self);
XBT_PRIVATE void SIMIX_process_change_host(smx_actor_t process, sg_host_t dest);
-XBT_PRIVATE smx_actor_t SIMIX_process_get_by_name(const char* name);
XBT_PRIVATE void SIMIX_process_auto_restart_set(smx_actor_t process, int auto_restart);
-extern void (*SMPI_switch_data_segment)(int dest);
-}
+extern void (*SMPI_switch_data_segment)(simgrid::s4u::ActorPtr actor);
XBT_PRIVATE void SIMIX_process_sleep_destroy(smx_activity_t synchro);
XBT_PRIVATE smx_activity_t SIMIX_process_join(smx_actor_t issuer, smx_actor_t process, double timeout);