SimDag instrumentation for categorized resource utilization

[simgrid.git] / src / instr / private.h

diff --git a/src/instr/private.h b/src/instr/private.h
index 97bb8c9..d81839d 100644 (file)
--- a/src/instr/private.h
+++ b/src/instr/private.h
@@ -23,6 +23,7 @@ extern int tracing_active; /* declared in paje.c */
 
 #include "instr/instr.h"
 #include "msg/msg.h"
+#include "simdag/private.h"
 #include "simix/private.h"
 
 /* from paje.c */
@@ -97,11 +98,11 @@ void TRACE_smx_action_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.c */
+/* from surf_instr.c */
 void TRACE_surf_alloc (void);
 void TRACE_surf_release (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_declaration (const char *name, double power);
+void TRACE_surf_host_set_power (double date, const 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 (void *link, char *name, double bw, double lat);
@@ -142,14 +143,18 @@ char *TRACE_get_platform_method (void);
 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 (void *link, smx_action_t smx_action, double value, double now, double delta);
+void TRACE_surf_host_set_utilization (const char *name, smx_action_t smx_action, surf_action_t surf_action, double value, double now, double delta);
+void TRACE_surf_link_set_utilization (void *link, smx_action_t smx_action, surf_action_t surf_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);
 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);
+
 #endif
 
 #endif /* PRIVATE_H_ */