#ifdef HAVE_TRACING
+/* Need to define function drand48 for Windows */
+#ifdef _WIN32
+# define drand48() (rand()/(RAND_MAX + 1.0))
+#endif
+
#define INSTR_DEFAULT_STR_SIZE 500
#include "instr/instr.h"
#include "msg/msg.h"
#include "simdag/private.h"
#include "simix/private.h"
+#include "xbt/graph_private.h"
typedef enum {
TYPE_VARIABLE,
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_smx_action_destroy(smx_action_t act);
-
/* from surf_instr.c */
void TRACE_surf_alloc(void);
void TRACE_surf_release(void);
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);
+int TRACE_disable_destroy (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_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,
char *getContainerIdByName (const char *name);
char *getVariableTypeIdByName (const char *name, type_t father);
container_t getRootContainer (void);
-void instr_paje_init (container_t root);
+void instr_paje_init (void);
+void instr_paje_set_root (container_t root);
+void instr_paje_free (void);
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 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 removeContainerFromParent (container_t child);
void destroyContainer (container_t container);
void destroyAllContainers (void);
/* instr_routing.c */
void instr_routing_define_callbacks (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 */