#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;
};
class ProcessArg {
public:
std::string name;
- std::function<void()> code;
+ simgrid::simix::ActorCode code;
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)
+ explicit ProcessArg(std::string name, simgrid::simix::ActorCode code, void* data, s4u::Host* host, double kill_time,
+ std::shared_ptr<std::unordered_map<std::string, std::string>> properties, bool auto_restart)
: name(name)
, code(std::move(code))
, data(data)
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 simcall;
- void* userdata = nullptr; /* kept for compatibility, it should be replaced with moddata */
std::vector<s_smx_process_exit_fun_t> on_exit; /* list of functions executed when the process dies */
- std::function<void()> code;
+ simgrid::simix::ActorCode 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:
bool daemon = false;
public:
void daemonize();
- bool isDaemon() { return daemon; } /** Whether this actor has been daemonized */
- bool isSuspended() { return suspended; }
+ bool isDaemon() const { return daemon; } /** Whether this actor has been daemonized */
+ bool isSuspended() const { return suspended; }
simgrid::s4u::Actor* restart();
smx_activity_t suspend(ActorImpl* issuer);
void resume();
smx_activity_t sleep(double duration);
void setUserData(void* data) { userdata = data; }
- void* getUserData() { return userdata; }
+ void* getUserData() const { return userdata; }
};
/* Used to keep the list of actors blocked on a synchro */
&ActorImpl::smx_synchro_hook>>
SynchroList;
-XBT_PUBLIC void create_maestro(std::function<void()> code);
+XBT_PUBLIC void create_maestro(simgrid::simix::ActorCode code);
}
} // namespace kernel
} // namespace simgrid
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,
+XBT_PRIVATE smx_actor_t SIMIX_process_create(const char* name, simgrid::simix::ActorCode code, void* data, sg_host_t host,
+ std::unordered_map<std::string, std::string>* properties,
smx_actor_t parent_process);
XBT_PRIVATE void SIMIX_process_runall();