X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a79a8e1cab86ccc687cfbc97b01b735acb996f16..2524c0a850869696e1164fc0b63bb79cd598ffbd:/src/msg/msg_environment.cpp diff --git a/src/msg/msg_environment.cpp b/src/msg/msg_environment.cpp index 66843fecd2..5bdf7aecf3 100644 --- a/src/msg/msg_environment.cpp +++ b/src/msg/msg_environment.cpp @@ -1,17 +1,11 @@ -/* Copyright (c) 2004-2015. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2004-2018. 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/msg.h" -#include "simgrid/s4u/NetZone.hpp" -#include "simgrid/s4u/engine.hpp" - -#if HAVE_LUA +#if SIMGRID_HAVE_LUA #include #include #include @@ -27,7 +21,7 @@ * * \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 * @@ -37,44 +31,3 @@ void MSG_create_environment(const char *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) { - if(data[SIMIX_STORAGE_LEVEL]) - __MSG_storage_create(xbt_dict_cursor_get_elm(cursor)); - } -} - -msg_as_t MSG_environment_get_routing_root() { - return simgrid::s4u::Engine::instance()->rootAs(); -} - -const char *MSG_environment_as_get_name(msg_as_t as) { - return as->name(); -} - -msg_as_t MSG_environment_as_get_by_name(const char * name) { - return simgrid::s4u::Engine::instance()->asByNameOrNull(name); -} - -xbt_dict_t MSG_environment_as_get_routing_sons(msg_as_t as) { - return as->children(); -} - -const char *MSG_environment_as_get_property_value(msg_as_t as, const char *name) -{ - xbt_dict_t dict = static_cast (xbt_lib_get_or_null(as_router_lib, MSG_environment_as_get_name(as), - ROUTING_PROP_ASR_LEVEL)); - if (dict==nullptr) - return nullptr; - return static_cast(xbt_dict_get_or_null(dict, name)); -} - -xbt_dynar_t MSG_environment_as_get_hosts(msg_as_t as) { - return as->hosts(); -}