[trace] update on --cfg=tracing/msg/task:1, now works with new tracing system

[simgrid.git] / src / instr / instr_private.h

diff --git a/src/instr/instr_private.h b/src/instr/instr_private.h
index 2ab9aea..63ce990 100644 (file)
--- a/src/instr/instr_private.h
+++ b/src/instr/instr_private.h
@@ -23,6 +23,7 @@ typedef enum {
   TYPE_LINK,
   TYPE_CONTAINER,
   TYPE_STATE,
+  TYPE_EVENT,
 } e_entity_types;
 
 typedef struct s_type *type_t;
@@ -40,6 +41,8 @@ typedef enum {
   INSTR_ROUTER,
   INSTR_AS,
   INSTR_SMPI,
+  INSTR_MSG_PROCESS,
+  INSTR_MSG_TASK,
 } e_container_types;
 
 typedef struct s_container *container_t;
@@ -63,6 +66,8 @@ void pajeDefineContainerType(const char *alias, const char *containerType,
                              const char *name);
 void pajeDefineStateType(const char *alias, const char *containerType,
                          const char *name);
+void pajeDefineEventTypeWithColor(const char *alias, const char *containerType,
+                         const char *name, const char *color);
 void pajeDefineEventType(const char *alias, const char *containerType,
                          const char *name);
 void pajeDefineLinkType(const char *alias, const char *containerType,
@@ -103,8 +108,6 @@ void pajeNewEvent(double time, const char *entityType,
 
 /* declaration of instrumentation functions from msg_task_instr.c */
 char *TRACE_task_container(m_task_t task, char *output, int len);
-void TRACE_msg_task_alloc(void);
-void TRACE_msg_task_release(void);
 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);
@@ -118,8 +121,6 @@ void TRACE_msg_task_put_end(void);
 char *TRACE_process_alias_container(m_process_t process, m_host_t host,
                                     char *output, int len);
 char *TRACE_process_container(m_process_t process, char *output, int len);
-void TRACE_msg_process_alloc(void);
-void TRACE_msg_process_release(void);
 void TRACE_msg_process_change_host(m_process_t process, m_host_t old_host,
                                    m_host_t new_host);
 void TRACE_msg_process_kill(m_process_t process);
@@ -218,6 +219,11 @@ 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 newContainerType (const char *typename, e_entity_types kind, type_t father);
+type_t newEventType (const char *typename, e_entity_types kind, const char *color, type_t father);
+type_t newVariableType (const char *typename, e_entity_types kind, const char *color, type_t father);
+type_t newLinkType (const char *typename, e_entity_types kind, type_t father, type_t source, type_t dest);
+type_t newStateType (const char *typename, e_entity_types kind, type_t father);
 type_t getType (const char *name);
 void destroyContainer (container_t container);
 void instr_routing_define_callbacks (void);