GENERIC_LMM_ACTION(action).suspended = 0; /* Should be useless because of the
calloc but it seems to help valgrind... */
+
GENERIC_LMM_ACTION(action).variable =
- lmm_variable_new(storage_maxmin_system, action, 1.0, -1.0 , 1);
+ lmm_variable_new(storage_maxmin_system, action, 1.0, -1.0 , 3);
lmm_expand(storage_maxmin_system, STORAGE->constraint,
GENERIC_LMM_ACTION(action).variable, 1.0);
storage_running_action_set_that_does_not_need_being_checked;
xbt_swag_insert(action, ((surf_action_t) action)->state_set);
}
+
+ lmm_update_variable_weight(storage_maxmin_system,
+ GENERIC_LMM_ACTION(action).variable, 0.0);
+
XBT_OUT();
return (surf_action_t) action;
}
storage->state_current = SURF_RESOURCE_ON;
storage_type_t storage_type = xbt_lib_get_or_null(storage_type_lib, type_id,ROUTING_STORAGE_TYPE_LEVEL);
- int Bread = atoi(xbt_dict_get(storage_type->properties,"Bread"));
-
- storage->constraint =
- lmm_constraint_new(storage_maxmin_system, storage,
- Bread);
+ double Bread = atof(xbt_dict_get(storage_type->properties,"Bread"));
+ double Bwrite = atof(xbt_dict_get(storage_type->properties,"Bwrite"));
+ double Bconnexion = atof(xbt_dict_get(storage_type->properties,"Bconnexion"));
+ storage->constraint = lmm_constraint_new(storage_maxmin_system, storage, Bconnexion);
+ storage->constraint_read = lmm_constraint_new(storage_maxmin_system, storage, Bread);
+ storage->constraint_write = lmm_constraint_new(storage_maxmin_system, storage, Bwrite);
xbt_lib_set(storage_lib, id, SURF_STORAGE_LEVEL, storage);
- XBT_DEBUG("SURF storage create resource\n\t\tid '%s'\n\t\ttype '%s' \n\t\tmodel '%s' \n\t\tproperties '%p'\n\t\tBread '%d'\n",
+ XBT_DEBUG("SURF storage create resource\n\t\tid '%s'\n\t\ttype '%s' \n\t\tmodel '%s' \n\t\tproperties '%p'\n\t\tBread '%f'\n",
id,
model,
type_id,