X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ecdd850a9e33b42a4cdcacf6bc6915c5f5b4ec5c..390ee57ed79bf7577c2bce6df6a25aba57ff476e:/src/surf/sg_platf.cpp diff --git a/src/surf/sg_platf.cpp b/src/surf/sg_platf.cpp index f5df97064c..15d2df7421 100644 --- a/src/surf/sg_platf.cpp +++ b/src/surf/sg_platf.cpp @@ -14,6 +14,8 @@ #include "src/surf/HostImpl.hpp" #include "surf/surf.h" +#include "simgrid/s4u/engine.hpp" +#include "src/kernel/EngineImpl.hpp" #include "src/simix/smx_private.h" #include "src/include/simgrid/sg_config.h" @@ -22,18 +24,18 @@ #include "src/surf/HostImpl.hpp" #include "src/surf/cpu_interface.hpp" #include "src/surf/network_interface.hpp" -#include "surf/surf_routing.h" // FIXME: brain dead public header -#include "src/kernel/routing/AsImpl.hpp" #include "src/kernel/routing/AsCluster.hpp" -#include "src/kernel/routing/AsClusterTorus.hpp" -#include "src/kernel/routing/AsClusterFatTree.hpp" #include "src/kernel/routing/AsClusterDragonfly.hpp" +#include "src/kernel/routing/AsClusterFatTree.hpp" +#include "src/kernel/routing/AsClusterTorus.hpp" #include "src/kernel/routing/AsDijkstra.hpp" #include "src/kernel/routing/AsFloyd.hpp" #include "src/kernel/routing/AsFull.hpp" +#include "src/kernel/routing/AsImpl.hpp" #include "src/kernel/routing/AsNone.hpp" #include "src/kernel/routing/AsVivaldi.hpp" +#include "src/kernel/routing/NetCard.hpp" XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_parse); @@ -74,37 +76,31 @@ void sg_platf_exit() { } /** @brief Add an host to the current AS */ -void sg_platf_new_host(sg_platf_host_cbarg_t hostArgs) +void sg_platf_new_host(sg_platf_host_cbarg_t args) { - simgrid::kernel::routing::AsImpl* current_routing = routing_get_current(); - - simgrid::s4u::Host* host = new simgrid::s4u::Host(hostArgs->id); - current_routing->attachHost(host); - - if (hostArgs->coord && strcmp(hostArgs->coord, "")) - new simgrid::kernel::routing::vivaldi::Coords(host, hostArgs->coord); - - surf_cpu_model_pm->createCpu(host, &hostArgs->speed_per_pstate, hostArgs->core_amount); + simgrid::s4u::Host* host = routing_get_current()->createHost(args->id, &args->speed_per_pstate, args->core_amount); new simgrid::surf::HostImpl(host, mount_list); - xbt_lib_set(storage_lib, hostArgs->id, ROUTING_STORAGE_HOST_LEVEL, static_cast(mount_list)); + xbt_lib_set(storage_lib, args->id, ROUTING_STORAGE_HOST_LEVEL, static_cast(mount_list)); mount_list = nullptr; - if (hostArgs->properties) { + if (args->properties) { xbt_dict_cursor_t cursor=nullptr; char *key,*data; - xbt_dict_foreach (hostArgs->properties, cursor, key, data) + xbt_dict_foreach (args->properties, cursor, key, data) host->setProperty(key, data); - xbt_dict_free(&hostArgs->properties); + xbt_dict_free(&args->properties); } - /* Change from the default */ - if (hostArgs->state_trace) - host->pimpl_cpu->setStateTrace(hostArgs->state_trace); - if (hostArgs->speed_trace) - host->pimpl_cpu->setSpeedTrace(hostArgs->speed_trace); - if (hostArgs->pstate != 0) - host->pimpl_cpu->setPState(hostArgs->pstate); + /* Change from the defaults */ + if (args->state_trace) + host->pimpl_cpu->setStateTrace(args->state_trace); + if (args->speed_trace) + host->pimpl_cpu->setSpeedTrace(args->speed_trace); + if (args->pstate != 0) + host->pimpl_cpu->setPState(args->pstate); + if (args->coord && strcmp(args->coord, "")) + new simgrid::kernel::routing::vivaldi::Coords(host, args->coord); simgrid::s4u::Host::onCreation(*host); @@ -124,7 +120,7 @@ void sg_platf_new_router(sg_platf_router_cbarg_t router) "Refusing to create a router named '%s': this name already describes a node.", router->id); simgrid::kernel::routing::NetCard* netcard = - new simgrid::kernel::routing::NetCardImpl(router->id, simgrid::kernel::routing::NetCard::Type::Router, current_routing); + new simgrid::kernel::routing::NetCard(router->id, simgrid::kernel::routing::NetCard::Type::Router, current_routing); xbt_lib_set(as_router_lib, router->id, ROUTING_ASR_LEVEL, netcard); XBT_DEBUG("Router '%s' has the id %d", router->id, netcard->id()); @@ -164,7 +160,15 @@ void sg_platf_new_link(sg_platf_link_cbarg_t link){ names.push_back(xbt_strdup(link->id)); } for (auto link_name : names) { - Link *l = surf_network_model->createLink(link_name, link->bandwidth, link->latency, link->policy, link->properties); + Link* l = surf_network_model->createLink(link_name, link->bandwidth, link->latency, link->policy); + + if (link->properties) { + xbt_dict_cursor_t cursor = nullptr; + char *key, *data; + xbt_dict_foreach (link->properties, cursor, key, data) + l->setProperty(key, data); + xbt_dict_free(&link->properties); + } if (link->latency_trace) l->setLatencyTrace(link->latency_trace); @@ -233,10 +237,10 @@ void sg_platf_new_cluster(sg_platf_cluster_cbarg_t cluster) if ((cluster->properties != nullptr) && (!xbt_dict_is_empty(cluster->properties))) { xbt_dict_cursor_t cursor=nullptr; char *key,*data; - host.properties = xbt_dict_new(); + host.properties = xbt_dict_new_homogeneous(free); xbt_dict_foreach(cluster->properties,cursor,key,data) { - xbt_dict_set(host.properties, key, xbt_strdup(data),free); + xbt_dict_set(host.properties, key, xbt_strdup(data), nullptr); } } @@ -421,12 +425,16 @@ void sg_platf_new_storage(sg_platf_storage_cbarg_t storage) storage->content_type, storage->properties); - surf_storage_model->createStorage(storage->id, - ((storage_type_t) stype)->type_id, - storage->content, - storage->content_type, - storage->properties, - storage->attach); + auto s = surf_storage_model->createStorage(storage->id, ((storage_type_t)stype)->type_id, storage->content, + storage->content_type, storage->attach); + + if (storage->properties) { + xbt_dict_cursor_t cursor = nullptr; + char *key, *data; + xbt_dict_foreach (storage->properties, cursor, key, data) + s->setProperty(key, data); + xbt_dict_free(&storage->properties); + } } void sg_platf_new_storage_type(sg_platf_storage_type_cbarg_t storage_type){ @@ -561,8 +569,7 @@ void sg_platf_new_process(sg_platf_process_cbarg_t process) delete arg; }); } else { // start_time <= SIMIX_get_clock() - XBT_DEBUG("Starting Process %s(%s) right now", - arg->name.c_str(), sg_host_get_name(host)); + XBT_DEBUG("Starting Process %s(%s) right now", arg->name.c_str(), host->cname()); process_created = simix_global->create_process_function( arg->name.c_str(), std::move(code), nullptr, @@ -657,7 +664,6 @@ void sg_platf_end() { static void surf_config_models_setup() { const char* host_model_name = xbt_cfg_get_string("host/model"); - const char* vm_model_name = xbt_cfg_get_string("vm/model"); const char* network_model_name = xbt_cfg_get_string("network/model"); const char* cpu_model_name = xbt_cfg_get_string("cpu/model"); const char* storage_model_name = xbt_cfg_get_string("storage/model"); @@ -686,8 +692,7 @@ static void surf_config_models_setup() surf_host_model_description[host_id].model_init_preparse(); XBT_DEBUG("Call vm_model_init"); - int vm_id = find_model_description(surf_vm_model_description, vm_model_name); - surf_vm_model_description[vm_id].model_init_preparse(); + surf_vm_model_init_HL13(); XBT_DEBUG("Call storage_model_init"); int storage_id = find_model_description(surf_storage_model_description, storage_model_name); @@ -762,19 +767,17 @@ simgrid::s4u::As * sg_platf_new_AS_begin(sg_platf_AS_cbarg_t AS) break; } + if (current_routing == nullptr) { /* it is the first one */ + xbt_assert(simgrid::s4u::Engine::instance()->pimpl->rootAs_ == nullptr, + "All defined components must belong to a AS"); + simgrid::s4u::Engine::instance()->pimpl->rootAs_ = new_as; - if (current_routing == nullptr && routing_platf->root_ == nullptr) { /* it is the first one */ - routing_platf->root_ = new_as; - - } else if (current_routing != nullptr && routing_platf->root_ != nullptr) { + } else { /* set the father behavior */ if (current_routing->hierarchy_ == simgrid::kernel::routing::AsImpl::RoutingMode::unset) current_routing->hierarchy_ = simgrid::kernel::routing::AsImpl::RoutingMode::recursive; /* add to the sons dictionary */ xbt_dict_set(current_routing->children(), AS->id, (void *) new_as, nullptr); - - } else { - THROWF(arg_error, 0, "All defined components must belong to a AS"); } /* set the new current component of the tree */