From 99a6dd9c43f2ad2e2f6da980642f5d0f6fc6c779 Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Mon, 12 Dec 2016 22:13:27 +0100 Subject: [PATCH] move some storage-related content out of routing into storage area --- include/simgrid/link.h | 3 ++- src/bindings/lua/lua_platf.cpp | 6 +++--- src/instr/instr_interface.cpp | 5 +++-- src/kernel/routing/NetCard.hpp | 2 ++ src/surf/storage_n11.cpp | 21 +++++++++++++++++++++ src/surf/surf_private.h | 2 -- src/surf/surf_routing.cpp | 27 --------------------------- src/surf/xml/platf_private.hpp | 2 -- src/surf/xml/surfxml_parseplatf.cpp | 1 - src/surf/xml/surfxml_sax_cb.cpp | 15 ++++++++------- 10 files changed, 39 insertions(+), 45 deletions(-) diff --git a/include/simgrid/link.h b/include/simgrid/link.h index 4865236afe..a2c64bd71f 100644 --- a/include/simgrid/link.h +++ b/include/simgrid/link.h @@ -9,7 +9,8 @@ #ifndef INCLUDE_SIMGRID_LINK_H_ #define INCLUDE_SIMGRID_LINK_H_ -#include +#include "simgrid/forward.h" +#include "xbt/base.h" /* C interface */ SG_BEGIN_DECL() diff --git a/src/bindings/lua/lua_platf.cpp b/src/bindings/lua/lua_platf.cpp index ca263d2da6..8f79fd9e63 100644 --- a/src/bindings/lua/lua_platf.cpp +++ b/src/bindings/lua/lua_platf.cpp @@ -7,11 +7,12 @@ /* SimGrid Lua bindings */ #include "lua_private.h" -#include "src/surf/xml/platf_private.hpp" +#include "src/kernel/routing/NetCard.hpp" #include "src/surf/network_interface.hpp" +#include "src/surf/xml/platf_private.hpp" #include "surf/surf_routing.h" -#include #include +#include extern "C" { #include @@ -49,7 +50,6 @@ int console_open(lua_State *L) { sg_platf_begin(); storage_register_callbacks(); - routing_register_callbacks(); return 0; } diff --git a/src/instr/instr_interface.cpp b/src/instr/instr_interface.cpp index 7094cddb07..46d4f8a68b 100644 --- a/src/instr/instr_interface.cpp +++ b/src/instr/instr_interface.cpp @@ -5,10 +5,11 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include "simgrid_config.h" -#include "src/surf/network_interface.hpp" #include "src/instr/instr_private.h" -#include "surf/surf.h" +#include "src/kernel/routing/NetCard.hpp" +#include "src/surf/network_interface.hpp" #include "src/surf/surf_private.h" +#include "surf/surf.h" typedef enum { INSTR_US_DECLARE, diff --git a/src/kernel/routing/NetCard.hpp b/src/kernel/routing/NetCard.hpp index 40454d49ef..c42b6c9a34 100644 --- a/src/kernel/routing/NetCard.hpp +++ b/src/kernel/routing/NetCard.hpp @@ -61,4 +61,6 @@ private: } } +XBT_PUBLIC(sg_netcard_t) sg_netcard_by_name_or_null(const char* name); + #endif /* KERNEL_ROUTING_NETCARD_HPP_ */ diff --git a/src/surf/storage_n11.cpp b/src/surf/storage_n11.cpp index a986fe426d..79c7bc579c 100644 --- a/src/surf/storage_n11.cpp +++ b/src/surf/storage_n11.cpp @@ -5,6 +5,7 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include "storage_n11.hpp" +#include "src/kernel/routing/NetCard.hpp" #include "surf_private.h" #include /*ceil*/ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_storage); @@ -39,8 +40,28 @@ static inline void routing_storage_host_free(void *r) xbt_dynar_free(&dyn); } +static void check_disk_attachment() +{ + xbt_lib_cursor_t cursor; + char* key; + void** data; + xbt_lib_foreach(storage_lib, cursor, key, data) + { + if (xbt_lib_get_level(xbt_lib_get_elm_or_null(storage_lib, key), SURF_STORAGE_LEVEL) != nullptr) { + simgrid::surf::Storage* storage = + static_cast(xbt_lib_get_or_null(storage_lib, key, SURF_STORAGE_LEVEL)); + simgrid::kernel::routing::NetCard* host_elm = sg_netcard_by_name_or_null(storage->attach_); + if (!host_elm) + surf_parse_error("Unable to attach storage %s: host %s doesn't exist.", storage->getName(), storage->attach_); + } + } +} + void storage_register_callbacks() { + simgrid::surf::on_postparse.connect(check_disk_attachment); + instr_routing_define_callbacks(); + ROUTING_STORAGE_LEVEL = xbt_lib_add_level(storage_lib, xbt_free_f); ROUTING_STORAGE_HOST_LEVEL = xbt_lib_add_level(storage_lib, routing_storage_host_free); ROUTING_STORAGE_TYPE_LEVEL = xbt_lib_add_level(storage_type_lib, routing_storage_type_free); diff --git a/src/surf/surf_private.h b/src/surf/surf_private.h index 1f3290c491..b68c575578 100644 --- a/src/surf/surf_private.h +++ b/src/surf/surf_private.h @@ -51,8 +51,6 @@ extern XBT_PRIVATE simgrid::trace_mgr::future_evt_set *future_evt_set; XBT_PUBLIC(void) storage_register_callbacks(); -XBT_PUBLIC(void) routing_register_callbacks(void); - XBT_PUBLIC(void) generic_get_graph(xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edges, AS_t rc); XBT_PRIVATE void parse_after_config(); diff --git a/src/surf/surf_routing.cpp b/src/surf/surf_routing.cpp index 7904fff958..c316fa2e7b 100644 --- a/src/surf/surf_routing.cpp +++ b/src/surf/surf_routing.cpp @@ -46,30 +46,3 @@ void sg_platf_new_trace(sg_platf_trace_cbarg_t trace) } xbt_dict_set(traces_set_list, trace->id, (void *) tmgr_trace, nullptr); } - -/* ************************************************************************** */ -/* ************************* GENERIC PARSE FUNCTIONS ************************ */ - -static void check_disk_attachment() -{ - xbt_lib_cursor_t cursor; - char *key; - void **data; - xbt_lib_foreach(storage_lib, cursor, key, data) { - if (xbt_lib_get_level(xbt_lib_get_elm_or_null(storage_lib, key), SURF_STORAGE_LEVEL) != nullptr) { - simgrid::surf::Storage* storage = - static_cast(xbt_lib_get_or_null(storage_lib, key, SURF_STORAGE_LEVEL)); - simgrid::kernel::routing::NetCard* host_elm = sg_netcard_by_name_or_null(storage->attach_); - if (!host_elm) - surf_parse_error("Unable to attach storage %s: host %s doesn't exist.", storage->getName(), storage->attach_); - } - } -} - -void routing_register_callbacks() -{ - simgrid::surf::on_postparse.connect(check_disk_attachment); - - instr_routing_define_callbacks(); -} - diff --git a/src/surf/xml/platf_private.hpp b/src/surf/xml/platf_private.hpp index 12d82e9b10..6a36915911 100644 --- a/src/surf/xml/platf_private.hpp +++ b/src/surf/xml/platf_private.hpp @@ -21,8 +21,6 @@ SG_BEGIN_DECL() typedef size_t yy_size_t; #endif -XBT_PUBLIC(sg_netcard_t) sg_netcard_by_name_or_null(const char *name); - typedef enum { SURF_CLUSTER_DRAGONFLY=3, SURF_CLUSTER_FAT_TREE=2, diff --git a/src/surf/xml/surfxml_parseplatf.cpp b/src/surf/xml/surfxml_parseplatf.cpp index 6efb5f88bb..2194009bd3 100644 --- a/src/surf/xml/surfxml_parseplatf.cpp +++ b/src/surf/xml/surfxml_parseplatf.cpp @@ -119,7 +119,6 @@ void parse_after_config() { /* Register classical callbacks */ storage_register_callbacks(); - routing_register_callbacks(); after_config_done = 1; } diff --git a/src/surf/xml/surfxml_sax_cb.cpp b/src/surf/xml/surfxml_sax_cb.cpp index eb2f63c448..d36c014f49 100644 --- a/src/surf/xml/surfxml_sax_cb.cpp +++ b/src/surf/xml/surfxml_sax_cb.cpp @@ -8,15 +8,16 @@ #include #include /* va_arg */ -#include "xbt/misc.h" +#include "simgrid/link.h" +#include "simgrid/sg_config.h" +#include "src/kernel/routing/NetCard.hpp" +#include "src/surf/network_interface.hpp" +#include "src/surf/surf_private.h" +#include "xbt/dict.h" +#include "xbt/file.h" #include "xbt/log.h" +#include "xbt/misc.h" #include "xbt/str.h" -#include "xbt/file.h" -#include "xbt/dict.h" -#include "src/surf/surf_private.h" -#include "src/surf/network_interface.hpp" -#include "simgrid/sg_config.h" -#include "simgrid/link.h" #include "src/surf/xml/platf_private.hpp" -- 2.20.1