/** @ingroup SURF_callbacks
* @brief Callbacks fired after Host creation. Signature: `void(Host*)`
*/
-XBT_PUBLIC_DATA(surf_callback(void, Host*)) hostCreatedCallbacks;
+XBT_PUBLIC_DATA(simgrid::surf::signal<void(Host*)>) hostCreatedCallbacks;
/** @ingroup SURF_callbacks
* @brief Callbacks fired Host destruction. Signature: `void(Host*)`
*/
-XBT_PUBLIC_DATA(surf_callback(void, Host*)) hostDestructedCallbacks;
+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(surf_callback(void, Host*, e_surf_resource_state_t, e_surf_resource_state_t)) hostStateChangedCallbacks;
+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(surf_callback(void, HostAction*, e_surf_action_state_t, e_surf_action_state_t)) hostActionStateChangedCallbacks;
+XBT_PUBLIC_DATA(simgrid::surf::signal<void(HostAction*, e_surf_action_state_t, e_surf_action_state_t)>) hostActionStateChangedCallbacks;
}
}
~HostModel() {}
virtual Host *createHost(const char *name, RoutingEdge *net, Cpu *cpu, xbt_dict_t props)=0;
- void addTraces(){DIE_IMPOSSIBLE;}
+ void addTraces() override {DIE_IMPOSSIBLE;}
virtual void adjustWeightOfDummyCpuActions();
virtual Action *executeParallelTask(int host_nb,
double *bytes_amount,
double rate)=0;
- bool shareResourcesIsIdempotent() {return true;}
+ bool shareResourcesIsIdempotent() override {return true;}
};
/************
* @brief SURF Host interface class
* @details An host represents a machine with a aggregation of a Cpu, a Link and a Storage
*/
-class Host : public simgrid::surf::Resource, public simgrid::surf::PropertyHolder {
+class Host : public simgrid::surf::Resource,
+ public simgrid::surf::PropertyHolder {
public:
- static simgrid::xbt::FacetLevel<simgrid::Host, Host> LEVEL;
+ static simgrid::xbt::Extension<simgrid::Host, Host> EXTENSION_ID;
static void init();
/**
* @brief Host constructor
*/
virtual int fileMove(surf_file_t fd, const char* fullpath);
+protected:
+ void onDie() override;
+
+public:
xbt_dynar_t p_storage;
RoutingEdge *p_netElm;
Cpu *p_cpu;