Add surf_routing.h for extern variables

diff --git a/src/include/surf/surf.h b/src/include/surf/surf.h
index e115793..4601fb6 100644 (file)
--- a/src/include/surf/surf.h
+++ b/src/include/surf/surf.h
@@ -15,26 +15,7 @@
 #include "xbt/config.h"
 #include "surf/datatypes.h"
 #include "xbt/lib.h"
 #include "xbt/config.h"
 #include "surf/datatypes.h"
 #include "xbt/lib.h"

-
-xbt_lib_t host_lib;
-int ROUTING_HOST_LEVEL; //Routing level
-int    SURF_CPU_LEVEL;         //Surf cpu level
-int SURF_WKS_LEVEL;            //Surf workstation level
-int SIMIX_HOST_LEVEL;  //Simix level
-int    MSG_HOST_LEVEL;         //Msg level
-int    SD_HOST_LEVEL;          //Simdag level
-int    COORD_HOST_LEVEL;       //Coordinates level
-int NS3_HOST_LEVEL;            //host node for ns3
-
-xbt_lib_t link_lib;
-int SD_LINK_LEVEL;             //Simdag level
-int SURF_LINK_LEVEL;   //Surf level
-int NS3_LINK_LEVEL;            //link for ns3
-
-xbt_lib_t as_router_lib;
-int ROUTING_ASR_LEVEL; //Routing level
-int COORD_ASR_LEVEL;   //Coordinates level
-int NS3_ASR_LEVEL;             //host node for ns3
+#include "surf/surf_routing.h"

 
 SG_BEGIN_DECL()
 /* Actions and models are highly connected structures... */
 
 SG_BEGIN_DECL()
 /* Actions and models are highly connected structures... */

diff --git a/src/surf/surf_routing.c b/src/surf/surf_routing.c
index 5d1e078..2e0a499 100644 (file)
--- a/src/surf/surf_routing.c
+++ b/src/surf/surf_routing.c
@@ -8,6 +8,27 @@
 #include <pcre.h>               /* regular expression library */
 #endif
 #include "surf_routing_private.h"
 #include <pcre.h>               /* regular expression library */
 #endif
 #include "surf_routing_private.h"

+#include "surf_routing.h"
+
+xbt_lib_t host_lib;
+int ROUTING_HOST_LEVEL; //Routing level
+int    SURF_CPU_LEVEL;         //Surf cpu level
+int SURF_WKS_LEVEL;            //Surf workstation level
+int SIMIX_HOST_LEVEL;  //Simix level
+int    MSG_HOST_LEVEL;         //Msg level
+int    SD_HOST_LEVEL;          //Simdag level
+int    COORD_HOST_LEVEL;       //Coordinates level
+int NS3_HOST_LEVEL;            //host node for ns3
+
+xbt_lib_t link_lib;
+int SD_LINK_LEVEL;             //Simdag level
+int SURF_LINK_LEVEL;   //Surf level
+int NS3_LINK_LEVEL;            //link for ns3
+
+xbt_lib_t as_router_lib;
+int ROUTING_ASR_LEVEL; //Routing level
+int COORD_ASR_LEVEL;   //Coordinates level
+int NS3_ASR_LEVEL;             //host node for ns3

 
 static xbt_dict_t patterns = NULL;
 static xbt_dict_t random_value = NULL;
 
 static xbt_dict_t patterns = NULL;
 static xbt_dict_t random_value = NULL;

diff --git a/src/surf/surf_routing.h b/src/surf/surf_routing.h
new file mode 100644 (file)
index 0000000..cd96aa2
--- /dev/null
+++ b/src/surf/surf_routing.h
@@ -0,0 +1,30 @@
+/* Copyright (c) 2004, 2005, 2006, 2007, 2008, 2009, 2010. 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
+
+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
+
+#endif                          /* _SURF_SURF_H */