X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5bd7fca2e9f85f145e02ed5a1e2a18ca81bf6e5a..2b1e3b1eda0915dede0146e8ea5c183a0483acee:/src/bindings/lua/lua_platf.cpp

diff --git a/src/bindings/lua/lua_platf.cpp b/src/bindings/lua/lua_platf.cpp
index 9279bdbd46..905776d163 100644
--- a/src/bindings/lua/lua_platf.cpp
+++ b/src/bindings/lua/lua_platf.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2010-2018. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2010-2019. 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. */
@@ -24,8 +24,8 @@
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(lua_platf, "Lua bindings (platform module)");
 
-#define PLATF_MODULE_NAME "simgrid.engine"
-#define AS_FIELDNAME   "__simgrid_as"
+constexpr char PLATF_MODULE_NAME[] = "simgrid.engine";
+constexpr char AS_FIELDNAME[]      = "__simgrid_as";
 
 /* ********************************************************************************* */
 /*                               simgrid.platf API                                   */
@@ -60,14 +60,16 @@ static simgrid::s4u::Link::SharingPolicy link_policy_get_by_name(const char* pol
   }
 }
 
-int console_open(lua_State *L) {
+int console_open(lua_State*)
+{
   sg_platf_init();
   simgrid::s4u::on_platform_creation();
 
   return 0;
 }
 
-int console_close(lua_State *L) {
+int console_close(lua_State*)
+{
   simgrid::s4u::on_platform_created();
   sg_platf_exit();
   return 0;
@@ -107,7 +109,7 @@ int console_add_backbone(lua_State *L) {
   link.policy = link_policy_get_by_name(policy);
 
   sg_platf_new_link(&link);
-  routing_cluster_add_backbone(simgrid::kernel::resource::LinkImpl::byName(link.id));
+  routing_cluster_add_backbone(simgrid::s4u::Link::by_name(link.id)->get_impl());
 
   return 0;
 }
@@ -187,7 +189,7 @@ int console_add_host(lua_State *L) {
   lua_gettable(L, -2);
   const char *filename = lua_tostring(L, -1);
   if (filename)
-    host.speed_trace = tmgr_trace_new_from_file(filename);
+    host.speed_trace = simgrid::kernel::profile::Profile::from_file(filename);
   lua_pop(L, 1);
 
   //get trace state
@@ -195,7 +197,7 @@ int console_add_host(lua_State *L) {
   lua_gettable(L, -2);
   filename = lua_tostring(L, -1);
     if (filename)
-      host.state_trace = tmgr_trace_new_from_file(filename);
+      host.state_trace = simgrid::kernel::profile::Profile::from_file(filename);
   lua_pop(L, 1);
 
   sg_platf_new_host(&host);
@@ -247,7 +249,7 @@ int  console_add_link(lua_State *L) {
   lua_gettable(L, -2);
   const char *filename = lua_tostring(L, -1);
   if (filename)
-    link.bandwidth_trace = tmgr_trace_new_from_file(filename);
+    link.bandwidth_trace = simgrid::kernel::profile::Profile::from_file(filename);
   lua_pop(L, 1);
 
   //get latency_trace value
@@ -255,7 +257,7 @@ int  console_add_link(lua_State *L) {
   lua_gettable(L, -2);
   filename = lua_tostring(L, -1);
   if (filename)
-    link.latency_trace = tmgr_trace_new_from_file(filename);
+    link.latency_trace = simgrid::kernel::profile::Profile::from_file(filename);
   lua_pop(L, 1);
 
   //get state_trace value
@@ -263,7 +265,7 @@ int  console_add_link(lua_State *L) {
   lua_gettable(L, -2);
   filename = lua_tostring(L, -1);
   if (filename)
-    link.state_trace = tmgr_trace_new_from_file(filename);
+    link.state_trace = simgrid::kernel::profile::Profile::from_file(filename);
   lua_pop(L, 1);
 
   //get policy value
@@ -331,12 +333,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::kernel::resource::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::kernel::resource::LinkImpl* link = simgrid::kernel::resource::LinkImpl::byName(name);
+        simgrid::kernel::resource::LinkImpl* link = simgrid::s4u::Link::by_name(name)->get_impl();
         route.link_list.push_back(link);
       }
     }
@@ -390,16 +392,16 @@ int console_add_ASroute(lua_State *L) {
 
   lua_pushstring(L, "gw_src");
   lua_gettable(L, -2);
-  const char *name = lua_tostring(L, -1);
-  ASroute.gw_src   = sg_netpoint_by_name_or_null(name);
-  lua_ensure(ASroute.gw_src, "Attribute 'gw_src=%s' of AS route does not name a valid node", name);
+  const char* pname = lua_tostring(L, -1);
+  ASroute.gw_src    = sg_netpoint_by_name_or_null(pname);
+  lua_ensure(ASroute.gw_src, "Attribute 'gw_src=%s' of AS route does not name a valid node", pname);
   lua_pop(L, 1);
 
   lua_pushstring(L, "gw_dst");
   lua_gettable(L, -2);
-  name = lua_tostring(L, -1);
-  ASroute.gw_dst = sg_netpoint_by_name_or_null(name);
-  lua_ensure(ASroute.gw_dst, "Attribute 'gw_dst=%s' of AS route does not name a valid node", name);
+  pname          = lua_tostring(L, -1);
+  ASroute.gw_dst = sg_netpoint_by_name_or_null(pname);
+  lua_ensure(ASroute.gw_dst, "Attribute 'gw_dst=%s' of AS route does not name a valid node", pname);
   lua_pop(L, 1);
 
   lua_pushstring(L,"links");
@@ -409,12 +411,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::kernel::resource::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::kernel::resource::LinkImpl* link = simgrid::kernel::resource::LinkImpl::byName(name);
+        simgrid::kernel::resource::LinkImpl* link = simgrid::s4u::Link::by_name(name)->get_impl();
         ASroute.link_list.push_back(link);
       }
     }
@@ -476,12 +478,12 @@ int console_AS_open(lua_State *L) {
  simgrid::kernel::routing::ZoneCreationArgs AS;
  AS.id = id;
  AS.routing = mode_int;
- simgrid::s4u::NetZone* new_as = sg_platf_new_Zone_begin(&AS);
+ simgrid::kernel::routing::NetZoneImpl* new_as = sg_platf_new_Zone_begin(&AS);
 
  /* Build a Lua representation of the new AS on the stack */
  lua_newtable(L);
- simgrid::s4u::NetZone** lua_as =
-     (simgrid::s4u::NetZone**)lua_newuserdata(L, sizeof(simgrid::s4u::NetZone*)); /* table userdatum */
+ simgrid::kernel::routing::NetZoneImpl** lua_as = (simgrid::kernel::routing::NetZoneImpl**)lua_newuserdata(
+     L, sizeof(simgrid::kernel::routing::NetZoneImpl*)); /* table userdatum */
  *lua_as = new_as;
  luaL_getmetatable(L, PLATF_MODULE_NAME); /* table userdatum metatable */
  lua_setmetatable(L, -2);                 /* table userdatum */
@@ -489,7 +491,9 @@ int console_AS_open(lua_State *L) {
 
  return 1;
 }
-int console_AS_seal(lua_State *L) {
+
+int console_AS_seal(lua_State*)
+{
   XBT_DEBUG("Sealing AS");
   sg_platf_new_Zone_seal();
   return 0;
@@ -517,14 +521,14 @@ int console_host_set_property(lua_State *L) {
 
   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;
 }
 
 /**
- * \brief Registers the platform functions into the table simgrid.platf.
- * \param L a lua state
+ * @brief Registers the platform functions into the table simgrid.platf.
+ * @param L a lua state
  */
 void sglua_register_platf_functions(lua_State* L)
 {