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
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
3275d94
..
a52a707
100644
(file)
--- a/
src/bindings/lua/lua_platf.cpp
+++ b/
src/bindings/lua/lua_platf.cpp
@@
-45,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;
}
@@
-91,16
+103,7
@@
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")) {
- XBT_WARN("Please update your platform to use SPLITDUPLEX instead of FULLDUPLEX");
- link.policy = SURF_LINK_SPLITDUPLEX;
- } else if (policy && not strcmp(policy, "SPLITDUPLEX")) {
- link.policy = SURF_LINK_SPLITDUPLEX;
- } 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::kernel::resource::LinkImpl::byName(link.id));
@@
-267,16
+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")) {
- XBT_WARN("Please update your platform to use SPLITDUPLEX instead of FULLDUPLEX");
- link.policy = SURF_LINK_SPLITDUPLEX;
- } else if (policy && not strcmp(policy, "SPLITDUPLEX")) {
- link.policy = SURF_LINK_SPLITDUPLEX;
- } 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);