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 scm.gforge.inria.fr:/gitroot/simgrid/simgrid
[simgrid.git]
/
src
/
msg
/
msg_environment.cpp
diff --git
a/src/msg/msg_environment.cpp
b/src/msg/msg_environment.cpp
index
fc067f7
..
1114b49
100644
(file)
--- a/
src/msg/msg_environment.cpp
+++ b/
src/msg/msg_environment.cpp
@@
-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
*
@@
-36,42
+36,31
@@
void MSG_create_environment(const char *file)
SIMIX_create_environment(file);
}
SIMIX_create_environment(file);
}
-void MSG_post_create_environment() {
- xbt_lib_cursor_t cursor;
- void **data;
- char *name;
-
- /* Initialize MSG storages */
- xbt_lib_foreach(storage_lib, cursor, name, data) {
- __MSG_storage_create(xbt_dict_cursor_get_elm(cursor));
- }
-}
-
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 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)
@@
-83,7
+72,7
@@
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);
+ netzone->
getH
osts(&hosts);
for (auto host : hosts)
xbt_dynar_push(whereto, &host);
}
for (auto host : hosts)
xbt_dynar_push(whereto, &host);
}