X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/667b4b34e9d5149c4a69007ec1eba9d7689eb6e5..36fa571a13985879dc627c70ecc2340af606aa42:/src/surf/surf_routing.cpp

diff --git a/src/surf/surf_routing.cpp b/src/surf/surf_routing.cpp
index e1540b2fb6..1bf0d25ee7 100644
--- a/src/surf/surf_routing.cpp
+++ b/src/surf/surf_routing.cpp
@@ -1,85 +1,7 @@
-/* Copyright (c) 2009-2011, 2013-2016. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2009-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. */
 
-#include <vector>
-
-#include <xbt/signal.hpp>
-
-#include <simgrid/s4u/host.hpp>
-
-#include "src/surf/surf_routing.hpp"
-
-#include "simgrid/sg_config.h"
-#include "src/surf/storage_interface.hpp"
-
-#include "src/kernel/routing/AsImpl.hpp"
-#include "src/surf/network_interface.hpp"
-
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route, surf, "Routing part of surf");
-
-namespace simgrid {
-namespace kernel {
-namespace routing {
-
-  /* Callbacks */
-  simgrid::xbt::signal<void(s4u::As*)> asCreatedCallbacks;
-
-}}} // namespace simgrid::kernel::routing
-
-/**
- * @ingroup SURF_build_api
- * @brief A library containing all known hosts
- */
-
-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
-int COORD_ASR_LEVEL = -1;            //Coordinates level
-int ROUTING_PROP_ASR_LEVEL = -1;     //Where the properties are stored
-
-void sg_platf_new_trace(sg_platf_trace_cbarg_t trace)
-{
-  tmgr_trace_t tmgr_trace;
-  if (trace->file && strcmp(trace->file, "") != 0) {
-    tmgr_trace = tmgr_trace_new_from_file(trace->file);
-  } else {
-    xbt_assert(strcmp(trace->pc_data, ""),
-        "Trace '%s' must have either a content, or point to a file on disk.",trace->id);
-    tmgr_trace = tmgr_trace_new_from_string(trace->id, trace->pc_data, trace->periodicity);
-  }
-  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();
-}
+#include "xbt/dict.h"