#include "simgrid/kernel/routing/VivaldiZone.hpp"
#include "simgrid/s4u/Engine.hpp"
#include "src/include/simgrid/sg_config.hpp"
+#include "src/include/surf/surf.hpp"
#include "src/kernel/EngineImpl.hpp"
#include "src/simix/smx_host_private.hpp"
#include "src/simix/smx_private.hpp"
/** Module management function: frees all internal data structures */
void sg_platf_exit() {
- simgrid::surf::on_cluster.disconnectSlots();
- simgrid::s4u::on_platform_created.disconnectSlots();
+ simgrid::surf::on_cluster.disconnect_slots();
+ simgrid::s4u::on_platform_created.disconnect_slots();
/* make sure that we will reinit the models while loading the platf once reinited */
surf_parse_models_setup_already_called = 0;
simgrid::kernel::routing::HostCreationArgs host;
host.id = host_id.c_str();
if ((cluster->properties != nullptr) && (not cluster->properties->empty())) {
- host.properties = new std::map<std::string, std::string>;
+ host.properties = new std::unordered_map<std::string, std::string>;
for (auto const& elm : *cluster->properties)
host.properties->insert({elm.first, elm.second});
bool auto_restart = actor->on_failure != simgrid::kernel::routing::ActorOnFailure::DIE;
std::string actor_name = actor->args[0];
- std::function<void()> code = factory(std::move(actor->args));
- std::shared_ptr<std::map<std::string, std::string>> properties(actor->properties);
+ simgrid::simix::ActorCode code = factory(std::move(actor->args));
+ std::shared_ptr<std::unordered_map<std::string, std::string>> properties(actor->properties);
simgrid::kernel::actor::ProcessArg* arg =
new simgrid::kernel::actor::ProcessArg(actor_name, code, nullptr, host, kill_time, properties, auto_restart);
- host->extension<simgrid::simix::Host>()->boot_processes.push_back(arg);
+ host->pimpl_->boot_processes_.push_back(arg);
if (start_time > SIMIX_get_clock()) {
if (arg->kill_time >= 0)
simcall_process_set_kill_time(actor, arg->kill_time);
if (auto_restart)
- SIMIX_process_auto_restart_set(actor, auto_restart);
+ actor->set_auto_restart(auto_restart);
delete arg;
});
} else { // start_time <= SIMIX_get_clock()
if (arg->kill_time >= 0)
simcall_process_set_kill_time(actor, arg->kill_time);
if (auto_restart)
- SIMIX_process_auto_restart_set(actor, auto_restart);
+ actor->set_auto_restart(auto_restart);
}
}
}
speedPerPstate.push_back(peer->speed);
simgrid::s4u::Host* host = as->create_host(peer->id.c_str(), &speedPerPstate, 1, nullptr);
- as->setPeerLink(host->pimpl_netpoint, peer->bw_in, peer->bw_out, peer->coord);
+ as->set_peer_link(host->pimpl_netpoint, peer->bw_in, peer->bw_out, peer->coord);
/* Change from the defaults */
if (peer->state_trace)
*
* @param zone the parameters defining the Zone to build.
*/
-simgrid::s4u::NetZone* sg_platf_new_Zone_begin(simgrid::kernel::routing::ZoneCreationArgs* zone)
+simgrid::kernel::routing::NetZoneImpl* sg_platf_new_Zone_begin(simgrid::kernel::routing::ZoneCreationArgs* zone)
{
if (not surf_parse_models_setup_already_called) {
simgrid::s4u::on_platform_creation();
}
if (current_routing == nullptr) { /* it is the first one */
- simgrid::s4u::Engine::get_instance()->set_netzone_root(new_zone);
+ simgrid::s4u::Engine::get_instance()->set_netzone_root(new_zone->get_iface());
} else {
/* set the father behavior */
if (current_routing->hierarchy_ == simgrid::kernel::routing::NetZoneImpl::RoutingMode::unset)
current_routing->hierarchy_ = simgrid::kernel::routing::NetZoneImpl::RoutingMode::recursive;
/* add to the sons dictionary */
- current_routing->getChildren()->push_back(static_cast<simgrid::s4u::NetZone*>(new_zone));
+ current_routing->get_children()->push_back(new_zone);
}
/* set the new current component of the tree */
current_routing = new_zone;
- simgrid::s4u::NetZone::on_creation(*new_zone); // notify the signal
+ simgrid::s4u::NetZone::on_creation(*new_zone->get_iface()); // notify the signal
return new_zone;
}
{
xbt_assert(current_routing, "Cannot seal the current AS: none under construction");
current_routing->seal();
- simgrid::s4u::NetZone::on_seal(*current_routing);
+ simgrid::s4u::NetZone::on_seal(*current_routing->get_iface());
current_routing = static_cast<simgrid::kernel::routing::NetZoneImpl*>(current_routing->get_father());
}