#include "storage_interface.hpp"
#include "cpu_interface.hpp"
#include "network_interface.hpp"
+#include "src/surf/PropertyHolder.hpp"
#include <xbt/base.h>
class XBT_PRIVATE Host;
class XBT_PRIVATE HostAction;
-/*************
- * Callbacks *
- *************/
-
-/** @ingroup SURF_callbacks
- * @brief Callbacks fired after Host creation. Signature: `void(Host*)`
- */
-XBT_PUBLIC_DATA(surf_callback(void, Host*)) hostCreatedCallbacks;
-
-/** @ingroup SURF_callbacks
- * @brief Callbacks fired Host destruction. Signature: `void(Host*)`
- */
-XBT_PUBLIC_DATA(surf_callback(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;
-
-/** @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;
}
}
* @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() {}
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 {
+class Host : public simgrid::surf::Resource,
+ public simgrid::surf::PropertyHolder {
+public:
+ static simgrid::xbt::Extension<simgrid::Host, Host> EXTENSION_ID;
+
+ /* callbacks */
+ static simgrid::surf::signal<void(Host*)> onCreation; /** Called on each newly created object */
+ static simgrid::surf::signal<void(Host*)> onDestruction; /** Called just before destructing an object */
+ static simgrid::surf::signal<void(simgrid::surf::Host*, e_surf_resource_state_t, e_surf_resource_state_t)> onStateChange;
+
public:
- static simgrid::xbt::FacetLevel<simgrid::Host, Host> LEVEL;
static void init();
/**
* @brief Host constructor
void attach(simgrid::Host* host);
void setState(e_surf_resource_state_t state);
- /**
- * @brief Get the properties of the current Host
- *
- * @return The properties of the current Host
- */
- xbt_dict_t getProperties();
-
/**
* @brief Execute some quantity of computation
*
*/
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;
simgrid::Host* p_host = nullptr;
- xbt_dict_t p_properties = NULL;
/** @brief Get the list of virtual machines on the current Host */
xbt_dynar_t getVms();
*/
class HostAction : public Action {
public:
+ static simgrid::surf::signal<void(simgrid::surf::HostAction*, e_surf_action_state_t, e_surf_action_state_t)> onStateChange;
+
/**
* @brief HostAction constructor
*