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
error during modification
[simgrid.git]
/
src
/
surf
/
cpu_ti.c
diff --git
a/src/surf/cpu_ti.c
b/src/surf/cpu_ti.c
index
38834c5
..
b14ceec
100644
(file)
--- a/
src/surf/cpu_ti.c
+++ b/
src/surf/cpu_ti.c
@@
-1,13
+1,13
@@
-/* 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
* under the terms of the license (GNU LGPL) which comes with this package. */
/*
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
/*
-
commit: e2d6799c4182f00443b3013aadb1c2412372460f
-
This commit retrieves the old implementation of CPU_TI with multi-levels.
+ commit: e2d6799c4182f00443b3013aadb1c2412372460f
+ This commit retrieves the old implementation of CPU_TI with multi-levels.
*/
#include "surf_private.h"
*/
#include "surf_private.h"
@@
-50,10
+50,8
@@
static int surf_cpu_ti_binary_search(double *array, double a, int low,
static void surf_cpu_ti_free_trace(surf_cpu_ti_trace_t trace)
{
static void surf_cpu_ti_free_trace(surf_cpu_ti_trace_t trace)
{
- if (trace->time_points)
- xbt_free(trace->time_points);
- if (trace->integral)
- xbt_free(trace->integral);
+ xbt_free(trace->time_points);
+ xbt_free(trace->integral);
xbt_free(trace);
}
xbt_free(trace);
}
@@
-75,12
+73,12
@@
static surf_cpu_ti_trace_t surf_cpu_ti_trace_new(tmgr_trace_t power_trace)
trace = xbt_new0(s_surf_cpu_ti_trace_t, 1);
trace->time_points =
xbt_malloc0(sizeof(double) *
trace = xbt_new0(s_surf_cpu_ti_trace_t, 1);
trace->time_points =
xbt_malloc0(sizeof(double) *
- (xbt_dynar_length(power_trace->event_list) + 1));
+ (xbt_dynar_length(power_trace->
s_list.
event_list) + 1));
trace->integral =
xbt_malloc0(sizeof(double) *
trace->integral =
xbt_malloc0(sizeof(double) *
- (xbt_dynar_length(power_trace->event_list) + 1));
- trace->nb_points = xbt_dynar_length(power_trace->event_list);
- xbt_dynar_foreach(power_trace->event_list, cpt, val) {
+ (xbt_dynar_length(power_trace->
s_list.
event_list) + 1));
+ trace->nb_points = xbt_dynar_length(power_trace->
s_list.
event_list);
+ xbt_dynar_foreach(power_trace->
s_list.
event_list, cpt, val) {
trace->time_points[i] = time;
trace->integral[i] = integral;
integral += val.delta * val.value;
trace->time_points[i] = time;
trace->integral[i] = integral;
integral += val.delta * val.value;
@@
-95,10
+93,10
@@
static surf_cpu_ti_trace_t surf_cpu_ti_trace_new(tmgr_trace_t power_trace)
/**
* \brief Creates a new integration trace from a tmgr_trace_t
*
/**
* \brief Creates a new integration trace from a tmgr_trace_t
*
-* \param
power_trace
CPU availability trace
-* \param
value
Percentage of CPU power available (useful to fixed tracing)
-* \param
spacing
Initial spacing
-* \return
Integration trace structure
+* \param
power_trace
CPU availability trace
+* \param
value
Percentage of CPU power available (useful to fixed tracing)
+* \param
spacing
Initial spacing
+* \return Integration trace structure
*/
static surf_cpu_ti_tgmr_t cpu_ti_parse_trace(tmgr_trace_t power_trace,
double value)
*/
static surf_cpu_ti_tgmr_t cpu_ti_parse_trace(tmgr_trace_t power_trace,
double value)
@@
-113,13
+111,13
@@
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 availabil
y trace. Constant value = %l
f", value);
+ XBT_DEBUG("No availabil
ity trace. Constant value = %
f", value);
return trace;
}
/* only one point available, fixed trace */
return trace;
}
/* only one point available, fixed trace */
- if (xbt_dynar_length(power_trace->event_list) == 1) {
- xbt_dynar_get_cpy(power_trace->event_list, 0, &val);
+ if (xbt_dynar_length(power_trace->
s_list.
event_list) == 1) {
+ xbt_dynar_get_cpy(power_trace->
s_list.
event_list, 0, &val);
trace->type = TRACE_FIXED;
trace->value = val.value;
return trace;
trace->type = TRACE_FIXED;
trace->value = val.value;
return trace;
@@
-129,7
+127,7
@@
static surf_cpu_ti_tgmr_t cpu_ti_parse_trace(tmgr_trace_t power_trace,
trace->power_trace = power_trace;
/* count the total time of trace file */
trace->power_trace = power_trace;
/* count the total time of trace file */
- xbt_dynar_foreach(power_trace->event_list, cpt, val) {
+ xbt_dynar_foreach(power_trace->
s_list.
event_list, cpt, val) {
total_time += val.delta;
}
trace->trace = surf_cpu_ti_trace_new(power_trace);
total_time += val.delta;
}
trace->trace = surf_cpu_ti_trace_new(power_trace);
@@
-137,14
+135,15
@@
static surf_cpu_ti_tgmr_t cpu_ti_parse_trace(tmgr_trace_t power_trace,
trace->total =
surf_cpu_ti_integrate_trace_simple(trace->trace, 0, total_time);
trace->total =
surf_cpu_ti_integrate_trace_simple(trace->trace, 0, total_time);
- XBT_DEBUG("Total integral %
lf, last_time %l
f ",
+ XBT_DEBUG("Total integral %
f, last_time %
f ",
trace->total, trace->last_time);
return trace;
}
trace->total, trace->last_time);
return 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,
@@
-157,27
+156,33
@@
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=%f, pstate=%d",cpu->power_peak, cpu->pstate);
+
xbt_assert(cpu->power_peak > 0, "Power has to be >0");
xbt_assert(cpu->power_peak > 0, "Power has to be >0");
- XBT_DEBUG("power scale %
l
f", power_scale);
+ XBT_DEBUG("power scale %f", power_scale);
cpu->power_scale = power_scale;
cpu->avail_trace = cpu_ti_parse_trace(power_trace, power_scale);
cpu->state_current = state_initial;
if (state_trace)
cpu->state_event =
tmgr_history_add_trace(history, state_trace, 0.0, 0, cpu);
cpu->power_scale = power_scale;
cpu->avail_trace = cpu_ti_parse_trace(power_trace, power_scale);
cpu->state_current = state_initial;
if (state_trace)
cpu->state_event =
tmgr_history_add_trace(history, state_trace, 0.0, 0, cpu);
- if (power_trace && xbt_dynar_length(power_trace->event_list) > 1) {
+ if (power_trace && xbt_dynar_length(power_trace->
s_list.
event_list) > 1) {
/* add a fake trace event if periodicity == 0 */
/* add a fake trace event if periodicity == 0 */
- xbt_dynar_get_cpy(power_trace->event_list,
- xbt_dynar_length(power_trace->event_list) - 1, &val);
+ xbt_dynar_get_cpy(power_trace->
s_list.
event_list,
+ xbt_dynar_length(power_trace->
s_list.
event_list) - 1, &val);
if (val.delta == 0) {
empty_trace = tmgr_empty_trace_new();
cpu->power_event =
if (val.delta == 0) {
empty_trace = tmgr_empty_trace_new();
cpu->power_event =
@@
-187,20
+192,21
@@
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)
;
}
static void parse_cpu_ti_init(sg_platf_host_cbarg_t host)
{
cpu_ti_create_resource(host->id,
}
static void parse_cpu_ti_init(sg_platf_host_cbarg_t host)
{
cpu_ti_create_resource(host->id,
- host->power_peak,
- host->power_scale,
- host->power_trace,
- host->core_amount,
- host->initial_state,
- host->state_trace,
- host->properties);
+ host->power_peak,
+ host->pstate,
+ host->power_scale,
+ host->power_trace,
+ host->core_amount,
+ host->initial_state,
+ host->state_trace,
+ host->properties);
}
}
@@
-218,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);
@@
-234,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);
@@
-246,10
+252,10
@@
static void add_traces_cpu_ti(void)
cpu->avail_trace = cpu_ti_parse_trace(trace, cpu->power_scale);
/* add a fake trace event if periodicity == 0 */
cpu->avail_trace = cpu_ti_parse_trace(trace, cpu->power_scale);
/* add a fake trace event if periodicity == 0 */
- if (trace && xbt_dynar_length(trace->event_list) > 1) {
+ if (trace && xbt_dynar_length(trace->
s_list.
event_list) > 1) {
s_tmgr_event_t val;
s_tmgr_event_t val;
- xbt_dynar_get_cpy(trace->event_list,
- xbt_dynar_length(trace->event_list) - 1, &val);
+ xbt_dynar_get_cpy(trace->
s_list.
event_list,
+ xbt_dynar_length(trace->
s_list.
event_list) - 1, &val);
if (val.delta == 0) {
tmgr_trace_t empty_trace;
empty_trace = tmgr_empty_trace_new();
if (val.delta == 0) {
tmgr_trace_t empty_trace;
empty_trace = tmgr_empty_trace_new();
@@
-279,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;
}
@@
-295,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;
}
@@
-303,19
+309,18
@@
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;
}
/**
* \brief Update the remaining amount of actions
*
return;
}
/**
* \brief Update the remaining amount of actions
*
-* \param
cpu
Cpu on which the actions are running
-* \param
now
Current time
+* \param
cpu
Cpu on which the actions are running
+* \param
now
Current time
*/
static void cpu_ti_update_remaining_amount(cpu_ti_t cpu, double now)
{
*/
static void cpu_ti_update_remaining_amount(cpu_ti_t cpu, double now)
{
-#define GENERIC_ACTION(action) action->generic_action
double area_total;
surf_action_cpu_ti_t action;
double area_total;
surf_action_cpu_ti_t action;
@@
-327,17
+332,18
@@
static void cpu_ti_update_remaining_amount(cpu_ti_t cpu, double now)
area_total =
surf_cpu_ti_integrate_trace(cpu->avail_trace, cpu->last_update,
now) * cpu->power_peak;
area_total =
surf_cpu_ti_integrate_trace(cpu->avail_trace, cpu->last_update,
now) * cpu->power_peak;
- XBT_DEBUG("Flops total: %
lf, Last update %l
f", area_total,
+ XBT_DEBUG("Flops total: %
f, Last update %
f", area_total,
cpu->last_update);
xbt_swag_foreach(action, cpu->action_set) {
cpu->last_update);
xbt_swag_foreach(action, cpu->action_set) {
+ surf_action_t generic = (surf_action_t)action;
/* action not running, skip it */
/* action not running, skip it */
- if (
GENERIC_ACTION(action).
state_set !=
+ if (
generic->
state_set !=
surf_cpu_model->states.running_action_set)
continue;
/* bogus priority, skip it */
surf_cpu_model->states.running_action_set)
continue;
/* bogus priority, skip it */
- if (
GENERIC_ACTION(action).
priority <= 0)
+ if (
generic->
priority <= 0)
continue;
/* action suspended, skip it */
continue;
/* action suspended, skip it */
@@
-345,20
+351,20
@@
static void cpu_ti_update_remaining_amount(cpu_ti_t cpu, double now)
continue;
/* action don't need update */
continue;
/* action don't need update */
- if (
GENERIC_ACTION(action).
start >= now)
+ if (
generic->
start >= now)
continue;
/* skip action that are finishing now */
continue;
/* skip action that are finishing now */
- if (
GENERIC_ACTION(action).
finish >= 0
- &&
GENERIC_ACTION(action).
finish <= now)
+ if (
generic->
finish >= 0
+ &&
generic->
finish <= now)
continue;
/* update remaining */
continue;
/* update remaining */
- double_update(&(
GENERIC_ACTION(action).
remains),
+ double_update(&(
generic->
remains),
area_total / (cpu->sum_priority *
area_total / (cpu->sum_priority *
-
GENERIC_ACTION(action).
priority));
- XBT_DEBUG("Update remaining action(%p) remaining %
l
f", action,
-
GENERIC_ACTION(action).
remains);
+
generic->
priority));
+ XBT_DEBUG("Update remaining action(%p) remaining %f", action,
+
generic->
remains);
}
cpu->last_update = now;
#undef GENERIC_ACTION
}
cpu->last_update = now;
#undef GENERIC_ACTION
@@
-367,8
+373,8
@@
static void cpu_ti_update_remaining_amount(cpu_ti_t cpu, double now)
/**
* \brief Update the finish date of action if necessary
*
/**
* \brief Update the finish date of action if necessary
*
-* \param
cpu
Cpu on which the actions are running
-* \param
now
Current time
+* \param
cpu
Cpu on which the actions are running
+* \param
now
Current time
*/
static void cpu_ti_update_action_finish_date(cpu_ti_t cpu, double now)
{
*/
static void cpu_ti_update_action_finish_date(cpu_ti_t cpu, double now)
{
@@
-443,7
+449,7
@@
static void cpu_ti_update_action_finish_date(cpu_ti_t cpu, double now)
xbt_heap_push(cpu_ti_action_heap, action, min_finish);
XBT_DEBUG
xbt_heap_push(cpu_ti_action_heap, action, min_finish);
XBT_DEBUG
- ("Update finish time: Cpu(%s) Action: %p, Start Time: %
lf Finish Time: %lf Max duration %l
f",
+ ("Update finish time: Cpu(%s) Action: %p, Start Time: %
f Finish Time: %f Max duration %
f",
cpu->generic_resource.name, action, GENERIC_ACTION(action).start,
GENERIC_ACTION(action).finish,
GENERIC_ACTION(action).max_duration);
cpu->generic_resource.name, action, GENERIC_ACTION(action).start,
GENERIC_ACTION(action).finish,
GENERIC_ACTION(action).max_duration);
@@
-466,7
+472,7
@@
static double cpu_ti_share_resources(double now)
if (xbt_heap_size(cpu_ti_action_heap) > 0)
min_action_duration = xbt_heap_maxkey(cpu_ti_action_heap) - now;
if (xbt_heap_size(cpu_ti_action_heap) > 0)
min_action_duration = xbt_heap_maxkey(cpu_ti_action_heap) - now;
- XBT_DEBUG("Share resources, min next event date: %
l
f", min_action_duration);
+ XBT_DEBUG("Share resources, min next event date: %f", min_action_duration);
return min_action_duration;
}
return min_action_duration;
}
@@
-483,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
}
@@
-501,15
+507,15
@@
static void cpu_ti_update_resource_state(void *id,
surf_cpu_ti_tgmr_t trace;
s_tmgr_event_t val;
surf_cpu_ti_tgmr_t trace;
s_tmgr_event_t val;
- XBT_DEBUG("Finish trace date: %
lf value %lf date %l
f", surf_get_clock(),
+ XBT_DEBUG("Finish trace date: %
f value %f date %
f", surf_get_clock(),
value, date);
/* update remaining of actions and put in modified cpu swag */
cpu_ti_update_remaining_amount(cpu, date);
xbt_swag_insert(cpu, cpu_ti_modified_cpu);
power_trace = cpu->avail_trace->power_trace;
value, date);
/* update remaining of actions and put in modified cpu swag */
cpu_ti_update_remaining_amount(cpu, date);
xbt_swag_insert(cpu, cpu_ti_modified_cpu);
power_trace = cpu->avail_trace->power_trace;
- xbt_dynar_get_cpy(power_trace->event_list,
- xbt_dynar_length(power_trace->event_list) - 1, &val);
+ xbt_dynar_get_cpy(power_trace->
s_list.
event_list,
+ xbt_dynar_length(power_trace->
s_list.
event_list) - 1, &val);
/* free old trace */
surf_cpu_ti_free_tmgr(cpu->avail_trace);
cpu->power_scale = val.value;
/* free old trace */
surf_cpu_ti_free_tmgr(cpu->avail_trace);
cpu->power_scale = val.value;
@@
-517,7
+523,7
@@
static void cpu_ti_update_resource_state(void *id,
trace = xbt_new0(s_surf_cpu_ti_tgmr_t, 1);
trace->type = TRACE_FIXED;
trace->value = val.value;
trace = xbt_new0(s_surf_cpu_ti_tgmr_t, 1);
trace->type = TRACE_FIXED;
trace->value = val.value;
- XBT_DEBUG("value %
l
f", val.value);
+ XBT_DEBUG("value %f", val.value);
cpu->avail_trace = trace;
cpu->avail_trace = trace;
@@
-525,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 */
@@
-563,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 =
@@
-595,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;
@@
-618,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();
}
@@
-628,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();
}
@@
-673,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();
}
@@
-683,26
+691,26
@@
static double cpu_ti_action_get_remains(surf_action_t action)
cpu_ti_update_remaining_amount((cpu_ti_t)
((surf_action_cpu_ti_t) action)->cpu,
surf_get_clock());
cpu_ti_update_remaining_amount((cpu_ti_t)
((surf_action_cpu_ti_t) action)->cpu,
surf_get_clock());
- return action->remains;
XBT_OUT();
XBT_OUT();
+ return action->remains;
}
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
;
}
/**
* \brief Auxiliary function to update the CPU power scale.
*
}
/**
* \brief Auxiliary function to update the CPU power scale.
*
-*
This function uses the trace structure to return the power scale at the determined time a.
-* \param trace
Trace structure to search the updated power scale
-* \param a
Time
+* This function uses the trace structure to return the power scale at the determined time a.
+* \param trace Trace structure to search the updated power scale
+* \param a Time
* \return CPU power scale
*/
static double surf_cpu_ti_get_power_scale(surf_cpu_ti_tgmr_t trace,
* \return CPU power scale
*/
static double surf_cpu_ti_get_power_scale(surf_cpu_ti_tgmr_t trace,
@@
-716,13
+724,13
@@
static double surf_cpu_ti_get_power_scale(surf_cpu_ti_tgmr_t trace,
point =
surf_cpu_ti_binary_search(trace->trace->time_points, reduced_a, 0,
trace->trace->nb_points - 1);
point =
surf_cpu_ti_binary_search(trace->trace->time_points, reduced_a, 0,
trace->trace->nb_points - 1);
- xbt_dynar_get_cpy(trace->power_trace->event_list, point, &val);
+ xbt_dynar_get_cpy(trace->power_trace->
s_list.
event_list, point, &val);
return val.value;
}
static double cpu_ti_get_available_speed(void *cpu)
{
return val.value;
}
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 */
@@
-736,12
+744,12
@@
static void cpu_ti_finalize(void)
char *key;
xbt_lib_foreach(host_lib, cursor, key, cpu){
char *key;
xbt_lib_foreach(host_lib, cursor, key, cpu){
-
if(cpu[SURF_CPU_LEVEL])
-
{
-
cpu_ti_t CPU = cpu[SURF_CPU_LEVEL];
-
xbt_swag_free(CPU->action_set);
-
surf_cpu_ti_free_tmgr(CPU->avail_trace);
-
}
+ if(cpu[SURF_CPU_LEVEL])
+ {
+ cpu_ti_t CPU = cpu[SURF_CPU_LEVEL];
+ xbt_swag_free(CPU->action_set);
+ surf_cpu_ti_free_tmgr(CPU->avail_trace);
+ }
}
surf_model_exit(surf_cpu_model);
}
surf_model_exit(surf_cpu_model);
@@
-767,7
+775,7
@@
static void surf_cpu_ti_model_init_internal(void)
cpu_ti_modified_cpu =
xbt_swag_new(xbt_swag_offset(cpu, modified_cpu_hookup));
cpu_ti_modified_cpu =
xbt_swag_new(xbt_swag_offset(cpu, modified_cpu_hookup));
- surf_cpu_model->name = "
CPU_TI
";
+ surf_cpu_model->name = "
cpu_ti
";
surf_cpu_model->action_unref = cpu_ti_action_unref;
surf_cpu_model->action_cancel = cpu_ti_action_cancel;
surf_cpu_model->action_unref = cpu_ti_action_unref;
surf_cpu_model->action_cancel = cpu_ti_action_cancel;
@@
-795,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);
@@
-806,8
+813,7
@@
static void surf_cpu_ti_model_init_internal(void)
void surf_cpu_model_init_ti()
{
void surf_cpu_model_init_ti()
{
- if (surf_cpu_model)
- return;
+ xbt_assert(!surf_cpu_model,"CPU model already initialized. This should not happen.");
surf_cpu_ti_model_init_internal();
cpu_ti_define_callbacks();
xbt_dynar_push(model_list, &surf_cpu_model);
surf_cpu_ti_model_init_internal();
cpu_ti_define_callbacks();
xbt_dynar_push(model_list, &surf_cpu_model);
@@
-821,8
+827,8
@@
void surf_cpu_model_init_ti()
* the cyclic effect.
*
* \param trace Trace structure.
* the cyclic effect.
*
* \param trace Trace structure.
-* \param a
Begin of interval
-* \param b
End of interval
+* \param a Begin of interval
+* \param b End of interval
* \return the integrate value. -1 if an error occurs.
*/
static double surf_cpu_ti_integrate_trace(surf_cpu_ti_tgmr_t trace,
* \return the integrate value. -1 if an error occurs.
*/
static double surf_cpu_ti_integrate_trace(surf_cpu_ti_tgmr_t trace,
@@
-882,12
+888,12
@@
static double surf_cpu_ti_integrate_trace(surf_cpu_ti_tgmr_t trace,
/**
* \brief Auxiliary function to calculate the integral between a and b.
/**
* \brief Auxiliary function to calculate the integral between a and b.
- *
It simply calculates the integral at point a and b and returns the difference
- *
between them.
- * \param trace
Trace structure
- * \param a
Initial point
- * \param b
Final point
- * \return
Integral
+ * It simply calculates the integral at point a and b and returns the difference
+ * between them.
+ * \param trace Trace structure
+ * \param a Initial point
+ * \param b Final point
+ * \return Integral
*/
static double surf_cpu_ti_integrate_trace_simple(surf_cpu_ti_trace_t trace,
double a, double b)
*/
static double surf_cpu_ti_integrate_trace_simple(surf_cpu_ti_trace_t trace,
double a, double b)
@@
-899,9
+905,9
@@
static double surf_cpu_ti_integrate_trace_simple(surf_cpu_ti_trace_t trace,
/**
* \brief Auxiliary function to calculate the integral at point a.
/**
* \brief Auxiliary function to calculate the integral at point a.
- * \param trace
Trace structure
- * \param a
point
- * \return
Integral
+ * \param trace Trace structure
+ * \param a point
+ * \return Integral
*/
static double surf_cpu_ti_integrate_trace_simple_point(surf_cpu_ti_trace_t
trace, double a)
*/
static double surf_cpu_ti_integrate_trace_simple_point(surf_cpu_ti_trace_t
trace, double a)
@@
-914,7
+920,7
@@
static double surf_cpu_ti_integrate_trace_simple_point(surf_cpu_ti_trace_t
trace->nb_points - 1);
integral += trace->integral[ind];
XBT_DEBUG
trace->nb_points - 1);
integral += trace->integral[ind];
XBT_DEBUG
- ("a %
lf ind %d integral %lf ind + 1 %lf ind %lf time +1 %lf time %l
f",
+ ("a %
f ind %d integral %f ind + 1 %f ind %f time +1 %f time %
f",
a, ind, integral, trace->integral[ind + 1], trace->integral[ind],
trace->time_points[ind + 1], trace->time_points[ind]);
double_update(&a_aux, trace->time_points[ind]);
a, ind, integral, trace->integral[ind + 1], trace->integral[ind],
trace->time_points[ind + 1], trace->time_points[ind]);
double_update(&a_aux, trace->time_points[ind]);
@@
-926,7
+932,7
@@
static double surf_cpu_ti_integrate_trace_simple_point(surf_cpu_ti_trace_t
trace->
time_points
[ind]);
trace->
time_points
[ind]);
- XBT_DEBUG("Integral a %
lf = %l
f", a, integral);
+ XBT_DEBUG("Integral a %
f = %
f", a, integral);
return integral;
}
return integral;
}
@@
-936,10
+942,10
@@
static double surf_cpu_ti_integrate_trace_simple_point(surf_cpu_ti_trace_t
*
* Here, amount can span multiple trace periods
*
*
* Here, amount can span multiple trace periods
*
-* \param trace
CPU trace structure
-* \param a
Initial time
-* \param amount
Amount to be executed
-* \return
End time
+* \param trace CPU trace structure
+* \param a Initial time
+* \param amount Amount to be executed
+* \return End time
*/
static double surf_cpu_ti_solve_trace(surf_cpu_ti_tgmr_t trace, double a,
double amount)
*/
static double surf_cpu_ti_solve_trace(surf_cpu_ti_tgmr_t trace, double a,
double amount)
@@
-976,20
+982,20
@@
static double surf_cpu_ti_solve_trace(surf_cpu_ti_tgmr_t trace, double a,
return (a + (amount / trace->value));
}
return (a + (amount / trace->value));
}
- XBT_DEBUG("amount %
lf total %l
f", amount, trace->total);
+ XBT_DEBUG("amount %
f total %
f", amount, trace->total);
/* Reduce the problem to one where amount <= trace_total */
quotient = (int) (floor(amount / trace->total));
reduced_amount = (trace->total) * ((amount / trace->total) -
floor(amount / trace->total));
reduced_a = a - (trace->last_time) * (int) (floor(a / trace->last_time));
/* Reduce the problem to one where amount <= trace_total */
quotient = (int) (floor(amount / trace->total));
reduced_amount = (trace->total) * ((amount / trace->total) -
floor(amount / trace->total));
reduced_a = a - (trace->last_time) * (int) (floor(a / trace->last_time));
- XBT_DEBUG("Quotient: %d reduced_amount: %
lf reduced_a: %l
f", quotient,
+ XBT_DEBUG("Quotient: %d reduced_amount: %
f reduced_a: %
f", quotient,
reduced_amount, reduced_a);
/* Now solve for new_amount which is <= trace_total */
/*
reduced_amount, reduced_a);
/* Now solve for new_amount which is <= trace_total */
/*
-
fprintf(stderr,"reduced_a = %.2f\n",reduced_a);
-
fprintf(stderr,"reduced_amount = %.2f\n",reduced_amount);
+ fprintf(stderr,"reduced_a = %.2f\n",reduced_a);
+ fprintf(stderr,"reduced_amount = %.2f\n",reduced_amount);
*/
reduced_b =
surf_cpu_ti_solve_trace_somewhat_simple(trace, reduced_a,
*/
reduced_b =
surf_cpu_ti_solve_trace_somewhat_simple(trace, reduced_a,
@@
-1019,7
+1025,7
@@
static double surf_cpu_ti_solve_trace_somewhat_simple(surf_cpu_ti_tgmr_t
amount_till_end =
surf_cpu_ti_integrate_trace(trace, a, trace->last_time);
/*
amount_till_end =
surf_cpu_ti_integrate_trace(trace, a, trace->last_time);
/*
-
fprintf(stderr,"amount_till_end=%.2f\n",amount_till_end);
+ fprintf(stderr,"amount_till_end=%.2f\n",amount_till_end);
*/
if (amount_till_end > amount) {
*/
if (amount_till_end > amount) {
@@
-1034,10
+1040,10
@@
static double surf_cpu_ti_solve_trace_somewhat_simple(surf_cpu_ti_tgmr_t
/**
* \brief Auxiliary function to solve integral.
/**
* \brief Auxiliary function to solve integral.
- *
It returns the date when the requested amount of flops is available
- * \param trace
Trace structure
- * \param a
Initial point
- * \param amount
Amount of flops
+ * It returns the date when the requested amount of flops is available
+ * \param trace Trace structure
+ * \param a Initial point
+ * \param amount Amount of flops
* \return The date when amount is available.
*/
static double surf_cpu_ti_solve_trace_simple(surf_cpu_ti_trace_t trace,
* \return The date when amount is available.
*/
static double surf_cpu_ti_solve_trace_simple(surf_cpu_ti_trace_t trace,
@@
-1063,11
+1069,11
@@
static double surf_cpu_ti_solve_trace_simple(surf_cpu_ti_trace_t trace,
/**
* \brief Binary search in array.
/**
* \brief Binary search in array.
- *
It returns the first point of the interval in which "a" is.
- * \param array
Array
- * \param a
Value to search
- * \param low
Low bound to search in array
- * \param high
Upper bound to search in array
+ * It returns the first point of the interval in which "a" is.
+ * \param array Array
+ * \param a Value to search
+ * \param low Low bound to search in array
+ * \param high Upper bound to search in array
* \return Index of point
*/
static int surf_cpu_ti_binary_search(double *array, double a, int low,
* \return Index of point
*/
static int surf_cpu_ti_binary_search(double *array, double a, int low,
@@
-1079,7
+1085,7
@@
static int surf_cpu_ti_binary_search(double *array, double a, int low,
int mid;
do {
mid = low + (high - low) / 2;
int mid;
do {
mid = low + (high - low) / 2;
- XBT_DEBUG("a %
lf low %d high %d mid %d value %l
f", a, low, high, mid,
+ XBT_DEBUG("a %
f low %d high %d mid %d value %
f", a, low, high, mid,
array[mid]);
if (array[mid] > a)
array[mid]);
if (array[mid] > a)