[trace] making type_t and container_t available for instr module

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@9199 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/src/instr/instr_private.h b/src/instr/instr_private.h
index bd0869d..0375922 100644 (file)
--- a/src/instr/instr_private.h
+++ b/src/instr/instr_private.h
@@ -18,6 +18,40 @@
 #include "simdag/private.h"
 #include "simix/private.h"
 
+typedef enum {
+  TYPE_VARIABLE,
+  TYPE_LINK,
+  TYPE_CONTAINER,
+  TYPE_STATE,
+} e_entity_types;
+
+typedef struct s_type *type_t;
+typedef struct s_type {
+  char *id;
+  char *name;
+  e_entity_types kind;
+  struct s_type *father;
+  xbt_dict_t children;
+}s_type_t;
+
+typedef enum {
+  INSTR_HOST,
+  INSTR_LINK,
+  INSTR_ROUTER,
+  INSTR_AS,
+} e_container_types;
+
+typedef struct s_container *container_t;
+typedef struct s_container {
+  char *name;     /* Unique name of this container */
+  char *id;       /* Unique id of this container */
+  type_t type;    /* Type of this container */
+  int level;      /* Level in the hierarchy, root level is 0 */
+  e_container_types kind; /* This container is of what kind */
+  struct s_container *father;
+  xbt_dict_t children;
+}s_container_t;
+
 extern xbt_dict_t created_categories;
 
 /* from paje.c */

diff --git a/src/instr/instr_routing.c b/src/instr/instr_routing.c
index e26e3ed..5b81546 100644 (file)
--- a/src/instr/instr_routing.c
+++ b/src/instr/instr_routing.c
@@ -14,40 +14,6 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_routing, instr, "Tracing platform hierarc
 
 extern xbt_dict_t defined_types; /* from instr_interface.c */
 
-typedef enum {
-  TYPE_VARIABLE,
-  TYPE_LINK,
-  TYPE_CONTAINER,
-  TYPE_STATE,
-} e_entity_types;
-
-typedef struct s_type *type_t;
-typedef struct s_type {
-  char *id;
-  char *name;
-  e_entity_types kind;
-  struct s_type *father;
-  xbt_dict_t children;
-}s_type_t;
-
-typedef enum {
-  INSTR_HOST,
-  INSTR_LINK,
-  INSTR_ROUTER,
-  INSTR_AS,
-} e_container_types;
-
-typedef struct s_container *container_t;
-typedef struct s_container {
-  char *name;     /* Unique name of this container */
-  char *id;       /* Unique id of this container */
-  type_t type;    /* Type of this container */
-  int level;      /* Level in the hierarchy, root level is 0 */
-  e_container_types kind; /* This container is of what kind */
-  struct s_container *father;
-  xbt_dict_t children;
-}s_container_t;
-
 static int platform_created = 0;            /* indicate whether the platform file has been traced */
 static type_t rootType = NULL;              /* the root type */
 static container_t rootContainer = NULL;    /* the root container */