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
added dvfs support
[simgrid.git]
/
src
/
surf
/
cpu_ti.c
diff --git
a/src/surf/cpu_ti.c
b/src/surf/cpu_ti.c
index
34a301c
..
7084967
100644
(file)
--- a/
src/surf/cpu_ti.c
+++ b/
src/surf/cpu_ti.c
@@
-6,8
+6,8
@@
* under the terms of the license (GNU LGPL) which comes with this package. */
/*
* 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"
@@
-93,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)
@@
-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,7
+156,7
@@
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");
"Host '%s' declared several times in the platform file",
name);
xbt_assert(core==1,"Multi-core not handled with this model yet");
@@
-163,7
+164,13
@@
static void* cpu_ti_create_resource(const char *name, double power_peak,
surf_cpu_model, name,cpu_properties);
cpu->action_set =
xbt_swag_new(xbt_swag_offset(ti_action, cpu_list_hookup));
surf_cpu_model, name,cpu_properties);
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);
+ //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,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);
}
}
@@
-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,15
+309,15
@@
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)
{
@@
-365,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)
{
@@
-482,7
+490,7
@@
static void cpu_ti_update_actions_state(double now, double delta)
GENERIC_ACTION(action).remains = 0;
cpu_ti_action_state_set((surf_action_t) action, SURF_ACTION_DONE);
/* update remaining amout of all actions */
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());
+ cpu_ti_update_remaining_amount(
surf_cpu_resource_priv(action->cpu)
, surf_get_clock());
}
#undef GENERIC_ACTION
}
}
#undef GENERIC_ACTION
}
@@
-494,6
+502,8
@@
static void cpu_ti_update_resource_state(void *id,
cpu_ti_t cpu = id;
surf_action_cpu_ti_t action;
cpu_ti_t cpu = id;
surf_action_cpu_ti_t action;
+ surf_watched_hosts();
+
if (event_type == cpu->power_event) {
tmgr_trace_t power_trace;
surf_cpu_ti_tgmr_t trace;
if (event_type == cpu->power_event) {
tmgr_trace_t power_trace;
surf_cpu_ti_tgmr_t trace;
@@
-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,20
+697,20
@@
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
;
}
/**
* \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,
@@
-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 */
@@
-734,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);
@@
-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);
@@
-818,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,
@@
-879,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)
@@
-896,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)
@@
-933,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)
@@
-985,8
+994,8
@@
static double surf_cpu_ti_solve_trace(surf_cpu_ti_tgmr_t trace, double a,
/* Now solve for new_amount which is <= trace_total */
/*
/* 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,
@@
-1016,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) {
@@
-1031,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,
@@
-1060,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,