void surf_on_host_created(void (*callback)(sg_host_t))
{
- simgrid::surf::hostCreatedCallbacks.connect([callback](simgrid::surf::Host* host) {
+ simgrid::surf::Host::creationCallbacks.connect([callback](simgrid::surf::Host* host) {
const char* id = host->getName();
sg_host_t h = sg_host_by_name(id);
xbt_assert(h != NULL, "Host not found for name %s", id);
simgrid::xbt::Extension<simgrid::Host, Host> Host::EXTENSION_ID;
-simgrid::surf::signal<void(simgrid::surf::Host*)> hostCreatedCallbacks;
-simgrid::surf::signal<void(simgrid::surf::Host*)> hostDestructedCallbacks;
-simgrid::surf::signal<void(simgrid::surf::Host*, e_surf_resource_state_t, e_surf_resource_state_t)> hostStateChangedCallbacks;
-simgrid::surf::signal<void(simgrid::surf::HostAction*, e_surf_action_state_t, e_surf_action_state_t)> hostActionStateChangedCallbacks;
-
/*********
* Model *
*********/
/************
* Resource *
************/
+simgrid::surf::signal<void(simgrid::surf::Host*)> Host::creationCallbacks;
+simgrid::surf::signal<void(simgrid::surf::Host*)> Host::destructionCallbacks;
+simgrid::surf::signal<void(simgrid::surf::Host*, e_surf_resource_state_t, e_surf_resource_state_t)> Host::stateChangeCallbacks;
void Host::init()
{
Host::Host(simgrid::surf::Model *model, const char *name, xbt_dict_t props, lmm_constraint_t constraint,
xbt_dynar_t storage, RoutingEdge *netElm, Cpu *cpu)
: Resource(model, name, constraint)
-, PropertyHolder(props)
+ , PropertyHolder(props)
, p_storage(storage), p_netElm(netElm), p_cpu(cpu)
{
p_params.ramsize = 0;
void Host::onDie()
{
- hostDestructedCallbacks(this);
+ destructionCallbacks(this);
Resource::onDie();
}
xbt_die("Already attached to host %s", host->id().c_str());
host->extension_set(this);
p_host = host;
- hostCreatedCallbacks(this);
+ creationCallbacks(this);
}
void Host::setState(e_surf_resource_state_t state){
e_surf_resource_state_t old = Resource::getState();
Resource::setState(state);
- hostStateChangedCallbacks(this, old, state);
+ stateChangeCallbacks(this, old, state);
p_cpu->setState(state);
}
/**********
* Action *
**********/
+simgrid::surf::signal<void(simgrid::surf::HostAction*, e_surf_action_state_t, e_surf_action_state_t)> HostAction::stateChangeCallbacks;
void HostAction::setState(e_surf_action_state_t state){
e_surf_action_state_t old = getState();
Action::setState(state);
- hostActionStateChangedCallbacks(this, old, state);
+ stateChangeCallbacks(this, old, state);
}
}
class XBT_PRIVATE Host;
class XBT_PRIVATE HostAction;
-/*************
- * Callbacks *
- *************/
-
-/** @ingroup SURF_callbacks
- * @brief Callbacks fired after Host creation. Signature: `void(Host*)`
- */
-XBT_PUBLIC_DATA(simgrid::surf::signal<void(Host*)>) hostCreatedCallbacks;
-
-/** @ingroup SURF_callbacks
- * @brief Callbacks fired Host destruction. Signature: `void(Host*)`
- */
-XBT_PUBLIC_DATA(simgrid::surf::signal<void(Host*)>) hostDestructedCallbacks;
-
-/** @ingroup SURF_callbacks
- * @brief Callbacks fired after Host State changed. Signature: `void(Host *, e_surf_resource_state_t old, e_surf_resource_state_t current)`
- */
-XBT_PUBLIC_DATA(simgrid::surf::signal<void(Host*, e_surf_resource_state_t, e_surf_resource_state_t)>) hostStateChangedCallbacks;
-
-/** @ingroup SURF_callbacks
- * @brief Callbacks fired HostAction State changed. Signature: `void(HostAction *, e_surf_action_state_t old, e_surf_action_state_t current)`
- */
-XBT_PUBLIC_DATA(simgrid::surf::signal<void(HostAction*, e_surf_action_state_t, e_surf_action_state_t)>) hostActionStateChangedCallbacks;
}
}
* @brief SURF Host model interface class
* @details A model is an object which handle the interactions between its Resources and its Actions
*/
-class HostModel : public Model {
+class HostModel : public Model{
public:
HostModel() : Model() {}
~HostModel() {}
public simgrid::surf::PropertyHolder {
public:
static simgrid::xbt::Extension<simgrid::Host, Host> EXTENSION_ID;
+
+ /* callbacks */
+ static simgrid::surf::signal<void(Host*)> creationCallbacks; /** Called on each newly created object */
+ static simgrid::surf::signal<void(Host*)> destructionCallbacks; /** Called just before destructing an object */
+ static simgrid::surf::signal<void(simgrid::surf::Host*, e_surf_resource_state_t, e_surf_resource_state_t)> stateChangeCallbacks;
+
+public:
static void init();
/**
* @brief Host constructor
*/
class HostAction : public Action {
public:
+ static simgrid::surf::signal<void(simgrid::surf::HostAction*, e_surf_action_state_t, e_surf_action_state_t)> stateChangeCallbacks;
+
/**
* @brief HostAction constructor
*
routing_model_create(NULL);
- simgrid::surf::hostCreatedCallbacks.connect([](simgrid::surf::Host*) {
+ simgrid::surf::Host::creationCallbacks.connect([](simgrid::surf::Host*) {
host_number_int++;
});
sg_platf_link_add_cb(netcste_parse_nolink);
{
using simgrid::surf::networkActionStateChangedCallbacks;
using simgrid::surf::networkCommunicateCallbacks;
- using simgrid::surf::hostCreatedCallbacks;
if (surf_network_model)
return;
xbt_dynar_push(all_existing_models, &surf_network_model);
networkActionStateChangedCallbacks.connect(IB_action_state_changed_callback);
networkCommunicateCallbacks.connect(IB_action_init_callback);
- hostCreatedCallbacks.connect(IB_create_host_callback);
+ simgrid::surf::Host::creationCallbacks.connect(IB_create_host_callback);
xbt_cfg_setdefault_double(_sg_cfg_set, "network/weight_S", 8775);
}
if (simgrid::energy::surf_energy == NULL) {
simgrid::energy::surf_energy =
new std::map<simgrid::surf::Host*, simgrid::energy::HostEnergy*>();
- simgrid::surf::hostCreatedCallbacks.connect(energyHostCreatedCallback);
simgrid::surf::VMCreatedCallbacks.connect(energyVMCreatedCallback);
- simgrid::surf::hostDestructedCallbacks.connect(energyHostDestructedCallback);
+ simgrid::surf::Host::creationCallbacks.connect(energyHostCreatedCallback);
+ simgrid::surf::Host::destructionCallbacks.connect(energyHostDestructedCallback);
simgrid::surf::cpuActionStateChangedCallbacks.connect(
energyCpuActionStateChangedCallback);
simgrid::surf::surfExitCallbacks.connect(sg_energy_plugin_exit);
- simgrid::surf::hostStateChangedCallbacks.connect(
+ simgrid::surf::Host::stateChangeCallbacks.connect(
energyStateChangedCallback);
}
}
{
XBT_DEBUG("Create all Libs");
host_list = xbt_dict_new_homogeneous([](void*p) {
- delete (simgrid::Host*)p;
+ delete static_cast<simgrid::Host*>(p);
});
as_router_lib = xbt_lib_new();
storage_lib = xbt_lib_new();