X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f4ed74ca6d4a744d2956a4f2906c897e1886cefd..71c619779ed661b50ce589403a0f4df7ab0865de:/src/surf/host_interface.cpp diff --git a/src/surf/host_interface.cpp b/src/surf/host_interface.cpp index 956a0b641b..8772f95300 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,39 +6,48 @@ #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 = + simgrid::Host::extension_create([](void *h) { + static_cast(h)->destroy(); + }); /********* * Model * *********/ +Host *HostModel::createHost(const char *name,NetCard *netElm, Cpu *cpu, xbt_dict_t props){ + xbt_dynar_t storageList = (xbt_dynar_t)xbt_lib_get_or_null(storage_lib, name, ROUTING_STORAGE_HOST_LEVEL); + + Host *host = new simgrid::surf::Host(surf_host_model, name, props, + storageList, netElm, cpu); + XBT_DEBUG("Create host %s with %ld mounted disks", name, xbt_dynar_length(host->p_storage)); + return host; +} + /* 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 * active task, the dummy CPU action must be deactivated, so that the VM does @@ -50,7 +59,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"); @@ -77,43 +86,73 @@ void HostModel::adjustWeightOfDummyCpuActions() /************ * Resource * ************/ -Host::Host(Model *model, const char *name, xbt_dict_t props, - xbt_dynar_t storage, RoutingEdge *netElm, Cpu *cpu) - : Resource(model, name, props) +simgrid::surf::signal Host::onCreation; +simgrid::surf::signal Host::onDestruction; +simgrid::surf::signal Host::onStateChange; + +Host::Host(simgrid::surf::Model *model, const char *name, xbt_dict_t props, + xbt_dynar_t storage, NetCard *netElm, Cpu *cpu) + : 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, - xbt_dynar_t storage, RoutingEdge *netElm, Cpu *cpu) - : Resource(model, name, props, constraint) +Host::Host(simgrid::surf::Model *model, const char *name, xbt_dict_t props, lmm_constraint_t constraint, + xbt_dynar_t storage, NetCard *netElm, Cpu *cpu) + : 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); +/** @brief use destroy() instead of this destructor */ +Host::~Host() +{ + xbt_assert(currentlyDestroying_, "Don't delete Hosts directly. Call destroy() instead."); + delete p_cpu; + // FIXME: VM plays strange games, leading to segfaults if I do the expected thing of next line + // delete p_netElm; + delete p_storage; +} +/** @brief Fire the require callbacks and destroy the object + * + * Don't delete directly an Host, call h->destroy() instead. + */ +void Host::destroy() +{ + 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->getName().c_str()); + host->extension_set(this); + p_host = host; + 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); - surf_callback_emit(hostStateChangedCallbacks, this, old, state); + onStateChange(this, old, state); p_cpu->setState(state); } -xbt_dict_t Host::getProperties() -{ - return p_cpu->getProperties(); -} -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; @@ -122,7 +161,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; } } @@ -138,7 +177,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; @@ -152,7 +191,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()); } @@ -163,7 +202,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; @@ -182,7 +221,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); } @@ -206,19 +245,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); } @@ -229,7 +268,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, @@ -256,7 +295,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); @@ -322,15 +361,15 @@ 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); } @@ -348,12 +387,5 @@ void Host::setParams(vm_params_t params) 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); +} }