move some global signals to the Engine

[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 1b8431d..404887f 100644 (file)
--- 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. */
@@ -7,25 +7,27 @@
 
 #include "lua_private.hpp"
 #include "simgrid/kernel/routing/NetPoint.hpp"
+#include "src/kernel/resource/profile/Profile.hpp"
 #include "src/surf/network_interface.hpp"
+#include "src/surf/surf_private.hpp"
 #include "src/surf/xml/platf_private.hpp"
-#include <cctype>
-#include <cstring>
-
-#include <lauxlib.h>
 
-#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 <cctype>
+#include <cstring>
 #include <string>
 #include <vector>
 
+#include <lauxlib.h>
+
 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,15 +62,17 @@ 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();
+  simgrid::s4u::Engine::on_platform_creation();
 
   return 0;
 }
 
-int console_close(lua_State *L) {
-  simgrid::s4u::on_platform_created();
+int console_close(lua_State*)
+{
+  simgrid::s4u::Engine::on_platform_created();
   sg_platf_exit();
   return 0;
 }
@@ -90,7 +94,7 @@ int console_add_backbone(lua_State *L) {
   type = lua_gettable(L, -2);
   lua_ensure(type == LUA_TSTRING || type == LUA_TNUMBER,
       "Attribute 'bandwidth' must be specified for backbone and must either be a string (in the right format; see docs) or a number.");
-  link.bandwidth = surf_parse_get_bandwidth(lua_tostring(L, -1), "bandwidth of backbone", link.id.c_str());
+  link.bandwidths.push_back(surf_parse_get_bandwidth(lua_tostring(L, -1), "bandwidth of backbone", link.id.c_str()));
   lua_pop(L, 1);
 
   lua_pushstring(L, "lat");
@@ -187,7 +191,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 +199,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);
@@ -224,9 +228,9 @@ int  console_add_link(lua_State *L) {
   lua_ensure(type == LUA_TSTRING || type == LUA_TNUMBER,
       "Attribute 'bandwidth' must be specified for any link and must either be either a string (in the right format; see docs) or a number.");
   if (type == LUA_TNUMBER)
-    link.bandwidth = lua_tonumber(L, -1);
+    link.bandwidths.push_back(lua_tonumber(L, -1));
   else // LUA_TSTRING
-    link.bandwidth = surf_parse_get_bandwidth(lua_tostring(L, -1), "bandwidth of link", link.id.c_str());
+    link.bandwidths.push_back(surf_parse_get_bandwidth(lua_tostring(L, -1), "bandwidth of link", link.id.c_str()));
   lua_pop(L, 1);
 
   //get latency value
@@ -247,7 +251,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 +259,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 +267,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
@@ -390,16 +394,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");
@@ -489,7 +493,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;
@@ -523,8 +529,8 @@ int console_host_set_property(lua_State *L) {
 }
 
 /**
- * \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)
 {