X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8cc10e99f53995bc7486e4467b4e6ad8d7be3460..358b3ac1d1ce9e2cfcc7583271916ebd96eff6da:/include/surf/surf_routing.h

diff --git a/include/surf/surf_routing.h b/include/surf/surf_routing.h
index 3c945cc4e6..83fa79e6a6 100644
--- a/include/surf/surf_routing.h
+++ b/include/surf/surf_routing.h
@@ -1,37 +1,22 @@
-/* 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
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#ifndef _SURF_SURF_ROUTING_H
-#define _SURF_SURF_ROUTING_H
+#ifndef SURF_SURF_ROUTING_H
+#define SURF_SURF_ROUTING_H
 
 #include "xbt/lib.h"
 
-extern xbt_lib_t host_lib;
-extern int ROUTING_HOST_LEVEL; //Routing level
-extern int	SURF_CPU_LEVEL;		//Surf cpu level
-extern int SURF_WKS_LEVEL;		//Surf workstation level
-extern int SIMIX_HOST_LEVEL;	//Simix level
-extern int	MSG_HOST_LEVEL;		//Msg level
-extern int	SD_HOST_LEVEL;		//Simdag level
-extern int	COORD_HOST_LEVEL;	//Coordinates level
-extern int NS3_HOST_LEVEL;		//host node for ns3
-
-extern xbt_lib_t link_lib;
-extern int SD_LINK_LEVEL;		//Simdag level
-extern int SURF_LINK_LEVEL;	//Surf level
-extern int NS3_LINK_LEVEL;		//link for ns3
-
-extern xbt_lib_t as_router_lib;
-extern int ROUTING_ASR_LEVEL;	//Routing level
-extern int COORD_ASR_LEVEL;	//Coordinates level
-extern int NS3_ASR_LEVEL;		//host node for ns3
-
-
-/* The callbacks to register for the routing to work */
-void routing_AS_begin(const char *AS_id, const char *wanted_routing_type);
-void routing_AS_end(void);
+SG_BEGIN_DECL()
+
+// FIXME: this header file should die
+
+XBT_PUBLIC_DATA(xbt_lib_t) storage_lib;
+XBT_PUBLIC_DATA(int) ROUTING_STORAGE_LEVEL;        //Routing storage level
+XBT_PUBLIC_DATA(int) SURF_STORAGE_LEVEL;  // Surf storage level
+
+SG_END_DECL()
 
 #endif                          /* _SURF_SURF_H */