X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7f4f03348bd07609e258eb3b545bdafc2c881847..be8f70f9dd5f579bae9e30b0ae11ad124e621243:/src/surf/host_interface.cpp diff --git a/src/surf/host_interface.cpp b/src/surf/host_interface.cpp index 737583bcee..8e2f22c9bf 100644 --- a/src/surf/host_interface.cpp +++ b/src/surf/host_interface.cpp @@ -6,6 +6,8 @@ #include "host_interface.hpp" +#include + #include "src/simix/smx_private.h" #include "cpu_cas01.hpp" #include "simgrid/sg_config.h" @@ -18,25 +20,25 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_host, surf, simgrid::surf::HostModel *surf_host_model = NULL; -void host_add_traces(){ - surf_host_model->addTraces(); -} - /************* * Callbacks * *************/ namespace simgrid { namespace surf { - -surf_callback(void, simgrid::surf::Host*) hostCreatedCallbacks; -surf_callback(void, simgrid::surf::Host*) hostDestructedCallbacks; -surf_callback(void, simgrid::surf::Host*, e_surf_resource_state_t, e_surf_resource_state_t) hostStateChangedCallbacks; -surf_callback(void, simgrid::surf::HostAction*, e_surf_action_state_t, e_surf_action_state_t) hostActionStateChangedCallbacks; + +simgrid::xbt::Extension Host::EXTENSION_ID; /********* * 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, 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 @@ -50,11 +52,9 @@ void HostModel::adjustWeightOfDummyCpuActions() iter != VMModel::ws_vms.end(); ++iter) { VirtualMachine *ws_vm = &*iter; - CpuCas01 *cpu_cas01 = static_cast(ws_vm->p_cpu); - xbt_assert(cpu_cas01, "cpu-less host"); + Cpu *cpu = ws_vm->p_cpu; - int is_active = lmm_constraint_used(cpu_cas01->getModel()->getMaxminSystem(), cpu_cas01->getConstraint()); - // int is_active_old = constraint_is_active(cpu_cas01); + int is_active = lmm_constraint_used(cpu->getModel()->getMaxminSystem(), cpu->getConstraint()); if (is_active) { /* some tasks exist on this VM */ @@ -73,39 +73,105 @@ void HostModel::adjustWeightOfDummyCpuActions() } } +Action *HostModel::executeParallelTask(int host_nb, + sg_host_t *host_list, + double *flops_amount, + double *bytes_amount, + double rate){ +#define cost_or_zero(array,pos) ((array)?(array)[pos]:0.0) + Action *action =NULL; + if ((host_nb == 1) + && (cost_or_zero(bytes_amount, 0) == 0.0)){ + action = host_list[0]->pimpl_cpu->execute(flops_amount[0]); + } else if ((host_nb == 1) + && (cost_or_zero(flops_amount, 0) == 0.0)) { + action = surf_network_model->communicate(host_list[0]->pimpl_netcard, + host_list[0]->pimpl_netcard, + bytes_amount[0], rate); + } else if ((host_nb == 2) + && (cost_or_zero(flops_amount, 0) == 0.0) + && (cost_or_zero(flops_amount, 1) == 0.0)) { + int i,nb = 0; + double value = 0.0; + + for (i = 0; i < host_nb * host_nb; i++) { + if (cost_or_zero(bytes_amount, i) > 0.0) { + nb++; + value = cost_or_zero(bytes_amount, i); + } + } + if (nb == 1){ + action = surf_network_model->communicate(host_list[0]->pimpl_netcard, + host_list[1]->pimpl_netcard, + value, rate); + } + } else + THROW_UNIMPLEMENTED; /* This model does not implement parallel tasks for more than 2 hosts */ +#undef cost_or_zero + xbt_free(host_list); + return action; +} + /************ * Resource * ************/ -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) - , p_storage(storage), p_netElm(netElm), p_cpu(cpu) + + +void Host::classInit() { - p_params.ramsize = 0; + if (!EXTENSION_ID.valid()) { + EXTENSION_ID = simgrid::s4u::Host::extension_create(); + } } -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) - , p_storage(storage), p_netElm(netElm), p_cpu(cpu) +Host::Host(simgrid::surf::HostModel *model, const char *name, xbt_dict_t props, + xbt_dynar_t storage, Cpu *cpu) + : Resource(model, name) + , PropertyHolder(props) + , p_storage(storage), p_cpu(cpu) { p_params.ramsize = 0; } -Host::~Host(){ - surf_callback_emit(hostDestructedCallbacks, this); +Host::Host(simgrid::surf::HostModel *model, const char *name, xbt_dict_t props, lmm_constraint_t constraint, + xbt_dynar_t storage, Cpu *cpu) + : Resource(model, name, constraint) + , PropertyHolder(props) + , p_storage(storage), p_cpu(cpu) +{ + p_params.ramsize = 0; } -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); +/** @brief use destroy() instead of this destructor */ +Host::~Host() +{ } -xbt_dict_t Host::getProperties() +void Host::attach(simgrid::s4u::Host* host) { - return p_cpu->getProperties(); + if (p_host != nullptr) + xbt_die("Already attached to host %s", host->name().c_str()); + host->extension_set(this); + p_host = host; +} + +bool Host::isOn() { + return p_cpu->isOn(); +} +bool Host::isOff() { + return p_cpu->isOff(); +} +void Host::turnOn(){ + if (isOff()) { + p_cpu->turnOn(); + simgrid::s4u::Host::onStateChange(*this->p_host); + } +} +void Host::turnOff(){ + if (isOn()) { + p_cpu->turnOff(); + simgrid::s4u::Host::onStateChange(*this->p_host); + } } simgrid::surf::Storage *Host::findStorageOnMountList(const char* mount) @@ -327,7 +393,7 @@ xbt_dynar_t Host::getVms() 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); } @@ -345,15 +411,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); -} - } }