#include "xbt/dict.h"
#include "xbt/RngStream.h"
#include <xbt/signal.hpp>
-#include "simgrid/platf_interface.h"
+#include "src/surf/HostImpl.hpp"
#include "surf/surf.h"
#include "src/simix/smx_private.h"
-#include "src/surf/platform.hpp"
-#include "surf/surfxml_parse.h"// FIXME: brain dead public header
+#include "src/include/simgrid/sg_config.h"
+#include "src/surf/xml/platf_private.hpp"
-#include "src/surf/platform.hpp"
#include "src/surf/cpu_interface.hpp"
-#include "src/surf/host_interface.hpp"
#include "src/surf/network_interface.hpp"
#include "surf/surf_routing.h" // FIXME: brain dead public header
#include "src/surf/surf_routing_cluster.hpp"
/* make sure that we will reinit the models while loading the platf once reinited */
surf_parse_models_setup_already_called = 0;
+ surf_parse_lex_destroy();
}
/** @brief Add an "host" to the current AS */
simgrid::surf::Cpu *cpu = surf_cpu_model_pm->createCpu( h,
host->speed_peak,
- host->pstate,
- host->speed_scale, host->speed_trace,
+ host->speed_trace,
host->core_amount,
- host->initiallyOn, host->state_trace);
+ host->state_trace);
surf_host_model->createHost(host->id, netcard, cpu, host->properties)->attach(h);
+
+ if (host->pstate != 0)
+ cpu->setPState(host->pstate);
+
simgrid::s4u::Host::onCreation(*h);
if (TRACE_is_enabled() && TRACE_needs_platform())
host.pstate = 0;
//host.power_peak = cluster->power;
- host.speed_scale = 1.0;
host.core_amount = cluster->core_amount;
- host.initiallyOn = 1;
host.coord = "";
sg_platf_new_host(&host);
xbt_dynar_free(&host.speed_peak);
link.id = tmp_link;
link.bandwidth = cluster->loopback_bw;
link.latency = cluster->loopback_lat;
- link.initiallyOn = 1;
link.policy = SURF_LINK_FATPIPE;
sg_platf_new_link(&link);
info_loop.link_up = Link::byName(tmp_link);
link.id = tmp_link;
link.bandwidth = cluster->limiter_link;
link.latency = 0;
- link.initiallyOn = 1;
link.policy = SURF_LINK_SHARED;
sg_platf_new_link(&link);
info_lim.link_up = Link::byName(tmp_link);
link.id = link_backbone;
link.bandwidth = cluster->bb_bw;
link.latency = cluster->bb_lat;
- link.initiallyOn = 1;
link.policy = cluster->bb_sharing_policy;
sg_platf_new_link(&link);
simgrid::surf::on_postparse();
}
+/* 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 = NULL;
+ char *cpu_model_name = NULL;
+ int storage_id = -1;
+ char *storage_model_name = NULL;
+
+ host_model_name = xbt_cfg_get_string(_sg_cfg_set, "host/model");
+ vm_model_name = xbt_cfg_get_string(_sg_cfg_set, "vm/model");
+ network_model_name = xbt_cfg_get_string(_sg_cfg_set, "network/model");
+ cpu_model_name = xbt_cfg_get_string(_sg_cfg_set, "cpu/model");
+ storage_model_name = xbt_cfg_get_string(_sg_cfg_set, "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(_sg_cfg_set, "network/model") ||
+ !xbt_cfg_is_default_value(_sg_cfg_set, "cpu/model")) &&
+ xbt_cfg_is_default_value(_sg_cfg_set, "host/model")) {
+ host_model_name = "compound";
+ xbt_cfg_set_string(_sg_cfg_set, "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(network_model_name,
+ "Set a network model to use with the 'compound' host model");
+
+ 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);
+ surf_network_model_description[network_id].model_init_preparse();
+ }
+
+ XBT_DEBUG("Call host_model_init");
+ 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);
+ 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);
+ surf_storage_model_description[storage_id].model_init_preparse();
+
+}
+
void sg_platf_new_AS_begin(sg_platf_AS_cbarg_t AS)
{
if (!surf_parse_models_setup_already_called) {