#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 {
TYPE_LINK,
TYPE_CONTAINER,
TYPE_STATE,
- TYPE_EVENT,
+ TYPE_EVENT
} e_entity_types;
typedef struct s_type *type_t;
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 {
+ sg_routing_edge_t net_elm;
char *name; /* Unique name of this container */
char *id; /* Unique id of this container */
type_t type; /* Type of this container */
}s_container_t;
extern xbt_dict_t created_categories;
+extern xbt_dict_t declared_marks;
+extern xbt_dict_t user_host_variables;
+extern xbt_dict_t user_link_variables;
extern double TRACE_last_timestamp_to_dump;
/* from paje.c */
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_pajeResetState (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_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);
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);
char *TRACE_get_filename(void);
char *TRACE_get_triva_uncat_conf (void);
char *TRACE_get_triva_cat_conf (void);
+char *TRACE_get_viva_uncat_conf (void);
+char *TRACE_get_viva_cat_conf (void);
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);
+void TRACE_generate_viva_uncat_conf (void);
+void TRACE_generate_viva_cat_conf (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;
/* instr_paje_values.c */
val_t PJ_value_new (const char *name, const char *color, type_t father);
+val_t PJ_value_get_or_new (const char *name, const char *color, type_t father);
val_t PJ_value_get (const char *name, const type_t father);
void PJ_value_free (val_t value);
void instr_routing_define_callbacks (void);
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);
+void instr_new_user_state_type (const char *father_type, const char *new_typename);
+void instr_new_value_for_user_state_type (const char *typename, const char *value, 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);