X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/649ff8bac9ec72bc9321a7b21843cd41f7b7e7bc..347f9a2ca55bffc88bf965952b9be3a15535e908:/src/surf/host_interface.cpp diff --git a/src/surf/host_interface.cpp b/src/surf/host_interface.cpp index 9433fe7900..9d740e6ce1 100644 --- a/src/surf/host_interface.cpp +++ b/src/surf/host_interface.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2013-2014. The SimGrid Team. +/* Copyright (c) 2013-2015. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -6,48 +6,36 @@ #include "host_interface.hpp" -#include "simix/smx_private.h" +#include + +#include "src/simix/smx_private.h" #include "cpu_cas01.hpp" #include "simgrid/sg_config.h" #include "network_interface.hpp" -#include "vm_interface.hpp" +#include "virtual_machine.hpp" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_host, surf, "Logging specific to the SURF host module"); -HostModel *surf_host_model = NULL; +simgrid::surf::HostModel *surf_host_model = NULL; + +void host_add_traces(){ + surf_host_model->addTraces(); +} /************* * Callbacks * *************/ -surf_callback(void, Host*) hostCreatedCallbacks; -surf_callback(void, Host*) hostDestructedCallbacks; -surf_callback(void, Host*, e_surf_resource_state_t, e_surf_resource_state_t) hostStateChangedCallbacks; -surf_callback(void, HostAction*, e_surf_action_state_t, e_surf_action_state_t) hostActionStateChangedCallbacks; +namespace simgrid { +namespace surf { -void host_parse_init(sg_platf_host_cbarg_t host) -{ - surf_host_model->createHost(host->id); -} - -void host_add_traces(){ - surf_host_model->addTraces(); -} +simgrid::xbt::Extension Host::EXTENSION_ID; /********* * Model * *********/ -HostModel::HostModel(const char *name) - : Model(name) -{} - -HostModel::HostModel() -: Model("Host") {} - -HostModel::~HostModel() { -} /* Each VM has a dummy CPU action on the PM layer. This CPU action works as the * constraint (capacity) of the VM in the PM layer. If the VM does not have any @@ -60,7 +48,7 @@ void HostModel::adjustWeightOfDummyCpuActions() VMModel::ws_vms.begin(); iter != VMModel::ws_vms.end(); ++iter) { - VM *ws_vm = &*iter; + VirtualMachine *ws_vm = &*iter; CpuCas01 *cpu_cas01 = static_cast(ws_vm->p_cpu); xbt_assert(cpu_cas01, "cpu-less host"); @@ -87,79 +75,86 @@ void HostModel::adjustWeightOfDummyCpuActions() /************ * Resource * ************/ -Host::Host(Model *model, const char *name, xbt_dict_t props, +simgrid::surf::signal Host::onCreation; +simgrid::surf::signal Host::onDestruction; +simgrid::surf::signal Host::onStateChange; + +void Host::classInit() +{ + if (!EXTENSION_ID.valid()) { + EXTENSION_ID = simgrid::Host::extension_create([](void *h) { + static_cast(h)->destroy(); + }); + SURF_HOST_LEVEL = EXTENSION_ID.id(); // FIXME: KILLME + } +} + +Host::Host(simgrid::surf::Model *model, const char *name, xbt_dict_t props, xbt_dynar_t storage, RoutingEdge *netElm, Cpu *cpu) - : Resource(model, name, props) + : Resource(model, name) + , PropertyHolder(props) , p_storage(storage), p_netElm(netElm), p_cpu(cpu) { p_params.ramsize = 0; - surf_callback_emit(hostCreatedCallbacks, this); } -Host::Host(Model *model, const char *name, xbt_dict_t props, lmm_constraint_t constraint, +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, props, constraint) + : Resource(model, name, constraint) + , PropertyHolder(props) , p_storage(storage), p_netElm(netElm), p_cpu(cpu) { p_params.ramsize = 0; - surf_callback_emit(hostCreatedCallbacks, this); } -Host::~Host(){ - surf_callback_emit(hostDestructedCallbacks, this); -} - -void Host::setState(e_surf_resource_state_t state){ - e_surf_resource_state_t old = Resource::getState(); - Resource::setState(state); - surf_callback_emit(hostStateChangedCallbacks, this, old, state); - p_cpu->setState(state); -} - -int Host::getCore(){ - return p_cpu->getCore(); -} - -double Host::getSpeed(double load){ - return p_cpu->getSpeed(load); -} - -double Host::getAvailableSpeed(){ - return p_cpu->getAvailableSpeed(); -} - -double Host::getCurrentPowerPeak() +/** @brief use destroy() instead of this destructor */ +Host::~Host() { - return p_cpu->getCurrentPowerPeak(); + xbt_assert(currentlyDestroying_, "Don't delete Hosts directly. Call destroy() instead."); } - -double Host::getPowerPeakAt(int pstate_index) +/** @brief Fire the require callbacks and destroy the object + * + * Don't delete directly an Host, call h->destroy() instead. + */ +void Host::destroy() { - return p_cpu->getPowerPeakAt(pstate_index); + if (!currentlyDestroying_) { + currentlyDestroying_ = true; + onDestruction(this); + delete this; + } } -int Host::getNbPstates() +void Host::attach(simgrid::Host* host) { - return p_cpu->getNbPstates(); + if (p_host != nullptr) + xbt_die("Already attached to host %s", host->getName().c_str()); + host->extension_set(this); + p_host = host; + onCreation(this); } -void Host::setPstate(int pstate_index) -{ - p_cpu->setPstate(pstate_index); +e_surf_resource_state_t Host::getState() { + return p_cpu->getState(); } -int Host::getPstate() -{ - return p_cpu->getPstate(); +void Host::setState(e_surf_resource_state_t state){ + e_surf_resource_state_t old = Resource::getState(); + Resource::setState(state); + onStateChange(this, old, state); + p_cpu->setState(state); } -xbt_dict_t Host::getProperties() -{ - return p_cpu->getProperties(); +Action *Host::execute(double size) { + return p_cpu->execute(size); +} +Action *Host::sleep(double duration) { + return p_cpu->sleep(duration); } -Storage *Host::findStorageOnMountList(const char* mount) + +simgrid::surf::Storage *Host::findStorageOnMountList(const char* mount) { - Storage *st = NULL; + simgrid::surf::Storage *st = NULL; s_mount_t mnt; unsigned int cursor; @@ -168,7 +163,7 @@ Storage *Host::findStorageOnMountList(const char* mount) { XBT_DEBUG("See '%s'",mnt.name); if(!strcmp(mount,mnt.name)){ - st = static_cast(mnt.storage); + st = static_cast(mnt.storage); break; } } @@ -184,7 +179,7 @@ xbt_dict_t Host::getMountedStorageList() char *storage_name = NULL; xbt_dynar_foreach(p_storage,i,mnt){ - storage_name = (char *)static_cast(mnt.storage)->getName(); + storage_name = (char *)static_cast(mnt.storage)->getName(); xbt_dict_set(storage_list,mnt.name,storage_name,NULL); } return storage_list; @@ -198,7 +193,7 @@ xbt_dynar_t Host::getAttachedStorageList() xbt_dynar_t result = xbt_dynar_new(sizeof(void*), NULL); xbt_lib_foreach(storage_lib, cursor, key, data) { if(xbt_lib_get_level(xbt_lib_get_elm_or_null(storage_lib, key), SURF_STORAGE_LEVEL) != NULL) { - Storage *storage = static_cast(xbt_lib_get_level(xbt_lib_get_elm_or_null(storage_lib, key), SURF_STORAGE_LEVEL)); + simgrid::surf::Storage *storage = static_cast(xbt_lib_get_level(xbt_lib_get_elm_or_null(storage_lib, key), SURF_STORAGE_LEVEL)); if(!strcmp((const char*)storage->p_attach,this->getName())){ xbt_dynar_push_as(result, void *, (void*)storage->getName()); } @@ -209,7 +204,7 @@ xbt_dynar_t Host::getAttachedStorageList() Action *Host::open(const char* fullpath) { - Storage *st = NULL; + simgrid::surf::Storage *st = NULL; s_mount_t mnt; unsigned int cursor; size_t longest_prefix_length = 0; @@ -228,7 +223,7 @@ Action *Host::open(const char* fullpath) { if(!strcmp(file_mount_name,mnt.name) && strlen(mnt.name)>longest_prefix_length) {/* The current mount name is found in the full path and is bigger than the previous*/ longest_prefix_length = strlen(mnt.name); - st = static_cast(mnt.storage); + st = static_cast(mnt.storage); } free(file_mount_name); } @@ -252,19 +247,19 @@ Action *Host::open(const char* fullpath) { } Action *Host::close(surf_file_t fd) { - Storage *st = findStorageOnMountList(fd->mount); + simgrid::surf::Storage *st = findStorageOnMountList(fd->mount); XBT_DEBUG("CLOSE %s on disk '%s'",fd->name, st->getName()); return st->close(fd); } Action *Host::read(surf_file_t fd, sg_size_t size) { - Storage *st = findStorageOnMountList(fd->mount); + simgrid::surf::Storage *st = findStorageOnMountList(fd->mount); XBT_DEBUG("READ %s on disk '%s'",fd->name, st->getName()); return st->read(fd, size); } Action *Host::write(surf_file_t fd, sg_size_t size) { - Storage *st = findStorageOnMountList(fd->mount); + simgrid::surf::Storage *st = findStorageOnMountList(fd->mount); XBT_DEBUG("WRITE %s on disk '%s'",fd->name, st->getName()); return st->write(fd, size); } @@ -275,7 +270,7 @@ int Host::unlink(surf_file_t fd) { return -1; } else { - Storage *st = findStorageOnMountList(fd->mount); + simgrid::surf::Storage *st = findStorageOnMountList(fd->mount); /* Check if the file is on this storage */ if (!xbt_dict_get_or_null(st->p_content, fd->name)){ XBT_WARN("File %s is not on disk %s. Impossible to unlink", fd->name, @@ -302,7 +297,7 @@ sg_size_t Host::getSize(surf_file_t fd){ xbt_dynar_t Host::getInfo( surf_file_t fd) { - Storage *st = findStorageOnMountList(fd->mount); + simgrid::surf::Storage *st = findStorageOnMountList(fd->mount); sg_size_t *psize = xbt_new(sg_size_t, 1); *psize = fd->size; xbt_dynar_t info = xbt_dynar_new(sizeof(void*), NULL); @@ -368,38 +363,31 @@ int Host::fileMove(surf_file_t fd, const char* fullpath){ xbt_dynar_t Host::getVms() { - xbt_dynar_t dyn = xbt_dynar_new(sizeof(VM*), NULL); + xbt_dynar_t dyn = xbt_dynar_new(sizeof(simgrid::surf::VirtualMachine*), NULL); /* iterate for all virtual machines */ - for (VMModel::vm_list_t::iterator iter = - VMModel::ws_vms.begin(); - iter != VMModel::ws_vms.end(); ++iter) { + for (simgrid::surf::VMModel::vm_list_t::iterator iter = + simgrid::surf::VMModel::ws_vms.begin(); + iter != simgrid::surf::VMModel::ws_vms.end(); ++iter) { - VM *ws_vm = &*iter; - if (this == ws_vm->p_subWs) + simgrid::surf::VirtualMachine *ws_vm = &*iter; + if (this == ws_vm->p_hostPM->extension(simgrid::surf::Host::EXTENSION_ID)) xbt_dynar_push(dyn, &ws_vm); } return dyn; } -void Host::getParams(ws_params_t params) +void Host::getParams(vm_params_t params) { *params = p_params; } -void Host::setParams(ws_params_t params) +void Host::setParams(vm_params_t params) { /* may check something here. */ p_params = *params; } -/********** - * Action * - **********/ - -void HostAction::setState(e_surf_action_state_t state){ - e_surf_action_state_t old = getState(); - Action::setState(state); - surf_callback_emit(hostActionStateChangedCallbacks, this, old, state); +} }