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] only CPU models control the last timestamp to be dumped to trace file
[simgrid.git]
/
src
/
surf
/
surfxml_parse.c
diff --git
a/src/surf/surfxml_parse.c
b/src/surf/surfxml_parse.c
index
d2153b1
..
d9280a4
100644
(file)
--- a/
src/surf/surfxml_parse.c
+++ b/
src/surf/surfxml_parse.c
@@
-76,6
+76,8
@@
xbt_dynar_t STag_surfxml_prop_cb_list = NULL;
xbt_dynar_t ETag_surfxml_prop_cb_list = NULL;
xbt_dynar_t STag_surfxml_cluster_cb_list = NULL;
xbt_dynar_t ETag_surfxml_cluster_cb_list = NULL;
xbt_dynar_t ETag_surfxml_prop_cb_list = NULL;
xbt_dynar_t STag_surfxml_cluster_cb_list = NULL;
xbt_dynar_t ETag_surfxml_cluster_cb_list = NULL;
+xbt_dynar_t STag_surfxml_peer_cb_list = NULL;
+xbt_dynar_t ETag_surfxml_peer_cb_list = NULL;
xbt_dynar_t STag_surfxml_trace_cb_list = NULL;
xbt_dynar_t ETag_surfxml_trace_cb_list = NULL;
xbt_dynar_t STag_surfxml_trace_connect_cb_list = NULL;
xbt_dynar_t STag_surfxml_trace_cb_list = NULL;
xbt_dynar_t ETag_surfxml_trace_cb_list = NULL;
xbt_dynar_t STag_surfxml_trace_connect_cb_list = NULL;
@@
-144,6
+146,8
@@
void surf_parse_free_callbacks(void)
xbt_dynar_free(&ETag_surfxml_bypassRoute_cb_list);
xbt_dynar_free(&STag_surfxml_cluster_cb_list);
xbt_dynar_free(&ETag_surfxml_cluster_cb_list);
xbt_dynar_free(&ETag_surfxml_bypassRoute_cb_list);
xbt_dynar_free(&STag_surfxml_cluster_cb_list);
xbt_dynar_free(&ETag_surfxml_cluster_cb_list);
+ xbt_dynar_free(&STag_surfxml_peer_cb_list);
+ xbt_dynar_free(&ETag_surfxml_peer_cb_list);
xbt_dynar_free(&STag_surfxml_config_cb_list);
xbt_dynar_free(&ETag_surfxml_config_cb_list);
}
xbt_dynar_free(&STag_surfxml_config_cb_list);
xbt_dynar_free(&ETag_surfxml_config_cb_list);
}
@@
-199,6
+203,10
@@
void surf_parse_reset_parser(void)
xbt_dynar_new(sizeof(void_f_void_t), NULL);
ETag_surfxml_cluster_cb_list =
xbt_dynar_new(sizeof(void_f_void_t), NULL);
xbt_dynar_new(sizeof(void_f_void_t), NULL);
ETag_surfxml_cluster_cb_list =
xbt_dynar_new(sizeof(void_f_void_t), NULL);
+ STag_surfxml_peer_cb_list =
+ xbt_dynar_new(sizeof(void_f_void_t), NULL);
+ ETag_surfxml_peer_cb_list =
+ xbt_dynar_new(sizeof(void_f_void_t), NULL);
STag_surfxml_config_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL);
ETag_surfxml_config_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL);
}
STag_surfxml_config_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL);
ETag_surfxml_config_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL);
}
@@
-270,6
+278,8
@@
parse_method(S, bypassRoute);
parse_method(E, bypassRoute);
parse_method(S, cluster);
parse_method(E, cluster);
parse_method(E, bypassRoute);
parse_method(S, cluster);
parse_method(E, cluster);
+parse_method(S, peer);
+parse_method(E, peer);
parse_method(S, config);
parse_method(E, config);
parse_method(S, config);
parse_method(E, config);
@@
-430,12
+440,12
@@
void parse_properties(void)
static double trace_periodicity = -1.0;
static char *trace_file = NULL;
static double trace_periodicity = -1.0;
static char *trace_file = NULL;
-static char *trace_id;
+static char *trace_id
= NULL
;
static void parse_Stag_trace(void)
{
static void parse_Stag_trace(void)
{
- trace_id = strdup(A_surfxml_trace_id);
- trace_file = strdup(A_surfxml_trace_file);
+ trace_id =
xbt_
strdup(A_surfxml_trace_id);
+ trace_file =
xbt_
strdup(A_surfxml_trace_file);
surf_parse_get_double(&trace_periodicity, A_surfxml_trace_periodicity);
}
surf_parse_get_double(&trace_periodicity, A_surfxml_trace_periodicity);
}
@@
-453,6
+463,10
@@
static void parse_Etag_trace(void)
trace_periodicity);
}
xbt_dict_set(traces_set_list, trace_id, (void *) trace, NULL);
trace_periodicity);
}
xbt_dict_set(traces_set_list, trace_id, (void *) trace, NULL);
+ xbt_free(trace_file);
+ trace_file = NULL;
+ xbt_free(trace_id);
+ trace_id = NULL;
}
static void parse_Stag_trace_connect(void)
}
static void parse_Stag_trace_connect(void)
@@
-550,7
+564,7
@@
static void add_randomness(void)
*/
void surf_host_create_resource(char *name, double power_peak,
double power_scale,
*/
void surf_host_create_resource(char *name, double power_peak,
double power_scale,
- tmgr_trace_t power_trace,
+ tmgr_trace_t power_trace,
int core,
e_surf_resource_state_t state_initial,
tmgr_trace_t state_trace,
xbt_dict_t cpu_properties)
e_surf_resource_state_t state_initial,
tmgr_trace_t state_trace,
xbt_dict_t cpu_properties)
@@
-558,6
+572,7
@@
void surf_host_create_resource(char *name, double power_peak,
return surf_cpu_model->extension.cpu.create_resource(name, power_peak,
power_scale,
power_trace,
return surf_cpu_model->extension.cpu.create_resource(name, power_peak,
power_scale,
power_trace,
+ core,
state_initial,
state_trace,
cpu_properties);
state_initial,
state_trace,
cpu_properties);