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
Adding debug informations.
[simgrid.git]
/
src
/
surf
/
cpu.c
diff --git
a/src/surf/cpu.c
b/src/surf/cpu.c
index
c24f936
..
240ee53
100644
(file)
--- a/
src/surf/cpu.c
+++ b/
src/surf/cpu.c
@@
-7,7
+7,7
@@
#include "cpu_private.h"
#include "cpu_private.h"
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(cpu, surf,
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(
surf_
cpu, surf,
"Logging specific to the SURF CPU module");
surf_cpu_resource_t surf_cpu_resource = NULL;
"Logging specific to the SURF CPU module");
surf_cpu_resource_t surf_cpu_resource = NULL;
@@
-128,7
+128,6
@@
static void action_cancel(surf_action_t action)
static void action_recycle(surf_action_t action)
{
DIE_IMPOSSIBLE;
static void action_recycle(surf_action_t action)
{
DIE_IMPOSSIBLE;
- return;
}
static void action_change_state(surf_action_t action,
}
static void action_change_state(surf_action_t action,
@@
-164,10
+163,10
@@
static void update_actions_state(double now, double delta)
*/
xbt_swag_foreach_safe(action, next_action, running_actions) {
*/
xbt_swag_foreach_safe(action, next_action, running_actions) {
-
surf_
double_update(&(action->generic_action.remains),
+ double_update(&(action->generic_action.remains),
lmm_variable_getvalue(action->variable) * delta);
if (action->generic_action.max_duration != NO_MAX_DURATION)
lmm_variable_getvalue(action->variable) * delta);
if (action->generic_action.max_duration != NO_MAX_DURATION)
-
surf_
double_update(&(action->generic_action.max_duration), delta);
+ double_update(&(action->generic_action.max_duration), delta);
if ((action->generic_action.remains <= 0) &&
(lmm_get_variable_weight(action->variable)>0)) {
action->generic_action.finish = surf_get_clock();
if ((action->generic_action.remains <= 0) &&
(lmm_get_variable_weight(action->variable)>0)) {
action->generic_action.finish = surf_get_clock();
@@
-312,6
+311,12
@@
static double get_speed(void *cpu, double load)
return load*(((cpu_Cas01_t) cpu)->power_scale);
}
return load*(((cpu_Cas01_t) cpu)->power_scale);
}
+static double get_available_speed(void *cpu)
+{
+ /* number between 0 and 1 */
+ return ((cpu_Cas01_t) cpu)->power_current;
+}
+
static void finalize(void)
{
xbt_dict_free(&cpu_set);
static void finalize(void)
{
xbt_dict_free(&cpu_set);
@@
-355,6
+360,10
@@
static void surf_cpu_resource_init_internal(void)
surf_cpu_resource->common_public->get_resource_name = get_resource_name;
surf_cpu_resource->common_public->action_get_state =
surf_action_get_state;
surf_cpu_resource->common_public->get_resource_name = get_resource_name;
surf_cpu_resource->common_public->action_get_state =
surf_action_get_state;
+ surf_cpu_resource->common_public->action_get_start_time =
+ surf_action_get_start_time;
+ surf_cpu_resource->common_public->action_get_finish_time =
+ surf_action_get_finish_time;
surf_cpu_resource->common_public->action_free = action_free;
surf_cpu_resource->common_public->action_use = action_use;
surf_cpu_resource->common_public->action_cancel = action_cancel;
surf_cpu_resource->common_public->action_free = action_free;
surf_cpu_resource->common_public->action_use = action_use;
surf_cpu_resource->common_public->action_cancel = action_cancel;
@@
-382,6
+391,7
@@
static void surf_cpu_resource_init_internal(void)
surf_cpu_resource->extension_public->get_state = get_state;
surf_cpu_resource->extension_public->get_speed = get_speed;
surf_cpu_resource->extension_public->get_state = get_state;
surf_cpu_resource->extension_public->get_speed = get_speed;
+ surf_cpu_resource->extension_public->get_available_speed = get_available_speed;
cpu_set = xbt_dict_new();
cpu_set = xbt_dict_new();