-/* Copyright (c) 2004-2015. 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 "msg_private.h"
-#include "xbt/sysdep.h"
-#include "xbt/log.h"
+#include "simgrid/s4u/Engine.hpp"
+#include "simgrid/s4u/NetZone.hpp"
+#include "src/msg/msg_private.h"
-#ifdef HAVE_LUA
+#if SIMGRID_HAVE_LUA
#include <lua.h>
#include <lauxlib.h>
#include <lualib.h>
#endif
+SG_BEGIN_DECL()
+
/********************************* MSG **************************************/
/** \ingroup msg_simulation
* \brief A platform constructor.
*
- * Creates a new platform, including hosts, links and the
- * routing_table.
- * \param file a filename of a xml description of a platform. This file
- * follows this DTD :
+ * Creates a new platform, including hosts, links and the routing_table.
+ * \param file a filename of a xml description of a platform. This file follows this 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
*
SIMIX_create_environment(file);
}
-void MSG_post_create_environment(void) {
- 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_zone_get_root()
+{
+ return simgrid::s4u::Engine::instance()->netRoot();
}
-msg_as_t MSG_environment_get_routing_root() {
- return surf_AS_get_routing_root();
+const char* MSG_zone_get_name(msg_netzone_t netzone)
+{
+ return netzone->name();
}
-const char *MSG_environment_as_get_name(msg_as_t as) {
- return surf_AS_get_name(as);
+msg_netzone_t MSG_zone_get_by_name(const char* name)
+{
+ return simgrid::s4u::Engine::instance()->netzoneByNameOrNull(name);
}
-msg_as_t MSG_environment_as_get_by_name(const char * name) {
- return surf_AS_get_by_name(name);
+void MSG_zone_get_sons(msg_netzone_t netzone, xbt_dict_t whereto)
+{
+ for (auto elem : *netzone->children()) {
+ xbt_dict_set(whereto, elem->name(), static_cast<void*>(elem), nullptr);
+ }
}
-xbt_dict_t MSG_environment_as_get_routing_sons(msg_as_t as) {
- xbt_dict_t res = surf_AS_get_routing_sons(as);
- return res;
+const char* MSG_zone_get_property_value(msg_netzone_t netzone, const char* name)
+{
+ return netzone->property(name);
}
-const char *MSG_environment_as_get_property_value(msg_as_t as, const char *name)
+void MSG_zone_set_property_value(msg_netzone_t netzone, const char* name, char* value)
{
- xbt_dict_t dict = (xbt_dict_t) xbt_lib_get_or_null(as_router_lib, MSG_environment_as_get_name(as), ROUTING_PROP_ASR_LEVEL);
- if (dict==NULL)
- return NULL;
- return (char*) xbt_dict_get_or_null(dict, name);
+ netzone->setProperty(name, value);
}
-xbt_dynar_t MSG_environment_as_get_hosts(msg_as_t as) {
- return surf_AS_get_hosts(as);
+void MSG_zone_get_hosts(msg_netzone_t netzone, xbt_dynar_t whereto)
+{
+ /* converts vector to dynar */
+ std::vector<simgrid::s4u::Host*> hosts;
+ netzone->hosts(&hosts);
+ for (auto host : hosts)
+ xbt_dynar_push(whereto, &host);
}
+
+SG_END_DECL()