X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ea5d4ac6b57a3771a16f9a998179688088f8b96c..599347b970dec2ad471021b8eecca62e8f0854e9:/src/instr/instr_private.h?ds=sidebyside

diff --git a/src/instr/instr_private.h b/src/instr/instr_private.h
index cd3be85cf5..028a62f32d 100644
--- a/src/instr/instr_private.h
+++ b/src/instr/instr_private.h
@@ -21,7 +21,7 @@
 #include "instr/instr.h"
 #include "msg/msg.h"
 #include "simdag/private.h"
-#include "simix/private.h"
+#include "simix/smx_private.h"
 #include "xbt/graph_private.h"
 
 typedef enum {
@@ -29,7 +29,7 @@ typedef enum {
   TYPE_LINK,
   TYPE_CONTAINER,
   TYPE_STATE,
-  TYPE_EVENT,
+  TYPE_EVENT
 } e_entity_types;
 
 typedef struct s_type *type_t;
@@ -58,11 +58,12 @@ typedef enum {
   INSTR_AS,
   INSTR_SMPI,
   INSTR_MSG_PROCESS,
-  INSTR_MSG_TASK,
+  INSTR_MSG_TASK
 } e_container_types;
 
 typedef struct s_container *container_t;
 typedef struct s_container {
+  network_element_t net_elm;
   char *name;     /* Unique name of this container */
   char *id;       /* Unique id of this container */
   type_t type;    /* Type of this container */
@@ -99,7 +100,7 @@ void new_pajeEndLink (double timestamp, container_t container, type_t type, cont
 void new_pajeNewEvent (double timestamp, container_t container, type_t type, val_t value);
 
 /* declaration of instrumentation functions from msg_task_instr.c */
-char *TRACE_task_container(m_task_t task, char *output, int len);
+void TRACE_msg_set_task_category(m_task_t task, const char *category);
 void TRACE_msg_task_create(m_task_t task);
 void TRACE_msg_task_execute_start(m_task_t task);
 void TRACE_msg_task_execute_end(m_task_t task);
@@ -131,8 +132,7 @@ void TRACE_surf_link_set_latency(double date, const char *resource, double laten
 void TRACE_surf_action(surf_action_t surf_action, const char *category);
 
 //for tracing gtnets
-void TRACE_surf_gtnets_communicate(void *action, const char *src, const char *dst);
-void TRACE_surf_gtnets_destroy(void *action);
+void TRACE_surf_gtnets_communicate(void *action, void *src, void *dst);
 
 /* from smpi_instr.c */
 void TRACE_internal_smpi_set_category (const char *category);
@@ -170,32 +170,21 @@ void TRACE_global_init(int *argc, char **argv);
 void TRACE_help(int detailed);
 void TRACE_generate_triva_uncat_conf (void);
 void TRACE_generate_triva_cat_conf (void);
-void TRACE_set_network_update_mechanism (void);
 
 /* from resource_utilization.c */
 void TRACE_surf_host_set_utilization(const char *resource,
-                                     smx_action_t smx_action,
-                                     surf_action_t surf_action,
-                                     double value, double now,
+                                     const char *category,
+                                     double value,
+                                     double now,
                                      double delta);
-void TRACE_surf_link_set_utilization(const char *resource, smx_action_t smx_action,
-                                     surf_action_t surf_action,
-                                     double value, double now,
+void TRACE_surf_link_set_utilization(const char *resource,
+                                     const char *category,
+                                     double value,
+                                     double now,
                                      double delta);
-void TRACE_surf_resource_utilization_start(smx_action_t action);
-void TRACE_surf_resource_utilization_event(smx_action_t action, double now,
-                                           double delta,
-                                           const char *variable,
-                                           const char *resource,
-                                           double value);
-void TRACE_surf_resource_utilization_end(smx_action_t action);
 void TRACE_surf_resource_utilization_alloc(void);
 void TRACE_surf_resource_utilization_release(void);
 
-/* sd_instr.c */
-void TRACE_sd_task_create(SD_task_t task);
-void TRACE_sd_task_destroy(SD_task_t task);
-
 /* instr_paje.c */
 extern xbt_dict_t trivaNodeTypes;
 extern xbt_dict_t trivaEdgeTypes;
@@ -221,6 +210,7 @@ type_t PJ_type_variable_new (const char *name, const char *color, type_t father)
 type_t PJ_type_link_new (const char *name, type_t father, type_t source, type_t dest);
 type_t PJ_type_state_new (const char *name, type_t father);
 type_t PJ_type_get (const char *name, const type_t father);
+type_t PJ_type_get_or_null (const char *name, type_t father);
 void PJ_type_free (type_t type);
 void PJ_type_free_all (void);