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
Introduce sg_storage_size_t type
[simgrid.git]
/
src
/
surf
/
cpu_ti.c
diff --git
a/src/surf/cpu_ti.c
b/src/surf/cpu_ti.c
index
29cbf54
..
9a61031
100644
(file)
--- a/
src/surf/cpu_ti.c
+++ b/
src/surf/cpu_ti.c
@@
-1,5
+1,5
@@
-/* Copyright (c) 2009
, 2010
. The SimGrid Team.
+/* Copyright (c) 2009
-2013
. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
@@
-111,7
+111,7
@@
static surf_cpu_ti_tgmr_t cpu_ti_parse_trace(tmgr_trace_t power_trace,
if (!power_trace) {
trace->type = TRACE_FIXED;
trace->value = value;
if (!power_trace) {
trace->type = TRACE_FIXED;
trace->value = value;
- XBT_DEBUG("No availabily trace. Constant value = %lf", value);
+ XBT_DEBUG("No availabil
it
y trace. Constant value = %lf", value);
return trace;
}
return trace;
}
@@
-142,7
+142,8
@@
static surf_cpu_ti_tgmr_t cpu_ti_parse_trace(tmgr_trace_t power_trace,
}
}
-static void* cpu_ti_create_resource(const char *name, double power_peak,
+static void* cpu_ti_create_resource(const char *name, xbt_dynar_t power_peak,
+ int pstate,
double power_scale,
tmgr_trace_t power_trace,
int core,
double power_scale,
tmgr_trace_t power_trace,
int core,
@@
-155,15
+156,21
@@
static void* cpu_ti_create_resource(const char *name, double power_peak,
cpu_ti_t cpu = NULL;
s_surf_action_cpu_ti_t ti_action;
xbt_assert(core==1,"Multi-core not handled with this model yet");
cpu_ti_t cpu = NULL;
s_surf_action_cpu_ti_t ti_action;
xbt_assert(core==1,"Multi-core not handled with this model yet");
- xbt_assert(!surf_cpu_resource_
by_name(name
),
+ xbt_assert(!surf_cpu_resource_
priv(surf_cpu_resource_by_name(name)
),
"Host '%s' declared several times in the platform file",
name);
xbt_assert(core==1,"Multi-core not handled with this model yet");
cpu = (cpu_ti_t) surf_resource_new(sizeof(s_cpu_ti_t),
"Host '%s' declared several times in the platform file",
name);
xbt_assert(core==1,"Multi-core not handled with this model yet");
cpu = (cpu_ti_t) surf_resource_new(sizeof(s_cpu_ti_t),
- surf_cpu_model, name,cpu_properties);
+ surf_cpu_model, name,cpu_properties
, NULL
);
cpu->action_set =
xbt_swag_new(xbt_swag_offset(ti_action, cpu_list_hookup));
cpu->action_set =
xbt_swag_new(xbt_swag_offset(ti_action, cpu_list_hookup));
- cpu->power_peak = power_peak;
+
+ xbt_dynar_get_cpy(power_peak, 0, &cpu->power_peak);
+ xbt_dynar_free(&power_peak); /* kill memory leak */
+ //cpu->power_peak = power_peak;
+ cpu->pstate = pstate;
+ XBT_DEBUG("CPU create: peak=%lf, pstate=%d",cpu->power_peak, cpu->pstate);
+
xbt_assert(cpu->power_peak > 0, "Power has to be >0");
XBT_DEBUG("power scale %lf", power_scale);
cpu->power_scale = power_scale;
xbt_assert(cpu->power_peak > 0, "Power has to be >0");
XBT_DEBUG("power scale %lf", power_scale);
cpu->power_scale = power_scale;
@@
-185,7
+192,7
@@
static void* cpu_ti_create_resource(const char *name, double power_peak,
}
xbt_lib_set(host_lib, name, SURF_CPU_LEVEL, cpu);
}
xbt_lib_set(host_lib, name, SURF_CPU_LEVEL, cpu);
- return
cpu
;
+ return
xbt_lib_get_elm_or_null(host_lib, name)
;
}
}
@@
-193,6
+200,7
@@
static void parse_cpu_ti_init(sg_platf_host_cbarg_t host)
{
cpu_ti_create_resource(host->id,
host->power_peak,
{
cpu_ti_create_resource(host->id,
host->power_peak,
+ host->pstate,
host->power_scale,
host->power_trace,
host->core_amount,
host->power_scale,
host->power_trace,
host->core_amount,
@@
-216,7
+224,7
@@
static void add_traces_cpu_ti(void)
/* 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);
/* 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);
- cpu_ti_t cpu = surf_cpu_resource_
by_name(elm
);
+ cpu_ti_t cpu = surf_cpu_resource_
priv(surf_cpu_resource_by_name(elm)
);
xbt_assert(cpu, "Host %s undefined", elm);
xbt_assert(trace, "Trace %s undefined", trace_name);
xbt_assert(cpu, "Host %s undefined", elm);
xbt_assert(trace, "Trace %s undefined", trace_name);
@@
-232,7
+240,7
@@
static void add_traces_cpu_ti(void)
xbt_dict_foreach(trace_connect_list_power, cursor, trace_name, elm) {
tmgr_trace_t trace = xbt_dict_get_or_null(traces_set_list, trace_name);
xbt_dict_foreach(trace_connect_list_power, cursor, trace_name, elm) {
tmgr_trace_t trace = xbt_dict_get_or_null(traces_set_list, trace_name);
- cpu_ti_t cpu = surf_cpu_resource_
by_name(elm
);
+ cpu_ti_t cpu = surf_cpu_resource_
priv(surf_cpu_resource_by_name(elm)
);
xbt_assert(cpu, "Host %s undefined", elm);
xbt_assert(trace, "Trace %s undefined", trace_name);
xbt_assert(cpu, "Host %s undefined", elm);
xbt_assert(trace, "Trace %s undefined", trace_name);
@@
-277,11
+285,11
@@
static int cpu_ti_action_unref(surf_action_t action)
if (!action->refcount) {
xbt_swag_remove(action, action->state_set);
/* remove from action_set */
if (!action->refcount) {
xbt_swag_remove(action, action->state_set);
/* remove from action_set */
- xbt_swag_remove(action,
ACTION_GET_CPU(action
)->action_set);
+ xbt_swag_remove(action,
((cpu_ti_t)surf_cpu_resource_priv(ACTION_GET_CPU(action))
)->action_set);
/* remove from heap */
xbt_heap_remove(cpu_ti_action_heap,
((surf_action_cpu_ti_t) action)->index_heap);
/* remove from heap */
xbt_heap_remove(cpu_ti_action_heap,
((surf_action_cpu_ti_t) action)->index_heap);
- xbt_swag_insert(
ACTION_GET_CPU(action
), cpu_ti_modified_cpu);
+ xbt_swag_insert(
((cpu_ti_t)surf_cpu_resource_priv(ACTION_GET_CPU(action))
), cpu_ti_modified_cpu);
surf_action_free(&action);
return 1;
}
surf_action_free(&action);
return 1;
}
@@
-293,7
+301,7
@@
static void cpu_ti_action_cancel(surf_action_t action)
surf_action_state_set(action, SURF_ACTION_FAILED);
xbt_heap_remove(cpu_ti_action_heap,
((surf_action_cpu_ti_t) action)->index_heap);
surf_action_state_set(action, SURF_ACTION_FAILED);
xbt_heap_remove(cpu_ti_action_heap,
((surf_action_cpu_ti_t) action)->index_heap);
- xbt_swag_insert(
ACTION_GET_CPU(action
), cpu_ti_modified_cpu);
+ xbt_swag_insert(
surf_cpu_resource_priv(ACTION_GET_CPU(action)
), cpu_ti_modified_cpu);
return;
}
return;
}
@@
-301,7
+309,7
@@
static void cpu_ti_action_state_set(surf_action_t action,
e_surf_action_state_t state)
{
surf_action_state_set(action, state);
e_surf_action_state_t state)
{
surf_action_state_set(action, state);
- xbt_swag_insert(
ACTION_GET_CPU(action
), cpu_ti_modified_cpu);
+ xbt_swag_insert(
surf_cpu_resource_priv(ACTION_GET_CPU(action)
), cpu_ti_modified_cpu);
return;
}
return;
}
@@
-481,8
+489,8
@@
static void cpu_ti_update_actions_state(double now, double delta)
/* set the remains to 0 due to precision problems when updating the remaining amount */
GENERIC_ACTION(action).remains = 0;
cpu_ti_action_state_set((surf_action_t) action, SURF_ACTION_DONE);
/* set the remains to 0 due to precision problems when updating the remaining amount */
GENERIC_ACTION(action).remains = 0;
cpu_ti_action_state_set((surf_action_t) action, SURF_ACTION_DONE);
- /* update remaining amout of all actions */
- cpu_ti_update_remaining_amount(
action->cpu
, surf_get_clock());
+ /* update remaining amou
n
t of all actions */
+ cpu_ti_update_remaining_amount(
surf_cpu_resource_priv(action->cpu)
, surf_get_clock());
}
#undef GENERIC_ACTION
}
}
#undef GENERIC_ACTION
}
@@
-523,9
+531,11
@@
static void cpu_ti_update_resource_state(void *id,
cpu->power_event = NULL;
} else if (event_type == cpu->state_event) {
cpu->power_event = NULL;
} else if (event_type == cpu->state_event) {
- if (value > 0)
+ if (value > 0) {
+ if(cpu->state_current == SURF_RESOURCE_OFF)
+ xbt_dynar_push_as(host_that_restart, char*, (cpu->generic_resource.name));
cpu->state_current = SURF_RESOURCE_ON;
cpu->state_current = SURF_RESOURCE_ON;
- else {
+
}
else {
cpu->state_current = SURF_RESOURCE_OFF;
/* put all action running on cpu to failed */
cpu->state_current = SURF_RESOURCE_OFF;
/* put all action running on cpu to failed */
@@
-561,7
+571,7
@@
static void cpu_ti_update_resource_state(void *id,
static surf_action_t cpu_ti_execute(void *cpu, double size)
{
surf_action_cpu_ti_t action = NULL;
static surf_action_t cpu_ti_execute(void *cpu, double size)
{
surf_action_cpu_ti_t action = NULL;
- cpu_ti_t CPU =
cpu
;
+ cpu_ti_t CPU =
surf_cpu_resource_priv(cpu)
;
XBT_IN("(%s,%g)", surf_resource_name(CPU), size);
action =
XBT_IN("(%s,%g)", surf_resource_name(CPU), size);
action =
@@
-593,7
+603,7
@@
static surf_action_t cpu_ti_action_sleep(void *cpu, double duration)
if (duration > 0)
duration = MAX(duration, MAXMIN_PRECISION);
if (duration > 0)
duration = MAX(duration, MAXMIN_PRECISION);
- XBT_IN("(%s,%g)", surf_resource_name(
cpu
), duration);
+ XBT_IN("(%s,%g)", surf_resource_name(
surf_cpu_resource_priv(cpu)
), duration);
action = (surf_action_cpu_ti_t) cpu_ti_execute(cpu, 1.0);
action->generic_action.max_duration = duration;
action->suspended = 2;
action = (surf_action_cpu_ti_t) cpu_ti_execute(cpu, 1.0);
action->generic_action.max_duration = duration;
action->suspended = 2;
@@
-616,7
+626,7
@@
static void cpu_ti_action_suspend(surf_action_t action)
((surf_action_cpu_ti_t) action)->suspended = 1;
xbt_heap_remove(cpu_ti_action_heap,
((surf_action_cpu_ti_t) action)->index_heap);
((surf_action_cpu_ti_t) action)->suspended = 1;
xbt_heap_remove(cpu_ti_action_heap,
((surf_action_cpu_ti_t) action)->index_heap);
- xbt_swag_insert(
ACTION_GET_CPU(action
), cpu_ti_modified_cpu);
+ xbt_swag_insert(
surf_cpu_resource_priv(ACTION_GET_CPU(action)
), cpu_ti_modified_cpu);
}
XBT_OUT();
}
}
XBT_OUT();
}
@@
-626,7
+636,7
@@
static void cpu_ti_action_resume(surf_action_t action)
XBT_IN("(%p)", action);
if (((surf_action_cpu_ti_t) action)->suspended != 2) {
((surf_action_cpu_ti_t) action)->suspended = 0;
XBT_IN("(%p)", action);
if (((surf_action_cpu_ti_t) action)->suspended != 2) {
((surf_action_cpu_ti_t) action)->suspended = 0;
- xbt_swag_insert(
ACTION_GET_CPU(action
), cpu_ti_modified_cpu);
+ xbt_swag_insert(
surf_cpu_resource_priv(ACTION_GET_CPU(action)
), cpu_ti_modified_cpu);
}
XBT_OUT();
}
}
XBT_OUT();
}
@@
-671,7
+681,7
@@
static void cpu_ti_action_set_priority(surf_action_t action,
{
XBT_IN("(%p,%g)", action, priority);
action->priority = priority;
{
XBT_IN("(%p,%g)", action, priority);
action->priority = priority;
- xbt_swag_insert(
ACTION_GET_CPU(action
), cpu_ti_modified_cpu);
+ xbt_swag_insert(
surf_cpu_resource_priv(ACTION_GET_CPU(action)
), cpu_ti_modified_cpu);
XBT_OUT();
}
XBT_OUT();
}
@@
-687,12
+697,12
@@
static double cpu_ti_action_get_remains(surf_action_t action)
static e_surf_resource_state_t cpu_ti_get_state(void *cpu)
{
static e_surf_resource_state_t cpu_ti_get_state(void *cpu)
{
- return ((cpu_ti_t)
cpu
)->state_current;
+ return ((cpu_ti_t)
surf_cpu_resource_priv(cpu)
)->state_current;
}
static double cpu_ti_get_speed(void *cpu, double load)
{
}
static double cpu_ti_get_speed(void *cpu, double load)
{
- return load * ((
(cpu_ti_t) cpu)->power_peak)
;
+ return load * ((
cpu_ti_t)surf_cpu_resource_priv(cpu))->power_peak
;
}
/**
}
/**
@@
-720,7
+730,7
@@
static double surf_cpu_ti_get_power_scale(surf_cpu_ti_tgmr_t trace,
static double cpu_ti_get_available_speed(void *cpu)
{
static double cpu_ti_get_available_speed(void *cpu)
{
- cpu_ti_t CPU =
cpu
;
+ cpu_ti_t CPU =
surf_cpu_resource_priv(cpu)
;
CPU->power_scale =
surf_cpu_ti_get_power_scale(CPU->avail_trace, surf_get_clock());
/* number between 0 and 1 */
CPU->power_scale =
surf_cpu_ti_get_power_scale(CPU->avail_trace, surf_get_clock());
/* number between 0 and 1 */
@@
-793,7
+803,6
@@
static void surf_cpu_ti_model_init_internal(void)
surf_cpu_model->extension.cpu.get_speed = cpu_ti_get_speed;
surf_cpu_model->extension.cpu.get_available_speed =
cpu_ti_get_available_speed;
surf_cpu_model->extension.cpu.get_speed = cpu_ti_get_speed;
surf_cpu_model->extension.cpu.get_available_speed =
cpu_ti_get_available_speed;
- surf_cpu_model->extension.cpu.create_resource = cpu_ti_create_resource;
surf_cpu_model->extension.cpu.add_traces = add_traces_cpu_ti;
cpu_ti_action_heap = xbt_heap_new(8, NULL);
surf_cpu_model->extension.cpu.add_traces = add_traces_cpu_ti;
cpu_ti_action_heap = xbt_heap_new(8, NULL);