simplication and uniformization

[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 e7c3370..a52a707 100644 (file)
--- a/src/bindings/lua/lua_platf.cpp
+++ b/src/bindings/lua/lua_platf.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2010-2017. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2010-2018. The SimGrid Team. All rights reserved.          */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
@@ -6,15 +6,13 @@
 /* SimGrid Lua bindings                                                     */
 
 #include "lua_private.hpp"
-#include "src/kernel/routing/NetPoint.hpp"
+#include "simgrid/kernel/routing/NetPoint.hpp"
 #include "src/surf/network_interface.hpp"
 #include "src/surf/xml/platf_private.hpp"
 #include <cctype>
 #include <cstring>
 
-extern "C" {
 #include <lauxlib.h>
-}
 
 #include "src/surf/surf_private.hpp"
 #include <boost/algorithm/string/classification.hpp>
@@ -47,12 +45,24 @@ static const luaL_Reg platf_functions[] = {
     {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();
-
   return 0;
 }
 
@@ -63,7 +73,7 @@ int console_close(lua_State *L) {
 }
 
 int console_add_backbone(lua_State *L) {
-  LinkCreationArgs link;
+  simgrid::kernel::routing::LinkCreationArgs link;
 
   link.properties = nullptr;
 
@@ -93,22 +103,16 @@ int console_add_backbone(lua_State *L) {
   lua_gettable(L, -2);
   const char* policy = lua_tostring(L, -1);
   lua_pop(L, 1);
-  if (policy && not strcmp(policy, "FULLDUPLEX")) {
-    link.policy = SURF_LINK_FULLDUPLEX;
-  } 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::kernel::resource::LinkImpl::byName(link.id));
 
   return 0;
 }
 
 int console_add_host___link(lua_State *L) {
-  HostLinkCreationArgs hostlink;
+  simgrid::kernel::routing::HostLinkCreationArgs hostlink;
   int type;
 
   lua_ensure(lua_istable(L, -1), "Bad Arguments to create host_link in Lua. Should be a table with named arguments.");
@@ -140,7 +144,7 @@ int console_add_host___link(lua_State *L) {
 }
 
 int console_add_host(lua_State *L) {
-  s_sg_platf_host_cbarg_t host;
+  simgrid::kernel::routing::HostCreationArgs host;
   int type;
 
   // we get values from the table passed as argument
@@ -199,7 +203,7 @@ int console_add_host(lua_State *L) {
 }
 
 int  console_add_link(lua_State *L) {
-  LinkCreationArgs link;
+  simgrid::kernel::routing::LinkCreationArgs link;
 
   const char* policy;
 
@@ -266,13 +270,7 @@ int  console_add_link(lua_State *L) {
   lua_gettable(L, -2);
   policy = lua_tostring(L, -1);
   lua_pop(L, 1);
-  if (policy && not strcmp(policy, "FULLDUPLEX")) {
-    link.policy = SURF_LINK_FULLDUPLEX;
-  } 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);
 
@@ -302,7 +300,7 @@ int console_add_router(lua_State* L) {
 
 int console_add_route(lua_State *L) {
   XBT_DEBUG("Adding route");
-  s_sg_platf_route_cbarg_t route;
+  simgrid::kernel::routing::RouteCreationArgs route;
   int type;
 
   lua_ensure(lua_istable(L, -1), "Bad Arguments to add a route. Should be a table with named arguments");
@@ -332,12 +330,12 @@ int console_add_route(lua_State *L) {
   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) {
-        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);
       }
     }
@@ -373,7 +371,7 @@ int console_add_route(lua_State *L) {
 }
 
 int console_add_ASroute(lua_State *L) {
-  s_sg_platf_route_cbarg_t ASroute;
+  simgrid::kernel::routing::RouteCreationArgs ASroute;
 
   lua_pushstring(L, "src");
   lua_gettable(L, -2);
@@ -410,12 +408,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 */
-    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) {
-        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);
       }
     }
@@ -474,7 +472,7 @@ int console_AS_open(lua_State *L) {
    mode_int = A_surfxml_AS_routing_None;
  else xbt_die("Don't have the model name '%s'",mode);
 
- ZoneCreationArgs AS;
+ simgrid::kernel::routing::ZoneCreationArgs AS;
  AS.id = id;
  AS.routing = mode_int;
  simgrid::s4u::NetZone* new_as = sg_platf_new_Zone_begin(&AS);