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
s/fullduplex/splitduplex/ in platform parsing (backward compatible, with a warning)
[simgrid.git]
/
src
/
msg
/
msg_environment.cpp
diff --git
a/src/msg/msg_environment.cpp
b/src/msg/msg_environment.cpp
index
1c3ea9b
..
92d67e9
100644
(file)
--- a/
src/msg/msg_environment.cpp
+++ b/
src/msg/msg_environment.cpp
@@
-5,7
+5,7
@@
#include "simgrid/s4u/Engine.hpp"
#include "simgrid/s4u/NetZone.hpp"
#include "simgrid/s4u/Engine.hpp"
#include "simgrid/s4u/NetZone.hpp"
-#include "src/msg/msg_private.h"
+#include "src/msg/msg_private.h
pp
"
#if SIMGRID_HAVE_LUA
#include <lua.h>
#if SIMGRID_HAVE_LUA
#include <lua.h>
@@
-13,7
+13,7
@@
#include <lualib.h>
#endif
#include <lualib.h>
#endif
-SG_BEGIN_DECL()
+extern "C" {
/********************************* MSG **************************************/
/********************************* MSG **************************************/
@@
-25,7
+25,7
@@
SG_BEGIN_DECL()
*
* \include simgrid.dtd
*
*
* \include simgrid.dtd
*
- * Here is a small example of such a platform
+ * Here is a small example of such a platform
*
* \include small_platform.xml
*
*
* \include small_platform.xml
*
@@
-38,29
+38,29
@@
void MSG_create_environment(const char *file)
msg_netzone_t MSG_zone_get_root()
{
msg_netzone_t MSG_zone_get_root()
{
- return simgrid::s4u::Engine::
instance()->n
etRoot();
+ return simgrid::s4u::Engine::
getInstance()->getN
etRoot();
}
const char* MSG_zone_get_name(msg_netzone_t netzone)
{
}
const char* MSG_zone_get_name(msg_netzone_t netzone)
{
- return netzone->name();
+ return netzone->
getC
name();
}
msg_netzone_t MSG_zone_get_by_name(const char* name)
{
}
msg_netzone_t MSG_zone_get_by_name(const char* name)
{
- return simgrid::s4u::Engine::
instance()->n
etzoneByNameOrNull(name);
+ return simgrid::s4u::Engine::
getInstance()->getN
etzoneByNameOrNull(name);
}
void MSG_zone_get_sons(msg_netzone_t netzone, xbt_dict_t whereto)
{
}
void MSG_zone_get_sons(msg_netzone_t netzone, xbt_dict_t whereto)
{
- for (auto
elem : *netzone->c
hildren()) {
- xbt_dict_set(whereto, elem->name(), static_cast<void*>(elem), nullptr);
+ for (auto
const& elem : *netzone->getC
hildren()) {
+ xbt_dict_set(whereto, elem->
getC
name(), static_cast<void*>(elem), nullptr);
}
}
const char* MSG_zone_get_property_value(msg_netzone_t netzone, const char* name)
{
}
}
const char* MSG_zone_get_property_value(msg_netzone_t netzone, const char* name)
{
- return netzone->
p
roperty(name);
+ return netzone->
getP
roperty(name);
}
void MSG_zone_set_property_value(msg_netzone_t netzone, const char* name, char* value)
}
void MSG_zone_set_property_value(msg_netzone_t netzone, const char* name, char* value)
@@
-72,9
+72,8
@@
void MSG_zone_get_hosts(msg_netzone_t netzone, xbt_dynar_t whereto)
{
/* converts vector to dynar */
std::vector<simgrid::s4u::Host*> hosts;
{
/* converts vector to dynar */
std::vector<simgrid::s4u::Host*> hosts;
- netzone->
h
osts(&hosts);
- for (auto host : hosts)
+ netzone->
getH
osts(&hosts);
+ for (auto
const&
host : hosts)
xbt_dynar_push(whereto, &host);
}
xbt_dynar_push(whereto, &host);
}
-
-SG_END_DECL()
+}