#ifndef INCLUDE_SIMGRID_LINK_H_
#define INCLUDE_SIMGRID_LINK_H_
-#include <simgrid/forward.h>
+#include "simgrid/forward.h"
+#include "xbt/base.h"
/* C interface */
SG_BEGIN_DECL()
/* 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 <string.h>
#include <ctype.h>
+#include <string.h>
extern "C" {
#include <lauxlib.h>
sg_platf_begin();
storage_register_callbacks();
- routing_register_callbacks();
return 0;
}
* 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,
}
}
+XBT_PUBLIC(sg_netcard_t) sg_netcard_by_name_or_null(const char* name);
+
#endif /* KERNEL_ROUTING_NETCARD_HPP_ */
* 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 <math.h> /*ceil*/
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_storage);
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<simgrid::surf::Storage*>(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);
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();
}
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<simgrid::surf::Storage*>(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();
-}
-
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,
/* Register classical callbacks */
storage_register_callbacks();
- routing_register_callbacks();
after_config_done = 1;
}
#include <math.h>
#include <stdarg.h> /* 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"