#include "msg/msg.h"
#include "simdag/private.h"
#include "simix/private.h"
+#include "xbt/graph_private.h"
typedef enum {
TYPE_VARIABLE,
typedef struct s_type {
char *id;
char *name;
+ char *color;
e_entity_types kind;
struct s_type *father;
xbt_dict_t children;
+ xbt_dict_t values; //valid for all types except variable and container
}s_type_t;
+typedef struct s_val *val_t;
+typedef struct s_val {
+ char *id;
+ char *name;
+ char *color;
+ type_t father;
+}s_val_t;
+
typedef enum {
INSTR_HOST,
INSTR_LINK,
}s_container_t;
extern xbt_dict_t created_categories;
+extern double TRACE_last_timestamp_to_dump;
/* from paje.c */
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 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,
- 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 TRACE_paje_dump_buffer (int force);
+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_pajeDefineEntityValue (val_t type);
+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, val_t value);
+void new_pajePushState (double timestamp, container_t container, type_t type, val_t 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, 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_task_put_end(void);
/* declaration of instrumentation functions from msg_process_instr.c */
-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);
+char *instr_process_id (m_process_t proc, char *str, int len);
+char *instr_process_id_2 (const char *process_name, int process_pid, char *str, int len);
void TRACE_msg_process_change_host(m_process_t process, m_host_t old_host,
m_host_t new_host);
+void TRACE_msg_process_create (const char *process_name, int process_pid, m_host_t host);
void TRACE_msg_process_kill(m_process_t process);
void TRACE_msg_process_suspend(m_process_t process);
void TRACE_msg_process_resume(m_process_t process);
void TRACE_msg_process_sleep_out(m_process_t process);
void TRACE_msg_process_end(m_process_t process);
-/* declaration of instrumentation functions from msg_volume.c */
-void TRACE_msg_volume_start(m_task_t task);
-void TRACE_msg_volume_finish(m_task_t task);
-
/* from smx.c */
void TRACE_smx_host_execute(smx_action_t act);
void TRACE_smx_action_communicate(smx_action_t act, smx_process_t proc);
void TRACE_surf_action(surf_action_t surf_action, const char *category);
//for tracing gtnets
-void TRACE_surf_gtnets_communicate(void *action, int src, int dst);
-int TRACE_surf_gtnets_get_src(void *action);
-int TRACE_surf_gtnets_get_dst(void *action);
+void TRACE_surf_gtnets_communicate(void *action, const char *src, const char *dst);
void TRACE_surf_gtnets_destroy(void *action);
/* from smpi_instr.c */
/* from instr_config.c */
int TRACE_start (void);
int TRACE_end (void);
-void TRACE_activate (void);
-void TRACE_desactivate (void);
-int TRACE_is_active (void);
+int TRACE_needs_platform (void);
int TRACE_is_enabled(void);
+int TRACE_platform(void);
int TRACE_is_configured(void);
int TRACE_smpi_is_enabled(void);
int TRACE_smpi_is_grouped(void);
int TRACE_uncategorized (void);
int TRACE_msg_task_is_enabled(void);
int TRACE_msg_process_is_enabled(void);
-int TRACE_msg_volume_is_enabled(void);
+int TRACE_buffer (void);
+int TRACE_onelink_only (void);
char *TRACE_get_filename(void);
-char *TRACE_get_platform_method(void);
char *TRACE_get_triva_uncat_conf (void);
char *TRACE_get_triva_cat_conf (void);
void TRACE_global_init(int *argc, char **argv);
void TRACE_sd_task_create(SD_task_t task);
void TRACE_sd_task_destroy(SD_task_t task);
-/* instr_routing.c */
+/* 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);
+int knownContainerWithName (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);
+type_t getType (const char *name, type_t father);
+val_t getValue (const char *valuename, const char *color, type_t father);
+val_t getValueByName (const char *valuename, type_t father);
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);
+void instr_new_variable_type (const char *new_typename, const char *color);
+void instr_new_user_variable_type (const char *father_type, const char *new_typename, const char *color);
int instr_platform_traced (void);
+xbt_graph_t instr_routing_platform_graph (void);
+void instr_routing_platform_graph_export_graphviz (xbt_graph_t g, const char *filename);
#endif /* HAVE_TRACING */
+
+#ifdef HAVE_JEDULE
+#include "instr/jedule/jedule_sd_binding.h"
+#endif
+
#endif /* INSTR_PRIVATE_H_ */
