A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[trace] fix comment
[simgrid.git]
/
src
/
instr
/
instr_private.h
diff --git
a/src/instr/instr_private.h
b/src/instr/instr_private.h
index
2125632
..
18501d0
100644
(file)
--- a/
src/instr/instr_private.h
+++ b/
src/instr/instr_private.h
@@
-63,6
+63,7
@@
typedef enum {
typedef struct s_container *container_t;
typedef struct s_container {
typedef struct s_container *container_t;
typedef struct s_container {
+ network_element_t net_elm;
char *name; /* Unique name of this container */
char *id; /* Unique id of this container */
type_t type; /* Type of this container */
char *name; /* Unique name of this container */
char *id; /* Unique id of this container */
type_t type; /* Type of this container */
@@
-73,6
+74,9
@@
typedef struct s_container {
}s_container_t;
extern xbt_dict_t created_categories;
}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 */
extern double TRACE_last_timestamp_to_dump;
/* from paje.c */
@@
-99,7
+103,7
@@
void new_pajeEndLink (double timestamp, container_t container, type_t type, cont
void new_pajeNewEvent (double timestamp, container_t container, type_t type, val_t value);
/* declaration of instrumentation functions from msg_task_instr.c */
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_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);
@@
-131,8
+135,7
@@
void TRACE_surf_link_set_latency(double date, const char *resource, double laten
void TRACE_surf_action(surf_action_t surf_action, const char *category);
//for tracing gtnets
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);
/* from smpi_instr.c */
void TRACE_internal_smpi_set_category (const char *category);
@@
-170,32
+173,21
@@
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_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,
/* 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);
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);
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);
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.c */
extern xbt_dict_t trivaNodeTypes;
extern xbt_dict_t trivaEdgeTypes;