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
extend lua console to simdag
[simgrid.git]
/
src
/
surf
/
cpu_im.c
diff --git
a/src/surf/cpu_im.c
b/src/surf/cpu_im.c
index
c170565
..
66faee8
100644
(file)
--- a/
src/surf/cpu_im.c
+++ b/
src/surf/cpu_im.c
@@
-120,14
+120,11
@@
static void cpu_im_add_traces_cpu(void)
{
xbt_dict_cursor_t cursor = NULL;
char *trace_name, *elm;
-
static int called = 0;
-
if (called)
return;
called = 1;
-
/* connect all traces relative to hosts */
xbt_dict_foreach(trace_connect_list_host_avail, cursor, trace_name, elm) {
tmgr_trace_t trace = xbt_dict_get_or_null(traces_set_list, trace_name);
@@
-152,6
+149,7
@@
static void cpu_im_add_traces_cpu(void)
static void cpu_im_define_callbacks(const char *file)
{
+
surf_parse_reset_parser();
surfxml_add_callback(STag_surfxml_host_cb_list, parse_cpu_im_init);
surfxml_add_callback(ETag_surfxml_platform_cb_list, &cpu_im_add_traces_cpu);
@@
-324,7
+322,6
@@
static void cpu_im_update_resource_state(void *id,
double value, double date)
{
cpu_Cas01_im_t cpu = id;
-
if (event_type == cpu->power_event) {
cpu->power_scale = value;
lmm_update_constraint_bound(cpu_im_maxmin_system, cpu->constraint,
@@
-435,6
+432,7
@@
static void cpu_im_action_suspend(surf_action_t action)
static void cpu_im_action_resume(surf_action_t action)
{
+
XBT_IN1("(%p)", action);
if (((surf_action_lmm_t) action)->suspended != 2) {
lmm_update_variable_weight(cpu_im_maxmin_system,
@@
-502,6
+500,16
@@
static void cpu_im_action_update_index_heap(void *action, int i)
{
((surf_action_cpu_Cas01_im_t) action)->index_heap = i;
}
+static void cpu_im_create_resource(char *name, double power_peak,
+ double power_scale,
+ tmgr_trace_t power_trace,
+ e_surf_resource_state_t state_initial,
+ tmgr_trace_t state_trace,
+ xbt_dict_t cpu_properties)
+{
+ cpu_im_new(name,power_peak,power_scale,power_trace,
+ state_initial,state_trace,cpu_properties);
+}
static void cpu_im_finalize(void)
{
@@
-561,6
+569,8
@@
static void surf_cpu_im_model_init_internal(void)
surf_cpu_model->extension.cpu.get_state = cpu_im_get_state;
surf_cpu_model->extension.cpu.get_speed = cpu_im_get_speed;
surf_cpu_model->extension.cpu.get_available_speed = cpu_im_get_available_speed;
+ surf_cpu_model->extension.cpu.create_resource = cpu_im_create_resource;
+ surf_cpu_model->extension.cpu.add_traces = cpu_im_add_traces_cpu;
if (!cpu_im_maxmin_system) {
sg_maxmin_selective_update = 1;