#include "src/kernel/routing/ClusterZone.hpp"
#include "src/kernel/routing/NetCard.hpp"
+#include "src/kernel/routing/RoutedZone.hpp"
#include "src/surf/network_interface.hpp"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_cluster, surf, "Routing part of surf");
#include "src/kernel/routing/DijkstraZone.hpp"
#include "src/kernel/routing/NetCard.hpp"
-
#include "src/surf/network_interface.hpp"
+#include <float.h>
+
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_dijkstra, surf, "Routing part of surf -- dijkstra routing logic");
/* Free functions */
/* 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 <limits>
#include "src/kernel/routing/FloydZone.hpp"
#include "src/kernel/routing/NetCard.hpp"
#include "src/surf/network_interface.hpp"
#include "xbt/log.h"
+#include <float.h>
+#include <limits>
+
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_floyd, surf, "Routing part of surf");
#define TO_FLOYD_COST(i, j) (costTable_)[(i) + (j)*table_size]
* under the terms of the license (GNU LGPL) which comes with this package. */
#include "src/kernel/routing/NetCard.hpp"
-#include "src/surf/surf_routing.hpp"
+#include "surf/surf_routing.h"
#include <simgrid/s4u/host.hpp>
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route, surf, "Routing part of surf");
}
}
-/* ************************************************************************** */
-/* *********************** GENERIC BUSINESS METHODS ************************* */
+/* ***************************************************************** */
+/* *********************** GENERIC METHODS ************************* */
static const char* instr_node_name(xbt_node_t node)
{
}
} // namespace
+SG_BEGIN_DECL()
+XBT_PRIVATE xbt_node_t new_xbt_graph_node(xbt_graph_t graph, const char* name, xbt_dict_t nodes);
+XBT_PRIVATE xbt_edge_t new_xbt_graph_edge(xbt_graph_t graph, xbt_node_t s, xbt_node_t d, xbt_dict_t edges);
+SG_END_DECL()
+
#endif /* SIMGRID_ROUTING_GENERIC_HPP_ */
#include "src/kernel/routing/NetZoneImpl.hpp"
#include "src/surf/network_interface.hpp"
-#include "src/surf/surf_routing.hpp" // routing_platf. FIXME:KILLME. SOON
#include "surf/surf.h" // routing_platf. FIXME:KILLME. SOON
XBT_LOG_NEW_CATEGORY(s4u,"Log channels of the S4U (Simgrid for you) interface");
#include "simgrid/simix.hpp"
#include "src/kernel/routing/NetCard.hpp"
#include "src/surf/network_interface.hpp" // Link FIXME: move to proper header
-#include "src/surf/surf_routing.hpp"
XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_netzone, "S4U Networking Zones");
// ========= Layering madness ==============*
#include "src/surf/cpu_interface.hpp"
-#include "src/surf/surf_routing.hpp"
// ========== User data Layer ==========
void *sg_host_user(sg_host_t host) {
#include <utility>
-#include "network_ib.hpp"
-
-#include "src/surf/HostImpl.hpp"
#include "simgrid/sg_config.h"
-#include "maxmin_private.hpp"
+#include "src/surf/HostImpl.hpp"
+#include "src/surf/maxmin_private.hpp"
+#include "src/surf/network_ib.hpp"
+#include "src/surf/xml/platf.hpp"
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_network);
#ifndef SURF_NETWORK_IB_HPP_
#define SURF_NETWORK_IB_HPP_
-#include <xbt/base.h>
+#include "src/surf/network_smpi.hpp"
+#include "xbt/base.h"
-#include "network_smpi.hpp"
+#include <map>
namespace simgrid {
namespace surf {
#include "xbt/fifo.h"
#include "xbt/dict.h"
#include "surf_interface.hpp"
-#include "surf_routing.hpp"
#include "src/surf/PropertyHolder.hpp"
#include "simgrid/link.h"
#include "ptask_L07.hpp"
#include "cpu_interface.hpp"
-#include "surf_routing.hpp"
#include "xbt/lib.h"
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_host);
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_storage, surf, "Logging specific to the SURF storage module");
xbt_lib_t file_lib;
+int MSG_FILE_LEVEL = -1; // Msg file level
+
xbt_lib_t storage_lib;
-int ROUTING_STORAGE_LEVEL = -1; //Routing for storagelevel
+int SIMIX_STORAGE_LEVEL = -1; // Simix storage level
+int MSG_STORAGE_LEVEL = -1; // Msg storage level
+int ROUTING_STORAGE_LEVEL = -1; // Routing for storage level
int ROUTING_STORAGE_HOST_LEVEL = -1;
int SURF_STORAGE_LEVEL = -1;
xbt_lib_t storage_type_lib;
/* 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 "src/surf/surf_routing.hpp"
#include "simgrid/msg.h"
-int MSG_FILE_LEVEL = -1; //Msg file level
-
-int SIMIX_STORAGE_LEVEL = -1; //Simix storage level
-int MSG_STORAGE_LEVEL = -1; //Msg storage level
-
xbt_lib_t as_router_lib;
int ROUTING_ASR_LEVEL = -1; //Routing level
+++ /dev/null
-/* Copyright (c) 2013-2016. 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. */
-
-#ifndef NETWORK_ROUTING_HPP_
-#define NETWORK_ROUTING_HPP_
-
-#include <xbt/base.h>
-#include <xbt/signal.hpp>
-
-#include "src/kernel/routing/NetZoneImpl.hpp"
-#include "surf_interface.hpp"
-
-#include <float.h>
-#include <vector>
-
-SG_BEGIN_DECL()
-XBT_PRIVATE xbt_node_t new_xbt_graph_node (xbt_graph_t graph, const char *name, xbt_dict_t nodes);
-XBT_PRIVATE xbt_edge_t new_xbt_graph_edge (xbt_graph_t graph, xbt_node_t s, xbt_node_t d, xbt_dict_t edges);
-SG_END_DECL()
-
-#endif /* NETWORK_ROUTING_HPP_ */
#include "src/surf/network_interface.hpp"
#include "src/instr/instr_private.h" // TRACE_start(). FIXME: remove by subscribing tracing to the surf signals
-#include "src/surf/xml/platf.hpp"
+#include "src/surf/xml/platf_private.hpp"
#if HAVE_LUA
extern "C" {
#include "simgrid/s4u/host.hpp"
#include "simgrid/simdag.h"
#include "src/kernel/routing/NetCard.hpp"
-#include "src/surf/surf_routing.hpp"
+#include "surf/surf_routing.h"
#include <stdio.h>
int main(int argc, char **argv)
src/surf/storage_n11.hpp
src/surf/surf_interface.hpp
src/surf/surf_private.h
- src/surf/surf_routing.hpp
src/surf/PropertyHolder.hpp
src/surf/host_clm03.hpp
src/surf/HostImpl.hpp