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
Fix build for lua bindings.
[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
26c9276
..
dac0399
100644
(file)
--- a/
src/bindings/lua/lua_platf.cpp
+++ b/
src/bindings/lua/lua_platf.cpp
@@
-17,6
+17,7
@@
#include "src/surf/surf_private.hpp"
#include <boost/algorithm/string/classification.hpp>
#include <boost/algorithm/string/split.hpp>
#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 <string>
#include <vector>
#include <simgrid/s4u/Host.hpp>
#include <string>
#include <vector>
@@
-61,15
+62,13
@@
static simgrid::s4u::Link::SharingPolicy link_policy_get_by_name(const char* pol
int console_open(lua_State *L) {
sg_platf_init();
int console_open(lua_State *L) {
sg_platf_init();
- sg_platf_begin();
-
- storage_register_callbacks();
+ simgrid::s4u::on_platform_creation();
return 0;
}
int console_close(lua_State *L) {
return 0;
}
int console_close(lua_State *L) {
- s
g_platf_en
d();
+ s
imgrid::s4u::on_platform_create
d();
sg_platf_exit();
return 0;
}
sg_platf_exit();
return 0;
}
@@
-108,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::byName(link.id
));
+ routing_cluster_add_backbone(simgrid::
s4u::Link::by_name(link.id)->get_impl(
));
return 0;
}
return 0;
}
@@
-332,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::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) {
} 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);
}
}
route.link_list.push_back(link);
}
}
@@
-410,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::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) {
} 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);
}
}
ASroute.link_list.push_back(link);
}
}
@@
-518,7
+517,7
@@
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);
sg_host_t host = sg_host_by_name(name);
lua_ensure(host, "no host '%s' found",name);
- host->set
P
roperty(prop_id, prop_value);
+ host->set
_p
roperty(prop_id, prop_value);
return 0;
}
return 0;
}