TYPE_LINK,
TYPE_CONTAINER,
TYPE_STATE,
+ TYPE_EVENT,
} e_entity_types;
typedef struct s_type *type_t;
typedef struct s_type {
char *id;
char *name;
+ char *color;
e_entity_types kind;
struct s_type *father;
xbt_dict_t children;
INSTR_ROUTER,
INSTR_AS,
INSTR_SMPI,
+ INSTR_MSG_PROCESS,
+ INSTR_MSG_TASK,
} e_container_types;
typedef struct s_container *container_t;
void TRACE_paje_create_header(void);
void TRACE_paje_start(void);
void TRACE_paje_end(void);
-void pajeDefineContainerType(const char *alias, const char *containerType,
- const char *name);
-void pajeDefineStateType(const char *alias, const char *containerType,
- const char *name);
-void pajeDefineEventType(const char *alias, const char *containerType,
- const char *name);
-void pajeDefineLinkType(const char *alias, const char *containerType,
- const char *sourceContainerType,
- const char *destContainerType, const char *name);
-void pajeCreateContainer(double time, const char *alias, const char *type,
- const char *container, const char *name);
-void pajeDestroyContainer(double time, const char *type,
- const char *container);
-void pajeSetState(double time, const char *entityType,
- const char *container, const char *value);
-void pajePushState(double time, const char *entityType,
- const char *container, const char *value);
-void pajePopState(double time, const char *entityType,
- const char *container);
-void pajeStartLink(double time, const char *entityType,
- const char *container, const char *value,
- const char *sourceContainer, const char *key);
-void pajeStartLinkWithVolume(double time, const char *entityType,
- const char *container, const char *value,
- const char *sourceContainer, const char *key,
- double volume);
-void pajeEndLink(double time, const char *entityType,
- const char *container, const char *value,
- const char *destContainer, const char *key);
-void pajeDefineVariableType(const char *alias, const char *containerType,
- const char *name);
-void pajeDefineVariableTypeWithColor(const char *alias, const char *containerType,
- const char *name, const char *color);
-void pajeSetVariable(double time, const char *entityType,
- const char *container, const char *value);
-void pajeAddVariable(double time, const char *entityType,
- const char *container, const char *value);
-void pajeSubVariable(double time, const char *entityType,
- const char *container, const char *value);
-void pajeNewEvent(double time, const char *entityType,
- const char *container, const char *value);
+void new_pajeDefineContainerType(type_t type);
+void new_pajeDefineVariableType(type_t type);
+void new_pajeDefineStateType(type_t type);
+void new_pajeDefineEventType(type_t type);
+void new_pajeDefineLinkType(type_t type, type_t source, type_t dest);
+void new_pajeCreateContainer (container_t container);
+void new_pajeDestroyContainer (container_t container);
+void new_pajeSetVariable (double timestamp, container_t container, type_t type, double value);
+void new_pajeAddVariable (double timestamp, container_t container, type_t type, double value);
+void new_pajeSubVariable (double timestamp, container_t container, type_t type, double value);
+void new_pajeSetState (double timestamp, container_t container, type_t type, const char *value);
+void new_pajePushState (double timestamp, container_t container, type_t type, const char *value);
+void new_pajePopState (double timestamp, container_t container, type_t type);
+void new_pajeStartLink (double timestamp, container_t container, type_t type, container_t sourceContainer, const char *value, const char *key);
+void new_pajeEndLink (double timestamp, container_t container, type_t type, container_t destContainer, const char *value, const char *key);
+void new_pajeNewEvent (double timestamp, container_t container, type_t type, const char *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_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);
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);
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;
+container_t newContainer (const char *name, e_container_types kind, container_t father);
+container_t getContainer (const char *name);
+container_t getContainerByName (const char *name);
+char *getContainerIdByName (const char *name);
+char *getVariableTypeIdByName (const char *name, type_t father);
+container_t getRootContainer (void);
+void instr_paje_init (container_t root);
+type_t getRootType (void);
+type_t getContainerType (const char *name, type_t father);
+type_t getEventType (const char *name, const char *color, type_t father);
+type_t getVariableType (const char *name, const char *color, type_t father);
+type_t getLinkType (const char *name, type_t father, type_t source, type_t dest);
+type_t getStateType (const char *name, type_t father);
+type_t getType (const char *name);
+void destroyContainer (container_t container);
+void destroyAllContainers (void);
+
/* instr_routing.c */
void instr_routing_define_callbacks (void);
-int instr_link_is_traced (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);