typo--

[simgrid.git] / include / surf / surf_routing.h

diff --git a/include/surf/surf_routing.h b/include/surf/surf_routing.h
index 86379ba..c846b77 100644 (file)
--- a/include/surf/surf_routing.h
+++ b/include/surf/surf_routing.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2004, 2005, 2006, 2007, 2008, 2009, 2010. The SimGrid Team.
+/* Copyright (c) 2004-2015. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -8,41 +8,27 @@
 #define _SURF_SURF_ROUTING_H
 
 #include "xbt/lib.h"
-#include "simgrid/platf_interface.h"
-
-XBT_PUBLIC(xbt_lib_t) host_lib;
-XBT_PUBLIC(int) ROUTING_HOST_LEVEL; //Routing level
-XBT_PUBLIC(int)  SURF_CPU_LEVEL;    //Surf cpu level
-XBT_PUBLIC(int) SURF_WKS_LEVEL;    //Surf workstation level
-XBT_PUBLIC(int) SIMIX_HOST_LEVEL;  //Simix level
-XBT_PUBLIC(int)  MSG_HOST_LEVEL;    //Msg level
-XBT_PUBLIC(int)  SD_HOST_LEVEL;    //Simdag level
-XBT_PUBLIC(int)  COORD_HOST_LEVEL;  //Coordinates level
-XBT_PUBLIC(int) NS3_HOST_LEVEL;    //host node for ns3
-
-XBT_PUBLIC(xbt_lib_t) link_lib;
-XBT_PUBLIC(int) SD_LINK_LEVEL;    //Simdag level
-XBT_PUBLIC(int) SURF_LINK_LEVEL;  //Surf level
-XBT_PUBLIC(int) NS3_LINK_LEVEL;    //link for ns3
-
-XBT_PUBLIC(xbt_lib_t) as_router_lib;
-XBT_PUBLIC(int) ROUTING_ASR_LEVEL;  //Routing level
-XBT_PUBLIC(int) COORD_ASR_LEVEL;  //Coordinates level
-XBT_PUBLIC(int) NS3_ASR_LEVEL;    //host node for ns3
-XBT_PUBLIC(int) ROUTING_PROP_ASR_LEVEL; //Properties for AS and router
-
-XBT_PUBLIC(xbt_lib_t) storage_lib;
-XBT_PUBLIC(int) ROUTING_STORAGE_LEVEL;        //Routing storage level
-XBT_PUBLIC(int) ROUTING_STORAGE_HOST_LEVEL;
-XBT_PUBLIC(int) SURF_STORAGE_LEVEL;
-
-XBT_PUBLIC(xbt_lib_t) storage_type_lib;
-XBT_PUBLIC(int) ROUTING_STORAGE_TYPE_LEVEL;   //Routing storage_type level
-
-/* The callbacks to register for the routing to work */
-void routing_AS_begin(sg_platf_AS_cbarg_t AS);
-void routing_AS_end(sg_platf_AS_cbarg_t AS);
-
-void routing_cluster_add_backbone(void* bb);
+
+SG_BEGIN_DECL()
+
+XBT_PUBLIC_DATA(xbt_dict_t) host_list;
+XBT_PUBLIC_DATA(int) SIMIX_STORAGE_LEVEL; //Simix storage level
+XBT_PUBLIC_DATA(int) COORD_HOST_LEVEL;    //Coordinates level
+
+XBT_PUBLIC_DATA(xbt_lib_t) as_router_lib;
+XBT_PUBLIC_DATA(int) ROUTING_ASR_LEVEL;  //Routing level
+XBT_PUBLIC_DATA(int) COORD_ASR_LEVEL;  //Coordinates level
+XBT_PUBLIC_DATA(int) NS3_ASR_LEVEL;    //host node for ns3
+XBT_PUBLIC_DATA(int) ROUTING_PROP_ASR_LEVEL; //Properties for AS and router
+
+XBT_PUBLIC_DATA(xbt_lib_t) storage_lib;
+XBT_PUBLIC_DATA(int) ROUTING_STORAGE_LEVEL;        //Routing storage level
+XBT_PUBLIC_DATA(int) ROUTING_STORAGE_HOST_LEVEL;
+XBT_PUBLIC_DATA(int) SURF_STORAGE_LEVEL;  // Surf storage level
+XBT_PUBLIC_DATA(xbt_lib_t) file_lib;
+XBT_PUBLIC_DATA(xbt_lib_t) storage_type_lib;
+XBT_PUBLIC_DATA(int) ROUTING_STORAGE_TYPE_LEVEL;   //Routing storage_type level
+
+SG_END_DECL()
 
 #endif                          /* _SURF_SURF_H */