A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of framagit.org:simgrid/simgrid
[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
47d4643
..
f2c24af
100644
(file)
--- a/
src/bindings/lua/lua_platf.cpp
+++ b/
src/bindings/lua/lua_platf.cpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2010-201
8
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2010-201
9
. 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. */
/* 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. */
@@
-107,7
+107,7
@@
int console_add_backbone(lua_State *L) {
link.policy = link_policy_get_by_name(policy);
sg_platf_new_link(&link);
link.policy = link_policy_get_by_name(policy);
sg_platf_new_link(&link);
- routing_cluster_add_backbone(simgrid::
kernel::resource::LinkImpl::by_name(link.id
));
+ routing_cluster_add_backbone(simgrid::
s4u::Link::by_name(link.id)->get_impl(
));
return 0;
}
return 0;
}
@@
-331,12
+331,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::
kernel::resource::LinkImpl::by_name(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) {
} 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::by_name(name
);
+ simgrid::kernel::resource::LinkImpl* link = simgrid::
s4u::Link::by_name(name)->get_impl(
);
route.link_list.push_back(link);
}
}
route.link_list.push_back(link);
}
}
@@
-409,12
+409,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::
kernel::resource::LinkImpl::by_name(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) {
} 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::by_name(name
);
+ simgrid::kernel::resource::LinkImpl* link = simgrid::
s4u::Link::by_name(name)->get_impl(
);
ASroute.link_list.push_back(link);
}
}
ASroute.link_list.push_back(link);
}
}
@@
-476,12
+476,12
@@
int console_AS_open(lua_State *L) {
simgrid::kernel::routing::ZoneCreationArgs AS;
AS.id = id;
AS.routing = mode_int;
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);
/* 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 */
*lua_as = new_as;
luaL_getmetatable(L, PLATF_MODULE_NAME); /* table userdatum metatable */
lua_setmetatable(L, -2); /* table userdatum */
@@
-523,8
+523,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)
{
*/
void sglua_register_platf_functions(lua_State* L)
{