X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b16f3d6a14798bcac4e8203cc40975c16cf85f5a..86824bd5375af44e319be08931ab02580c197122:/src/instr/private.h

diff --git a/src/instr/private.h b/src/instr/private.h
index eea811fefc..c754646dea 100644
--- a/src/instr/private.h
+++ b/src/instr/private.h
@@ -34,20 +34,11 @@ void pajeDefineStateType(const char *alias, const char *containerType, const cha
 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 pajeCreateContainerWithPower (double time, const char *alias, const char *type, const char *container, const char *name, double power);
-void pajeCreateContainerWithBandwidthLatency (double time, const char *alias, const char *type, const char *container, const char *name, double bw, double lat);
-void pajeCreateContainerWithBandwidthLatencySrcDst (double time, const char *alias, const char *type, const char *container, const char *name, double bw, double lat, const char *src, const char *dst);
 void pajeDestroyContainer (double time, const char *type, const char *container);
 void pajeSetState (double time, const char *entityType, const char *container, const char *value);
-void pajeSetStateWithPowerUsed (double time, const char *entityType, const char *container, const char *value, double powerUsed);
-void pajeSetStateWithHost (double time, const char *entityType, const char *container, const char *value, const char *host);
 void pajePushState (double time, const char *entityType, const char *container, const char *value);
-void pajePushStateWithHost (double time, const char *entityType, const char *container, const char *value, const char *host);
-void pajePushStateWithPowerUsed (double time, const char *entityType, const char *container, const char *value, double powerUsed);
-void pajePushStateWithBandwidthUsed (double time, const char *entityType, const char *container, const char *value, double bwUsed);
 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 pajeStartLinkWithBandwidthLatency (double time, const char *entityType, const char *container, const char *value, const char *sourceContainer, const char *key, double bw, double lat);
 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);
@@ -109,20 +100,17 @@ void TRACE_smx_action_communicate (smx_action_t act, smx_process_t proc);
 void TRACE_smx_action_destroy (smx_action_t act);
 
 /* from surf.c */
-void __TRACE_surf_init (void);
-void __TRACE_surf_finalize (void);
-void __TRACE_surf_check_variable_set_to_zero (double now, const char *variable, const char *resource);
-void __TRACE_surf_set_resource_variable (double date, const char *variable, const char *resource, double value);
+void TRACE_surf_init (void);
+void TRACE_surf_finalize (void);
 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_define_id (const char *name, int host_id);
 void TRACE_surf_host_vivaldi_parse (char *host, double x, double y, double h);
-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_save_endpoints (char *link_name, int src, int dst);
-void TRACE_surf_link_missing (void);
-void TRACE_msg_clean (void);
+void TRACE_surf_link_declaration (void *link, char *name, double bw, double lat);
+void TRACE_surf_link_set_bandwidth (double date, void *link, double bandwidth);
+void TRACE_surf_link_set_latency (double date, void *link, double latency);
+void TRACE_surf_save_onelink (void);
+int TRACE_surf_link_is_traced (void *link);
 
 //for tracing gtnets
 void TRACE_surf_gtnets_communicate (void *action, int src, int dst);
@@ -156,7 +144,7 @@ void TRACE_global_init(int *argc, char **argv);
 
 /* from resource_utilization.c */
 void TRACE_surf_host_set_utilization (const char *name, smx_action_t smx_action, double value, double now, double delta);
-void TRACE_surf_link_set_utilization (const char *name, smx_action_t smx_action, double value, double now, double delta);
+void TRACE_surf_link_set_utilization (void *link, smx_action_t smx_action, 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);