#include "surf/surf.h"
#include "src/simix/smx_private.h"
+#include "src/surf/platform.hpp"
#include "cpu_interface.hpp"
#include "host_interface.hpp"
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_parse);
-static simgrid::xbt::signal<void(sg_platf_link_cbarg_t)> on_link;
-static simgrid::xbt::signal<void(sg_platf_cluster_cbarg_t)> on_cluster;
-static simgrid::xbt::signal<void(void)> on_postparse;
+
+namespace simgrid {
+namespace surf {
+
+simgrid::xbt::signal<void(sg_platf_link_cbarg_t)> on_link;
+simgrid::xbt::signal<void(sg_platf_cluster_cbarg_t)> on_cluster;
+simgrid::xbt::signal<void(void)> on_postparse;
+
+}
+}
static int surf_parse_models_setup_already_called = 0;
/** Module management function: frees all internal data structures */
void sg_platf_exit(void) {
- on_link.disconnect_all_slots();
- on_cluster.disconnect_all_slots();
- on_postparse.disconnect_all_slots();
+ simgrid::surf::on_link.disconnect_all_slots();
+ simgrid::surf::on_cluster.disconnect_all_slots();
+ simgrid::surf::on_postparse.disconnect_all_slots();
/* make sure that we will reinit the models while loading the platf once reinited */
surf_parse_models_setup_already_called = 0;
void sg_platf_new_host(sg_platf_host_cbarg_t host)
{
xbt_assert(! sg_host_by_name(host->id),
- "Refusing to create a second host named '%s'.", host->id);
+ "Refusing to create a second host named '%s'.", host->id);
simgrid::surf::NetCard *net = NULL;
simgrid::surf::As* current_routing = routing_get_current();
sg_host_t h = simgrid::s4u::Host::by_name_or_create(host->id);
simgrid::surf::Cpu *cpu = surf_cpu_model_pm->createCpu(
- h,
+ h,
host->speed_peak,
host->pstate,
host->speed_scale,
XBT_DEBUG("Having set router coordinates for '%s'",router->id);
}
- if (TRACE_is_enabled())
+ if (TRACE_is_enabled() && TRACE_needs_platform())
sg_instr_new_router(router);
}
void sg_platf_new_link(sg_platf_link_cbarg_t link){
- on_link(link);
+ simgrid::surf::on_link(link);
}
void sg_platf_new_cluster(sg_platf_cluster_cbarg_t cluster)
{
routing_new_cluster(cluster);
- on_cluster(cluster);
+ simgrid::surf::on_cluster(cluster);
}
void sg_platf_new_storage(sg_platf_storage_cbarg_t storage)
((storage_type_t) stype)->type_id,
storage->content,
storage->content_type,
- storage->properties);
+ storage->properties);
surf_storage_model->createStorage(storage->id,
((storage_type_t) stype)->type_id,
storage->content,
storage->content_type,
- storage->properties,
+ storage->properties,
storage->attach);
}
void sg_platf_new_storage_type(sg_platf_storage_type_cbarg_t storage_type){
void sg_platf_begin() { /* Do nothing: just for symmetry of user code */ }
void sg_platf_end() {
- on_postparse();
+ simgrid::surf::on_postparse();
}
void sg_platf_new_AS_begin(sg_platf_AS_cbarg_t AS)
}
/* ***************************************** */
-void sg_platf_link_add_cb(sg_platf_link_cb_t fct) {
- on_link.connect(fct);
-}
-void sg_platf_cluster_add_cb(sg_platf_cluster_cb_t fct) {
- on_cluster.connect(fct);
-}
-void sg_platf_postparse_add_cb(void_f_void_t fct) {
- on_postparse.connect(fct);
-}
-
void sg_platf_rng_stream_init(unsigned long seed[6]) {
RngStream_SetPackageSeed(seed);
sg_platf_rng_stream = RngStream_CreateStream(NULL);