#include "src/include/simgrid/sg_config.h"
#include "src/surf/xml/platf_private.hpp"
+#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
static int surf_parse_models_setup_already_called = 0;
-/* Turn something like "1-4,6,9-11" into the vector {1,2,3,4,6,9,10,11} */
-static std::vector<int> *explodesRadical(const char*radicals){
- std::vector<int> *exploded = new std::vector<int>();
- char *groups;
- unsigned int iter;
-
- //Make all hosts
- xbt_dynar_t radical_elements = xbt_str_split(radicals, ",");
- xbt_dynar_foreach(radical_elements, iter, groups) {
-
- xbt_dynar_t radical_ends = xbt_str_split(groups, "-");
- int start = surf_parse_get_int(xbt_dynar_get_as(radical_ends, 0, char *));
- int end=0;
-
- switch (xbt_dynar_length(radical_ends)) {
- case 1:
- end = start;
- break;
- case 2:
- end = surf_parse_get_int(xbt_dynar_get_as(radical_ends, 1, char *));
- break;
- default:
- surf_parse_error("Malformed radical: %s", groups);
- break;
- }
-
- for (int i = start; i <= end; i++)
- exploded->push_back( i );
-
- xbt_dynar_free(&radical_ends);
- }
- xbt_dynar_free(&radical_elements);
-
- return exploded;
-}
-
-
/** The current AS in the parsing */
static simgrid::kernel::routing::AsImpl *current_routing = nullptr;
static simgrid::kernel::routing::AsImpl *routing_get_current()
surf_parse_lex_destroy();
}
-/** @brief Add an "host" to the current AS */
+/** @brief Add an host to the current AS */
void sg_platf_new_host(sg_platf_host_cbarg_t host)
{
- xbt_assert(sg_host_by_name(host->id) == nullptr, "Refusing to create a second host named '%s'.", host->id);
-
simgrid::kernel::routing::AsImpl* current_routing = routing_get_current();
- if (current_routing->hierarchy_ == simgrid::kernel::routing::AsImpl::RoutingMode::unset)
- current_routing->hierarchy_ = simgrid::kernel::routing::AsImpl::RoutingMode::base;
- simgrid::kernel::routing::NetCard *netcard =
- new simgrid::kernel::routing::NetCardImpl(host->id, simgrid::kernel::routing::NetCard::Type::Host, current_routing);
-
- sg_host_t h = simgrid::s4u::Host::by_name_or_create(host->id);
- h->pimpl_netcard = netcard;
-
- if(mount_list) {
- xbt_lib_set(storage_lib, host->id, ROUTING_STORAGE_HOST_LEVEL, (void *) mount_list);
- mount_list = nullptr;
- }
+ simgrid::s4u::Host* h = new simgrid::s4u::Host(host->id);
+ current_routing->attachHost(h);
if (host->coord && strcmp(host->coord, "")) {
unsigned int cursor;
cpu->setStateTrace(host->state_trace);
if (host->speed_trace)
cpu->setSpeedTrace(host->speed_trace);
- surf_host_model->createHost(host->id, netcard, cpu)->attach(h);
+
+ new simgrid::surf::HostImpl(h, mount_list);
+ xbt_lib_set(storage_lib, host->id, ROUTING_STORAGE_HOST_LEVEL, static_cast<void*>(mount_list));
+
+ mount_list = nullptr;
if (host->properties) {
xbt_dict_cursor_t cursor=nullptr;
current_as->hasLimiter_ = 1;
}
- std::vector<int> *radicals = explodesRadical(cluster->radical);
- for (int i : *radicals) {
+ for (int i : *cluster->radicals) {
char * host_id = bprintf("%s%d%s", cluster->prefix, i, cluster->suffix);
char * link_id = bprintf("%s_link_%d", cluster->id, i);
xbt_free(host_id);
rankId++;
}
- delete radicals;
// Add a router. It is magically used thanks to the way in which surf_routing_cluster is written,
// and it's very useful to connect clusters together
sg_platf_new_AS_seal();
simgrid::surf::on_cluster(cluster);
+ delete cluster->radicals;
}
void routing_cluster_add_backbone(simgrid::surf::Link* bb) {
simgrid::kernel::routing::AsCluster *cluster = dynamic_cast<simgrid::kernel::routing::AsCluster*>(current_routing);
void sg_platf_new_cabinet(sg_platf_cabinet_cbarg_t cabinet)
{
- std::vector<int> *radicals = explodesRadical(cabinet->radical);
-
- for (int radical : *radicals) {
+ for (int radical : *cabinet->radicals) {
char *hostname = bprintf("%s%d%s", cabinet->prefix, radical, cabinet->suffix);
s_sg_platf_host_cbarg_t host;
memset(&host, 0, sizeof(host));
free(hostname);
}
- delete(radicals);
+ delete cabinet->radicals;
}
void sg_platf_new_storage(sg_platf_storage_cbarg_t storage)
/* Pick the right models for CPU, net and host, and call their model_init_preparse */
static void surf_config_models_setup()
{
- const char *host_model_name;
- const char *vm_model_name;
- int host_id = -1;
- int vm_id = -1;
- char *network_model_name = nullptr;
- char *cpu_model_name = nullptr;
- int storage_id = -1;
- char *storage_model_name = nullptr;
-
- host_model_name = xbt_cfg_get_string("host/model");
- vm_model_name = xbt_cfg_get_string("vm/model");
- network_model_name = xbt_cfg_get_string("network/model");
- cpu_model_name = xbt_cfg_get_string("cpu/model");
- storage_model_name = xbt_cfg_get_string("storage/model");
-
- /* Check whether we use a net/cpu model differing from the default ones, in which case
- * we should switch to the "compound" host model to correctly dispatch stuff to
- * the right net/cpu models.
- */
-
- if ((!xbt_cfg_is_default_value("network/model") ||
- !xbt_cfg_is_default_value("cpu/model")) &&
+ 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");
+
+ /* The compound host model is needed when using non-default net/cpu models */
+ if ((!xbt_cfg_is_default_value("network/model") || !xbt_cfg_is_default_value("cpu/model")) &&
xbt_cfg_is_default_value("host/model")) {
host_model_name = "compound";
xbt_cfg_set_string("host/model", host_model_name);
}
XBT_DEBUG("host model: %s", host_model_name);
- host_id = find_model_description(surf_host_model_description, host_model_name);
if (!strcmp(host_model_name, "compound")) {
- int network_id = -1;
- int cpu_id = -1;
-
- xbt_assert(cpu_model_name,
- "Set a cpu model to use with the 'compound' host model");
+ xbt_assert(cpu_model_name, "Set a cpu model to use with the 'compound' host model");
+ xbt_assert(network_model_name, "Set a network model to use with the 'compound' host model");
- xbt_assert(network_model_name,
- "Set a network model to use with the 'compound' host model");
+ int cpu_id = find_model_description(surf_cpu_model_description, cpu_model_name);
+ surf_cpu_model_description[cpu_id].model_init_preparse();
- if(surf_cpu_model_init_preparse){
- surf_cpu_model_init_preparse();
- } else {
- cpu_id =
- find_model_description(surf_cpu_model_description, cpu_model_name);
- surf_cpu_model_description[cpu_id].model_init_preparse();
- }
-
- network_id =
- find_model_description(surf_network_model_description,
- network_model_name);
+ int network_id = find_model_description(surf_network_model_description, network_model_name);
surf_network_model_description[network_id].model_init_preparse();
}
XBT_DEBUG("Call host_model_init");
+ int host_id = find_model_description(surf_host_model_description, host_model_name);
surf_host_model_description[host_id].model_init_preparse();
XBT_DEBUG("Call vm_model_init");
- vm_id = find_model_description(surf_vm_model_description, vm_model_name);
+ int vm_id = find_model_description(surf_vm_model_description, vm_model_name);
surf_vm_model_description[vm_id].model_init_preparse();
XBT_DEBUG("Call storage_model_init");
- storage_id = find_model_description(surf_storage_model_description, storage_model_name);
+ int storage_id = find_model_description(surf_storage_model_description, storage_model_name);
surf_storage_model_description[storage_id].model_init_preparse();
-
}
/**
- * \brief Make a new routing component to the platform
+ * \brief Add an AS to the platform
*
* Add a new autonomous system to the platform. Any elements (such as host,
* router or sub-AS) added after this call and before the corresponding call
