namespace simgrid {
namespace surf {
-simgrid::xbt::FacetLevel<simgrid::Host, Host> Host::LEVEL;
-
-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;
+simgrid::xbt::Extension<simgrid::Host, Host> Host::EXTENSION_ID;
/*********
* Model *
/************
* Resource *
************/
+simgrid::surf::signal<void(simgrid::surf::Host*)> Host::onCreation;
+simgrid::surf::signal<void(simgrid::surf::Host*)> Host::onDestruction;
+simgrid::surf::signal<void(simgrid::surf::Host*, e_surf_resource_state_t, e_surf_resource_state_t)> Host::onStateChange;
-void Host::init()
+void Host::classInit()
{
- if (!LEVEL.valid()) {
- LEVEL = simgrid::Host::add_level<simgrid::surf::Host>();
- SURF_HOST_LEVEL = LEVEL.id();
+ if (!EXTENSION_ID.valid()) {
+ EXTENSION_ID = simgrid::Host::extension_create<simgrid::surf::Host>([](void *h) {
+ static_cast<simgrid::surf::Host*>(h)->destroy();
+ });
+ SURF_HOST_LEVEL = EXTENSION_ID.id(); // FIXME: KILLME
}
}
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()
+/** @brief use destroy() instead of this destructor */
+Host::~Host()
{
- hostDestructedCallbacks(this);
- Resource::onDie();
+ xbt_assert(currentlyDestroying_, "Don't delete Hosts directly. Call destroy() instead.");
}
-
-Host::~Host()
+/** @brief Fire the require callbacks and destroy the object
+ *
+ * Don't delete directly an Host, call h->destroy() instead.
+ */
+void Host::destroy()
{
- this->die();
+ if (!currentlyDestroying_) {
+ currentlyDestroying_ = true;
+ onDestruction(this);
+ delete this;
+ }
}
void Host::attach(simgrid::Host* host)
{
if (p_host != nullptr)
- xbt_die("Already attached to host %s", host->id().c_str());
- host->set_facet(this);
+ xbt_die("Already attached to host %s", host->getName().c_str());
+ host->extension_set(this);
p_host = host;
- hostCreatedCallbacks(this);
+ onCreation(this);
}
+e_surf_resource_state_t Host::getState() {
+ return p_cpu->getState();
+}
void Host::setState(e_surf_resource_state_t state){
e_surf_resource_state_t old = Resource::getState();
Resource::setState(state);
- hostStateChangedCallbacks(this, old, state);
+ onStateChange(this, old, state);
p_cpu->setState(state);
}
+Action *Host::execute(double size) {
+ return p_cpu->execute(size);
+}
+Action *Host::sleep(double duration) {
+ return p_cpu->sleep(duration);
+}
+
+
simgrid::surf::Storage *Host::findStorageOnMountList(const char* mount)
{
simgrid::surf::Storage *st = NULL;
iter != simgrid::surf::VMModel::ws_vms.end(); ++iter) {
simgrid::surf::VirtualMachine *ws_vm = &*iter;
- if (this == ws_vm->p_subWs)
+ if (this == ws_vm->p_hostPM->extension(simgrid::surf::Host::EXTENSION_ID))
xbt_dynar_push(dyn, &ws_vm);
}
p_params = *params;
}
-/**********
- * Action *
- **********/
-
-void HostAction::setState(e_surf_action_state_t state){
- e_surf_action_state_t old = getState();
- Action::setState(state);
- hostActionStateChangedCallbacks(this, old, state);
-}
-
}
}