X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/05eee146e0c327c57c4de749b3252b788e0ed3fb..73fc9f6b6089d7cb8a76dcf5a015e105943c1df5:/src/instr/instr_private.h

diff --git a/src/instr/instr_private.h b/src/instr/instr_private.h
index 866a0f98c3..2ab9aeac8a 100644
--- a/src/instr/instr_private.h
+++ b/src/instr/instr_private.h
@@ -18,6 +18,43 @@
 #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,
+  INSTR_SMPI,
+} 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 */
 void TRACE_paje_create_header(void);
 void TRACE_paje_start(void);
@@ -104,15 +141,9 @@ void TRACE_smx_action_destroy(smx_action_t act);
 /* from surf_instr.c */
 void TRACE_surf_alloc(void);
 void TRACE_surf_release(void);
-void TRACE_surf_host_set_power(double date, const char *resource,
-                               double power);
-void TRACE_surf_host_define_id(const char *name, int host_id);
-void TRACE_surf_host_vivaldi_parse(char *host, double x, double y,
-                                   double h);
-void TRACE_surf_link_set_bandwidth(double date, void *link,
-                                   double bandwidth);
-void TRACE_surf_link_set_latency(double date, void *link, double latency);
-void TRACE_surf_save_onelink(void);
+void TRACE_surf_host_set_power(double date, const char *resource, double power);
+void TRACE_surf_link_set_bandwidth(double date, const char *resource, double bandwidth);
+void TRACE_surf_link_set_latency(double date, const char *resource, double latency);
 void TRACE_surf_action(surf_action_t surf_action, const char *category);
 
 //for tracing gtnets
@@ -161,12 +192,12 @@ void TRACE_generate_triva_uncat_conf (void);
 void TRACE_generate_triva_cat_conf (void);
 
 /* from resource_utilization.c */
-void TRACE_surf_host_set_utilization(const char *name,
+void TRACE_surf_host_set_utilization(const char *resource,
                                      smx_action_t smx_action,
                                      surf_action_t surf_action,
                                      double value, double now,
                                      double delta);
-void TRACE_surf_link_set_utilization(void *link, smx_action_t smx_action,
+void TRACE_surf_link_set_utilization(const char *resource, smx_action_t smx_action,
                                      surf_action_t surf_action,
                                      double value, double now,
                                      double delta);
@@ -185,11 +216,19 @@ void TRACE_sd_task_create(SD_task_t task);
 void TRACE_sd_task_destroy(SD_task_t task);
 
 /* instr_routing.c */
+container_t newContainer (const char *name, e_container_types kind, container_t father);
+container_t getContainer (const char *name);
+type_t getType (const char *name);
+void destroyContainer (container_t container);
 void instr_routing_define_callbacks (void);
 int instr_link_is_traced (const char *name);
-char *instr_link_type (const char *name);
-char *instr_host_type (const char *name);
+char *instr_variable_type (const char *name, const char *resource);
+char *instr_resource_type (const char *resource_name);
 void instr_destroy_platform (void);
+void instr_new_user_variable_type (const char *new_typename, const char *color);
+void instr_new_user_link_variable_type  (const char *new_typename, const char *color);
+void instr_new_user_host_variable_type  (const char *new_typename, const char *color);
+int instr_platform_traced (void);
 
 #endif /* HAVE_TRACING */
 #endif /* INSTR_PRIVATE_H_ */