#include "src/surf/surf_private.hpp"
#include <boost/algorithm/string/classification.hpp>
#include <boost/algorithm/string/split.hpp>
+#include <simgrid/s4u/Engine.hpp>
#include <simgrid/s4u/Host.hpp>
#include <string>
#include <vector>
{nullptr, nullptr}
};
+static simgrid::s4u::Link::SharingPolicy link_policy_get_by_name(const char* policy)
+{
+ if (policy && not strcmp(policy, "FULLDUPLEX")) {
+ XBT_WARN("Please update your platform to use SPLITDUPLEX instead of FULLDUPLEX");
+ return simgrid::s4u::Link::SharingPolicy::SPLITDUPLEX;
+ } else if (policy && not strcmp(policy, "SPLITDUPLEX")) {
+ return simgrid::s4u::Link::SharingPolicy::SPLITDUPLEX;
+ } else if (policy && not strcmp(policy, "FATPIPE")) {
+ return simgrid::s4u::Link::SharingPolicy::FATPIPE;
+ } else {
+ return simgrid::s4u::Link::SharingPolicy::SHARED;
+ }
+}
+
int console_open(lua_State *L) {
sg_platf_init();
- sg_platf_begin();
-
- storage_register_callbacks();
+ simgrid::s4u::on_platform_creation();
return 0;
}
int console_close(lua_State *L) {
- sg_platf_end();
+ simgrid::s4u::on_platform_created();
sg_platf_exit();
return 0;
}
lua_gettable(L, -2);
const char* policy = lua_tostring(L, -1);
lua_pop(L, 1);
- if (policy && not strcmp(policy, "FULLDUPLEX")) {
- XBT_WARN("Please update your platform to use SPLITDUPLEX instead of FULLDUPLEX");
- link.policy = SURF_LINK_SPLITDUPLEX;
- } else if (policy && not strcmp(policy, "SPLITDUPLEX")) {
- link.policy = SURF_LINK_SPLITDUPLEX;
- } else if (policy && not strcmp(policy, "FATPIPE")) {
- link.policy = SURF_LINK_FATPIPE;
- } else {
- link.policy = SURF_LINK_SHARED;
- }
+ link.policy = link_policy_get_by_name(policy);
sg_platf_new_link(&link);
- routing_cluster_add_backbone(simgrid::surf::LinkImpl::byName(link.id));
+ routing_cluster_add_backbone(simgrid::s4u::Link::by_name(link.id)->get_impl());
return 0;
}
lua_gettable(L, -2);
policy = lua_tostring(L, -1);
lua_pop(L, 1);
- if (policy && not strcmp(policy, "FULLDUPLEX")) {
- XBT_WARN("Please update your platform to use SPLITDUPLEX instead of FULLDUPLEX");
- link.policy = SURF_LINK_SPLITDUPLEX;
- } else if (policy && not strcmp(policy, "SPLITDUPLEX")) {
- link.policy = SURF_LINK_SPLITDUPLEX;
- } else if (policy && not strcmp(policy, "FATPIPE")) {
- link.policy = SURF_LINK_FATPIPE;
- } else {
- link.policy = SURF_LINK_SHARED;
- }
+ link.policy = link_policy_get_by_name(policy);
sg_platf_new_link(&link);
boost::split(names, str, boost::is_any_of(", \t\r\n"));
if (names.empty()) {
/* unique name */
- route.link_list.push_back(simgrid::surf::LinkImpl::byName(lua_tostring(L, -1)));
+ route.link_list.push_back(simgrid::s4u::Link::by_name(lua_tostring(L, -1))->get_impl());
} else {
// Several names separated by , \t\r\n
for (auto const& name : names) {
if (name.length() > 0) {
- simgrid::surf::LinkImpl* link = simgrid::surf::LinkImpl::byName(name);
+ simgrid::kernel::resource::LinkImpl* link = simgrid::s4u::Link::by_name(name)->get_impl();
route.link_list.push_back(link);
}
}
boost::split(names, str, boost::is_any_of(", \t\r\n"));
if (names.empty()) {
/* unique name with no comma */
- ASroute.link_list.push_back(simgrid::surf::LinkImpl::byName(lua_tostring(L, -1)));
+ ASroute.link_list.push_back(simgrid::s4u::Link::by_name(lua_tostring(L, -1))->get_impl());
} else {
// Several names separated by , \t\r\n
for (auto const& name : names) {
if (name.length() > 0) {
- simgrid::surf::LinkImpl* link = simgrid::surf::LinkImpl::byName(name);
+ simgrid::kernel::resource::LinkImpl* link = simgrid::s4u::Link::by_name(name)->get_impl();
ASroute.link_list.push_back(link);
}
}
sg_host_t host = sg_host_by_name(name);
lua_ensure(host, "no host '%s' found",name);
- host->setProperty(prop_id, prop_value);
+ host->set_property(prop_id, prop_value);
return 0;
}