#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;
*/
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)
- 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();
action->generic_action.finish = -1.0;
action->generic_action.resource_type =
(surf_resource_t) surf_cpu_resource;
+ action->suspended = 0; /* Should be useless because of the
+ calloc but it seems to help valgrind... */
if (CPU->state_current == SURF_CPU_ON)
action->generic_action.state_set =
XBT_IN2("(%s,%g)",((cpu_Cas01_t)cpu)->name,duration);
action = (surf_action_cpu_Cas01_t) execute(cpu, 1.0);
action->generic_action.max_duration = duration;
+ action->suspended = 2;
lmm_update_variable_weight(maxmin_system, action->variable, 0.0);
XBT_OUT;
return (surf_action_t) action;
static void action_suspend(surf_action_t action)
{
XBT_IN1("(%p)",action);
- lmm_update_variable_weight(maxmin_system,
- ((surf_action_cpu_Cas01_t) action)->variable, 0.0);
+ if(((surf_action_cpu_Cas01_t) action)->suspended != 2) {
+ lmm_update_variable_weight(maxmin_system,
+ ((surf_action_cpu_Cas01_t) action)->variable, 0.0);
+ ((surf_action_cpu_Cas01_t) action)->suspended = 1;
+ }
XBT_OUT;
}
static void action_resume(surf_action_t action)
{
XBT_IN1("(%p)",action);
- lmm_update_variable_weight(maxmin_system,
- ((surf_action_cpu_Cas01_t) action)->variable,
- action->priority);
+ if(((surf_action_cpu_Cas01_t) action)->suspended != 2) {
+ lmm_update_variable_weight(maxmin_system,
+ ((surf_action_cpu_Cas01_t) action)->variable,
+ action->priority);
+ ((surf_action_cpu_Cas01_t) action)->suspended=0;
+ }
XBT_OUT;
}
static int action_is_suspended(surf_action_t action)
{
- return (lmm_get_variable_weight(((surf_action_cpu_Cas01_t) action)->variable) == 0.0);
+ return (((surf_action_cpu_Cas01_t) action)->suspended==1);
}
static void action_set_max_duration(surf_action_t action, double duration)
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);
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->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();