X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/782f94b6c47b6e7722212befa54969f5a6b9a0fc..493e583a706b2a454f73a630cb1c656035d78056:/src/surf/surf_c_bindings.cpp diff --git a/src/surf/surf_c_bindings.cpp b/src/surf/surf_c_bindings.cpp index a149c669db..8f6185a516 100644 --- a/src/surf/surf_c_bindings.cpp +++ b/src/surf/surf_c_bindings.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 @@ -8,9 +8,9 @@ #include "surf_interface.hpp" #include "network_interface.hpp" #include "surf_routing_cluster.hpp" -#include "instr/instr_private.h" +#include "src/instr/instr_private.h" #include "plugins/energy.hpp" -#include "vm_interface.hpp" +#include "virtual_machine.hpp" XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_kernel); @@ -22,8 +22,8 @@ static Host *get_casted_host(surf_resource_t resource){ return static_cast(surf_host_resource_priv(resource)); } -static VM *get_casted_vm(surf_resource_t resource){ - return static_cast(surf_host_resource_priv(resource)); +static VirtualMachine *get_casted_vm(surf_resource_t resource){ + return static_cast(surf_host_resource_priv(resource)); } extern double NOW; @@ -51,7 +51,7 @@ void surf_presolve(void) } } } - xbt_dynar_foreach(model_list, iter, model) + xbt_dynar_foreach(all_existing_models, iter, model) model->updateActionsState(NOW, 0.0); } @@ -73,19 +73,17 @@ double surf_solve(double max_date) surf_min = max_date - NOW; } - XBT_DEBUG("Looking for next action end for all models except NS3"); - xbt_dynar_foreach(model_list_invoke, iter, model) { - double next_action_end = -1.0; - if (model->shareResourcesIsIdempotent()) { - XBT_DEBUG("Running for Resource [%s]", typeid(model).name()); - next_action_end = model->shareResources(NOW); - XBT_DEBUG("Resource [%s] : next action end = %f", - typeid(model).name(), next_action_end); - } - if ((surf_min < 0.0 || next_action_end < surf_min) - && next_action_end >= 0.0) { - surf_min = next_action_end; - } + /* Physical models MUST be resolved first */ + XBT_DEBUG("Looking for next event in physical models"); + double next_event_phy = surf_host_model->shareResources(NOW); + if ((surf_min < 0.0 || next_event_phy < surf_min) && next_event_phy >= 0.0) { + surf_min = next_event_phy; + } + if (surf_vm_model != NULL) { + XBT_DEBUG("Looking for next event in virtual models"); + double next_event_virt = surf_vm_model->shareResources(NOW); + if ((surf_min < 0.0 || next_event_virt < surf_min) && next_event_virt >= 0.0) + surf_min = next_event_virt; } XBT_DEBUG("Min for resources (remember that NS3 don't update that value) : %f", surf_min); @@ -152,7 +150,7 @@ double surf_solve(double max_date) NOW = NOW + surf_min; /* FIXME: model_list or model_list_invoke? revisit here later */ /* sequential version */ - xbt_dynar_foreach(model_list, iter, model) { + xbt_dynar_foreach(all_existing_models, iter, model) { model->updateActionsState(NOW, surf_min); } @@ -177,18 +175,6 @@ surf_model_t surf_resource_model(const void *host, int level) { return ws->getModel(); } -void *surf_as_cluster_get_backbone(AS_t as){ - return static_cast(as)->p_backbone; -} - -void surf_as_cluster_set_backbone(AS_t as, void* backbone){ - static_cast(as)->p_backbone = static_cast(backbone); -} - -const char *surf_model_name(surf_model_t model){ - return typeid(model).name(); -} - surf_action_t surf_model_extract_done_action_set(surf_model_t model){ if (model->getDoneActionSet()->empty()) return NULL; @@ -306,19 +292,19 @@ int surf_host_get_pstate(surf_resource_t host){ } double surf_host_get_wattmin_at(surf_resource_t resource, int pstate){ xbt_assert(surf_energy!=NULL, "The Energy plugin is not active. Please call sg_energy_plugin_init() during initialization."); - std::map::iterator cpuIt = surf_energy->find(get_casted_host(resource)->p_cpu); - return cpuIt->second->getWattMinAt(pstate); + std::map::iterator hostIt = surf_energy->find(get_casted_host(resource)); + return hostIt->second->getWattMinAt(pstate); } double surf_host_get_wattmax_at(surf_resource_t resource, int pstate){ xbt_assert(surf_energy!=NULL, "The Energy plugin is not active. Please call sg_energy_plugin_init() during initialization."); - std::map::iterator cpuIt = surf_energy->find(get_casted_host(resource)->p_cpu); - return cpuIt->second->getWattMaxAt(pstate); + std::map::iterator hostIt = surf_energy->find(get_casted_host(resource)); + return hostIt->second->getWattMaxAt(pstate); } double surf_host_get_consumed_energy(surf_resource_t resource){ xbt_assert(surf_energy!=NULL, "The Energy plugin is not active. Please call sg_energy_plugin_init() during initialization."); - std::map::iterator cpuIt = surf_energy->find(get_casted_host(resource)->p_cpu); - return cpuIt->second->getConsumedEnergy(); + std::map::iterator hostIt = surf_energy->find(get_casted_host(resource)); + return hostIt->second->getConsumedEnergy(); } xbt_dict_t surf_host_get_mounted_storage_list(surf_resource_t host){ @@ -374,7 +360,7 @@ xbt_dynar_t surf_host_get_vms(surf_resource_t host){ xbt_dynar_t vms = get_casted_host(host)->getVms(); xbt_dynar_t vms_ = xbt_dynar_new(sizeof(sg_host_t), NULL); unsigned int cpt; - VM *vm; + VirtualMachine *vm; xbt_dynar_foreach(vms, cpt, vm) { sg_host_t vm_ = xbt_lib_get_elm_or_null(host_lib, vm->getName()); xbt_dynar_push(vms_, &vm_); @@ -393,7 +379,7 @@ void surf_host_set_params(surf_resource_t host, vm_params_t params){ void surf_vm_destroy(surf_resource_t resource){ /* Before clearing the entries in host_lib, we have to pick up resources. */ - VM *vm = get_casted_vm(resource); + VirtualMachine *vm = get_casted_vm(resource); char* name = xbt_dict_get_elm_key(resource); /* We deregister objects from host_lib, without invoking the freeing callback * of each level.