-/* Copyright (c) 2004-2016. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2004-2017. 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. */
+#include "simgrid/s4u/Engine.hpp"
#include "simgrid/s4u/NetZone.hpp"
-#include "simgrid/s4u/engine.hpp"
-#include "src/msg/msg_private.h"
+#include "src/msg/msg_private.hpp"
-#if HAVE_LUA
+#if SIMGRID_HAVE_LUA
#include <lua.h>
#include <lauxlib.h>
#include <lualib.h>
#endif
-SG_BEGIN_DECL()
+extern "C" {
/********************************* MSG **************************************/
*
* \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
*
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) {
- if(data[SIMIX_STORAGE_LEVEL])
- __MSG_storage_create(xbt_dict_cursor_get_elm(cursor));
- }
-}
-
-msg_netzone_t MSG_environment_get_routing_root()
+msg_netzone_t MSG_zone_get_root()
{
- return simgrid::s4u::Engine::instance()->netRoot();
+ return simgrid::s4u::Engine::getInstance()->getNetRoot();
}
-const char* MSG_environment_as_get_name(msg_netzone_t netzone)
+const char* MSG_zone_get_name(msg_netzone_t netzone)
{
- return netzone->name();
+ return netzone->getCname();
}
-msg_netzone_t MSG_environment_as_get_by_name(const char* name)
+msg_netzone_t MSG_zone_get_by_name(const char* name)
{
- return simgrid::s4u::Engine::instance()->netzoneByNameOrNull(name);
+ return simgrid::s4u::Engine::getInstance()->getNetzoneByNameOrNull(name);
}
-xbt_dict_t MSG_environment_as_get_routing_sons(msg_netzone_t netzone)
+void MSG_zone_get_sons(msg_netzone_t netzone, xbt_dict_t whereto)
{
- return netzone->children();
+ for (auto const& elem : *netzone->getChildren()) {
+ xbt_dict_set(whereto, elem->getCname(), static_cast<void*>(elem), nullptr);
+ }
}
-const char* MSG_environment_as_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->property(name);
+ return netzone->getProperty(name);
}
-void MSG_environment_as_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)
{
netzone->setProperty(name, value);
}
-xbt_dynar_t MSG_environment_as_get_hosts(msg_netzone_t netzone)
+void MSG_zone_get_hosts(msg_netzone_t netzone, xbt_dynar_t whereto)
{
- xbt_dynar_t res = xbt_dynar_new(sizeof(sg_host_t), nullptr);
-
- for (auto host : netzone->hosts()) {
- xbt_dynar_push(res, &host);
- }
-
- return res;
+ /* converts vector to dynar */
+ std::vector<simgrid::s4u::Host*> hosts;
+ netzone->getHosts(&hosts);
+ for (auto const& host : hosts)
+ xbt_dynar_push(whereto, &host);
+}
}
-
-SG_END_DECL()