Reduce code duplication.

[simgrid.git] / src / bindings / lua / lua_platf.cpp

diff --git a/src/bindings/lua/lua_platf.cpp b/src/bindings/lua/lua_platf.cpp
index 90a2afa..26c9276 100644 (file)
--- a/src/bindings/lua/lua_platf.cpp
+++ b/src/bindings/lua/lua_platf.cpp
@@ -45,6 +45,20 @@ static const luaL_Reg platf_functions[] = {
     {nullptr, nullptr}
 };
 
     {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();
 int console_open(lua_State *L) {
   sg_platf_init();
   sg_platf_begin();


@@ -91,19 +105,10 @@ int console_add_backbone(lua_State *L) {
   lua_gettable(L, -2);
   const char* policy = lua_tostring(L, -1);
   lua_pop(L, 1);
   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);
 
   sg_platf_new_link(&link);

-  routing_cluster_add_backbone(simgrid::surf::LinkImpl::byName(link.id));
+  routing_cluster_add_backbone(simgrid::kernel::resource::LinkImpl::byName(link.id));

 
   return 0;
 }
 
   return 0;
 }


@@ -267,16 +272,7 @@ int  console_add_link(lua_State *L) {
   lua_gettable(L, -2);
   policy = lua_tostring(L, -1);
   lua_pop(L, 1);
   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);
 
 
   sg_platf_new_link(&link);
 


@@ -336,12 +332,12 @@ int console_add_route(lua_State *L) {
   boost::split(names, str, boost::is_any_of(", \t\r\n"));
   if (names.empty()) {
     /* unique name */
   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::kernel::resource::LinkImpl::byName(lua_tostring(L, -1)));

   } else {
     // Several names separated by , \t\r\n
     for (auto const& name : names) {
       if (name.length() > 0) {
   } 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::kernel::resource::LinkImpl::byName(name);

         route.link_list.push_back(link);
       }
     }
         route.link_list.push_back(link);
       }
     }


@@ -414,12 +410,12 @@ int console_add_ASroute(lua_State *L) {
   boost::split(names, str, boost::is_any_of(", \t\r\n"));
   if (names.empty()) {
     /* unique name with no comma */
   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::kernel::resource::LinkImpl::byName(lua_tostring(L, -1)));

   } else {
     // Several names separated by , \t\r\n
     for (auto const& name : names) {
       if (name.length() > 0) {
   } 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::kernel::resource::LinkImpl::byName(name);

         ASroute.link_list.push_back(link);
       }
     }
         ASroute.link_list.push_back(link);
       }
     }