-/* 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
action->max_duration = NO_MAX_DURATION;
action->start = surf_get_clock();
action->finish = -1.0;
- action->model_type = model;
+ action->model_obj = model;
#ifdef HAVE_TRACING
action->category = NULL;
#endif
e_surf_action_state_t surf_action_state_get(surf_action_t action)
{
- surf_action_state_t action_state = &(action->model_type->states);
+ surf_action_state_t action_state = &(action->model_obj->states);
if (action->state_set == action_state->ready_action_set)
return SURF_ACTION_READY;
void surf_action_state_set(surf_action_t action,
e_surf_action_state_t state)
{
- surf_action_state_t action_state = &(action->model_type->states);
+ surf_action_state_t action_state = &(action->model_obj->states);
XBT_IN("(%p,%s)", action, surf_action_state_names[state]);
xbt_swag_remove(action, action->state_set);
void surf_action_cancel(surf_action_t action)
{
- surf_model_t model = action->model_type;
+ surf_model_t model = action->model_obj;
surf_action_state_set(action, SURF_ACTION_FAILED);
if (model->model_private->update_mechanism == UM_LAZY) {
xbt_swag_remove(action, model->model_private->modified_set);
int surf_action_unref(surf_action_t action)
{
- surf_model_t model = action->model_type;
+ surf_model_t model = action->model_obj;
action->refcount--;
if (!action->refcount) {
xbt_swag_remove(action, action->state_set);
void surf_action_suspend(surf_action_t action)
{
- surf_model_t model = action->model_type;
+ surf_model_t model = action->model_obj;
XBT_IN("(%p)", action);
if (((surf_action_lmm_t) action)->suspended != 2) {
lmm_update_variable_weight(model->model_private->maxmin_system,
void surf_action_resume(surf_action_t action)
{
- surf_model_t model = action->model_type;
+ surf_model_t model = action->model_obj;
XBT_IN("(%p)", action);
if (((surf_action_lmm_t) action)->suspended != 2) {
lmm_update_variable_weight(model->model_private->maxmin_system,
void surf_action_set_max_duration(surf_action_t action, double duration)
{
- surf_model_t model = action->model_type;
+ surf_model_t model = action->model_obj;
XBT_IN("(%p,%g)", action, duration);
action->max_duration = duration;
if (model->model_private->update_mechanism == UM_LAZY) // remove action from the heap
void surf_action_set_priority(surf_action_t action, double priority)
{
- surf_model_t model = action->model_type;
+ surf_model_t model = action->model_obj;
XBT_IN("(%p,%g)", action, priority);
action->priority = priority;
lmm_update_variable_weight(model->model_private->maxmin_system,
XBT_OUT();
}
+void surf_action_set_bound(surf_action_t action, double bound)
+{
+ surf_model_t model = action->model_obj;
+ XBT_IN("(%p,%g)", action, bound);
+ action->bound = bound;
+ lmm_update_variable_bound(model->model_private->maxmin_system, ((surf_action_lmm_t) action)->variable, bound);
+
+ if (model->model_private->update_mechanism == UM_LAZY)
+ surf_action_lmm_heap_remove(model->model_private->action_heap, (surf_action_lmm_t) action);
+ XBT_OUT();
+}
+
#ifdef HAVE_TRACING
void surf_action_set_category(surf_action_t action,
const char *category)
void generic_update_action_remaining_lazy( surf_action_lmm_t action, double now)
{
double delta = 0.0;
- surf_model_t model = action->generic_action.model_type;
+ surf_model_t model = action->generic_action.model_obj;
if(model == surf_network_model)
{
delta = now - action->last_update;
if (action->generic_action.remains > 0) {
- XBT_DEBUG("Updating action(%p): remains was %lf, last_update was: %lf", action, action->generic_action.remains, action->last_update);
+ XBT_DEBUG("Updating action(%p): remains was %f, last_update was: %f", action, action->generic_action.remains, action->last_update);
double_update(&(action->generic_action.remains),
action->last_value * delta);
#ifdef HAVE_TRACING
- if (model == surf_cpu_model && TRACE_is_enabled()) {
+ if (model->type == SURF_MODEL_TYPE_CPU && TRACE_is_enabled()) {
surf_resource_t cpu =
lmm_constraint_id(lmm_get_cnst_from_var
(model->model_private->maxmin_system,
now - action->last_update);
}
#endif
- XBT_DEBUG("Updating action(%p): remains is now %lf", action,
+ XBT_DEBUG("Updating action(%p): remains is now %f", action,
action->generic_action.remains);
}
double surf_action_get_remains(surf_action_t action)
{
XBT_IN("(%p)", action);
- surf_model_t model = action->model_type;
+ surf_model_t model = action->model_obj;
/* update remains before return it */
if (model->model_private->update_mechanism == UM_LAZY) /* update remains before return it */
generic_update_action_remaining_lazy((surf_action_lmm_t)action, surf_get_clock());
*/
void update_resource_energy(surf_model_t model, surf_action_lmm_t action)
{
- if(model == surf_cpu_model){
+ if(model->type == SURF_MODEL_TYPE_CPU){
cpu_Cas01_t cpu_model = (cpu_Cas01_t)lmm_constraint_id(lmm_get_cnst_from_var
(model->model_private->maxmin_system,
action->variable, 0));
- double load = lmm_constraint_get_usage(cpu_model->constraint) / cpu_model->power_peak;
- cpu_update_energy(cpu_model, load);
+ if( cpu_model->energy->last_updated < surf_get_clock()) {
+ double load = lmm_constraint_get_usage(cpu_model->constraint) / cpu_model->power_peak;
+ cpu_update_energy(cpu_model, load);
+ }
}
}
XBT_DEBUG("Something happened to action %p", action);
#ifdef HAVE_TRACING
if (TRACE_is_enabled()) {
- if(model == surf_cpu_model){
+ if(model->type == SURF_MODEL_TYPE_CPU){
surf_resource_t cpu =
lmm_constraint_id(lmm_get_cnst_from_var
(model->model_private->maxmin_system,
}
#endif
- if(model == surf_cpu_model){
+ if(model->type == SURF_MODEL_TYPE_CPU){
action->generic_action.finish = surf_get_clock();
update_resource_energy(model, action);
}
}
#ifdef HAVE_TRACING
- if (TRACE_is_enabled() && model == surf_cpu_model) {
+ if (TRACE_is_enabled() && model->type == SURF_MODEL_TYPE_CPU) {
//defining the last timestamp that we can safely dump to trace file
//without losing the event ascending order (considering all CPU's)
double smaller = -1;
