#ifndef INSTR_PRIVATE_H_
#define INSTR_PRIVATE_H_
-#include "instr/config.h"
+#include "instr/tracing_config.h"
#ifdef HAVE_TRACING
void __TRACE_surf_check_variable_set_to_zero (double now, const char *variable, const char *resource);
void __TRACE_surf_update_action_state_resource (double now, double delta, const char *type, const char *name, double value);
void __TRACE_surf_set_resource_variable (double date, const char *variable, const char *resource, double value);
-void TRACE_surf_update_action_state (void *surf_action, smx_action_t smx_action, double value, const char *stateValue, double now, double delta);
-void TRACE_surf_update_action_state_net_resource (const char *name, smx_action_t smx_action, double value, double now, double delta);
-void TRACE_surf_update_action_state_cpu_resource (const char *name, smx_action_t smx_action, double value, double now, double delta);
-void TRACE_surf_net_link_new (char *name, double bw, double lat);
-void TRACE_surf_cpu_new (char *name, double power);
-void TRACE_surf_cpu_set_power (double date, char *resource, double power);
+void TRACE_surf_host_declaration (char *name, double power);
+void TRACE_surf_host_set_power (double date, char *resource, double power);
+void TRACE_surf_host_set_utilization (const char *name, smx_action_t smx_action, double value, double now, double delta);
+void TRACE_surf_link_declaration (char *name, double bw, double lat);
void TRACE_surf_link_set_bandwidth (double date, char *resource, double bandwidth);
void TRACE_surf_link_set_latency (double date, char *resource, double latency);
+void TRACE_surf_link_set_utilization (const char *name, smx_action_t smx_action, double value, double now, double delta);
void TRACE_surf_routing_full_parse_end (char *link_name, int src, int dst);
void TRACE_surf_missing_link (void);
void TRACE_surf_define_host_id (const char *name, int host_id);
+void TRACE_msg_clean (void);
+void TRACE_surf_vivaldi_parse_host (char *host, double x, double y, double h);
+
//for tracing gtnets
void TRACE_surf_gtnets_communicate (void *action, int src, int dst);
int TRACE_surf_gtnets_get_src (void *action);