/************ workstation creation *********/
static void workstation_free(void *workstation)
{
- xbt_free(((workstation_KCCFLN05_t)workstation)->name);
+ free(((workstation_KCCFLN05_t)workstation)->name);
xbt_dynar_free(&(((workstation_KCCFLN05_t)workstation)->incomming_communications));
xbt_dynar_free(&(((workstation_KCCFLN05_t)workstation)->outgoing_communications));
- xbt_free(workstation);
+ free(workstation);
}
static workstation_KCCFLN05_t workstation_new(const char *name,
workstation->id = nb_workstation++;
workstation->power_scale = power_scale;
+ xbt_assert0(workstation->power_scale>0,"Power has to be >0");
+
workstation->power_current = power_initial;
if (power_trace)
workstation->power_event =
static void network_link_free(void *nw_link)
{
- xbt_free(((network_link_KCCFLN05_t)nw_link)->name);
- xbt_free(nw_link);
+ free(((network_link_KCCFLN05_t)nw_link)->name);
+ free(nw_link);
}
static network_link_KCCFLN05_t network_link_new(char *name,
link_list = route->links = xbt_new0(network_link_KCCFLN05_t, nb_link);
for (i = 0; i < nb_link; i++) {
xbt_dict_get(network_link_set, links[i], (void *) &(link_list[i]));
- xbt_free(links[i]);
+ free(links[i]);
}
- xbt_free(links);
+ free(links);
route->impact_on_src=impact_on_src;
route->impact_on_dst=impact_on_src;
route->impact_on_src_with_other_recv=impact_on_src_with_other_recv;
/*************** actions **************/
/**************************************/
/*************** network **************/
-static void action_network_KCCFLN05_free(surf_action_t action)
+static int action_network_KCCFLN05_free(surf_action_t action)
{
int cpt;
surf_action_t act = NULL;
workstation_KCCFLN05_t src = ((surf_action_network_KCCFLN05_t) action)->src;
workstation_KCCFLN05_t dst = ((surf_action_network_KCCFLN05_t) action)->dst;
- xbt_swag_remove(action, action->state_set);
- lmm_variable_free(maxmin_system_network_KCCFLN05,
- ((surf_action_network_KCCFLN05_t) action)->variable);
-
- xbt_dynar_foreach (src->outgoing_communications,cpt,act) {
- if(act==action) {
- xbt_dynar_remove_at(src->outgoing_communications, cpt, &act);
- break;
+ action->using--;
+ if(!action->using) {
+
+ xbt_swag_remove(action, action->state_set);
+ if(((surf_action_network_KCCFLN05_t)action)->variable)
+ lmm_variable_free(maxmin_system_network_KCCFLN05,
+ ((surf_action_network_KCCFLN05_t) action)->variable);
+
+ xbt_dynar_foreach (src->outgoing_communications,cpt,act) {
+ if(act==action) {
+ xbt_dynar_remove_at(src->outgoing_communications, cpt, &act);
+ break;
+ }
}
- }
-
- xbt_dynar_foreach (dst->incomming_communications,cpt,act) {
- if(act==action) {
- xbt_dynar_remove_at(dst->incomming_communications, cpt, &act);
- break;
+
+ xbt_dynar_foreach (dst->incomming_communications,cpt,act) {
+ if(act==action) {
+ xbt_dynar_remove_at(dst->incomming_communications, cpt, &act);
+ break;
+ }
}
+
+ free(action);
+ return 1;
}
-
- xbt_free(action);
+ return 0;
}
static double share_network_KCCFLN05_resources(double now)
static void action_network_KCCFLN05_change_state(surf_action_t action,
e_surf_action_state_t state)
{
+ int cpt;
+ surf_action_t act = NULL;
+ workstation_KCCFLN05_t src = ((surf_action_network_KCCFLN05_t) action)->src;
+ workstation_KCCFLN05_t dst = ((surf_action_network_KCCFLN05_t) action)->dst;
+
+/* if((state==SURF_ACTION_DONE) || (state==SURF_ACTION_FAILED)) */
+/* if(((surf_action_network_KCCFLN05_t)action)->variable) { */
+/* lmm_variable_disable(maxmin_system_network_KCCFLN05, */
+/* ((surf_action_network_KCCFLN05_t)action)->variable); */
+/* ((surf_action_network_KCCFLN05_t)action)->variable = NULL; */
+/* } */
+
+ xbt_dynar_foreach (src->outgoing_communications,cpt,act) {
+ if(act==action) {
+ xbt_dynar_remove_at(src->outgoing_communications, cpt, &act);
+ break;
+ }
+ }
+
+ xbt_dynar_foreach (dst->incomming_communications,cpt,act) {
+ if(act==action) {
+ xbt_dynar_remove_at(dst->incomming_communications, cpt, &act);
+ break;
+ }
+ }
surf_action_change_state(action, state);
return;
}
}
}
- xbt_swag_foreach_safe(action, next_action, failed_actions) {
- lmm_variable_disable(maxmin_system_network_KCCFLN05, action->variable);
- }
-
return;
}
action = xbt_new0(s_surf_action_network_KCCFLN05_t, 1);
+ action->generic_action.using = 1;
action->generic_action.cost = size;
action->generic_action.remains = size;
action->generic_action.max_duration = NO_MAX_DURATION;
}
/***************** CPU ****************/
-static void action_cpu_KCCFLN05_free(surf_action_t action)
+static int action_cpu_KCCFLN05_free(surf_action_t action)
{
- xbt_swag_remove(action, action->state_set);
- lmm_variable_free(maxmin_system_cpu_KCCFLN05, ((surf_action_cpu_KCCFLN05_t)action)->variable);
- xbt_free(action);
+ action->using--;
+ if(!action->using) {
+ xbt_swag_remove(action, action->state_set);
+ if(((surf_action_cpu_KCCFLN05_t)action)->variable)
+ lmm_variable_free(maxmin_system_cpu_KCCFLN05, ((surf_action_cpu_KCCFLN05_t)action)->variable);
+ free(action);
+ return 1;
+ }
+ return 0;
+}
+
+static void action_cpu_KCCFLN05_change_state(surf_action_t action,
+ e_surf_action_state_t state)
+{
+/* if((state==SURF_ACTION_DONE) || (state==SURF_ACTION_FAILED)) */
+/* if(((surf_action_cpu_KCCFLN05_t)action)->variable) { */
+/* lmm_variable_disable(maxmin_system_cpu_KCCFLN05, */
+/* ((surf_action_cpu_KCCFLN05_t)action)->variable); */
+/* ((surf_action_cpu_KCCFLN05_t)action)->variable = NULL; */
+/* } */
+
+ surf_action_change_state(action, state);
+ return;
}
/* #define WARNING(format, ...) (fprintf(stderr, "[%s , %s : %d] ", __FILE__, __FUNCTION__, __LINE__),\ */
int cpt;
surf_action_network_KCCFLN05_t action;
+ if(surf_get_clock()>=475.895)
+ {
+ W=0.0;
+ }
+
for(cnst = lmm_get_first_active_constraint(maxmin_system_cpu_KCCFLN05);
cnst;
cnst= lmm_get_next_active_constraint(maxmin_system_cpu_KCCFLN05, cnst))
scale -= ROUTE(action->src->id,action->dst->id).impact_on_dst_with_other_send *
lmm_variable_getvalue(action->variable);
}
- if(scale<0.0) scale=0.0;
+ if(scale<0.0) scale=0.1;
xbt_assert0(scale>=0.0,"Negative interference !");
}
lmm_update_constraint_bound(maxmin_system_cpu_KCCFLN05,workstation->constraint,
if ((action->generic_action.remains <= 0) &&
(lmm_get_variable_weight(action->variable)>0)) {
action->generic_action.finish = surf_get_clock();
- surf_action_change_state((surf_action_t) action, SURF_ACTION_DONE);
+ action_cpu_KCCFLN05_change_state((surf_action_t) action, SURF_ACTION_DONE);
} else if ((action->generic_action.max_duration != NO_MAX_DURATION) &&
(action->generic_action.max_duration <= 0)) {
action->generic_action.finish = surf_get_clock();
- surf_action_change_state((surf_action_t) action, SURF_ACTION_DONE);
+ action_cpu_KCCFLN05_change_state((surf_action_t) action, SURF_ACTION_DONE);
} else { /* Need to check that none of the resource has failed */
lmm_constraint_t cnst = NULL;
int i = 0;
cpu = lmm_constraint_id(cnst);
if (cpu->state_current == SURF_CPU_OFF) {
action->generic_action.finish = surf_get_clock();
- surf_action_change_state((surf_action_t) action, SURF_ACTION_FAILED);
+ action_cpu_KCCFLN05_change_state((surf_action_t) action, SURF_ACTION_FAILED);
break;
}
}
}
}
- xbt_swag_foreach_safe(action, next_action, failed_actions) {
- lmm_variable_disable(maxmin_system_cpu_KCCFLN05, action->variable);
- }
-
return;
}
action = xbt_new0(s_surf_action_cpu_KCCFLN05_t, 1);
+ action->generic_action.using = 1;
action->generic_action.cost = size;
action->generic_action.remains = size;
action->generic_action.max_duration = NO_MAX_DURATION;
static void action_change_state(surf_action_t action,
e_surf_action_state_t state)
{
- xbt_assert0(0, "Workstation is a virtual resource. I should not be there!");
- surf_action_change_state(action, state);
+ if(action->resource_type==(surf_resource_t)surf_network_resource)
+ surf_network_resource->common_public->action_change_state(action,state);
+ else if(action->resource_type==(surf_resource_t)surf_cpu_resource)
+ surf_cpu_resource->common_public->action_change_state(action,state);
+ else DIE_IMPOSSIBLE;
return;
}
-static void action_free(surf_action_t action)
+static int action_free(surf_action_t action)
{
- xbt_assert0(0, "Workstation is a virtual resource. I should not be there!");
+ if(action->resource_type==(surf_resource_t)surf_network_resource)
+ return surf_network_resource->common_public->action_free(action);
+ else if(action->resource_type==(surf_resource_t)surf_cpu_resource)
+ return surf_cpu_resource->common_public->action_free(action);
+ else DIE_IMPOSSIBLE;
+ return 1;
+}
+
+static void action_use(surf_action_t action)
+{
+ if(action->resource_type==(surf_resource_t)surf_network_resource)
+ surf_network_resource->common_public->action_use(action);
+ else if(action->resource_type==(surf_resource_t)surf_cpu_resource)
+ surf_cpu_resource->common_public->action_use(action);
+ else DIE_IMPOSSIBLE;
return;
}
xbt_swag_free(surf_cpu_resource->common_public->states.
failed_action_set);
xbt_swag_free(surf_cpu_resource->common_public->states.done_action_set);
- xbt_free(surf_cpu_resource->common_public);
- xbt_free(surf_cpu_resource->common_private);
- xbt_free(surf_cpu_resource->extension_public);
+ free(surf_cpu_resource->common_public);
+ free(surf_cpu_resource->common_private);
+ free(surf_cpu_resource->extension_public);
- xbt_free(surf_cpu_resource);
+ free(surf_cpu_resource);
surf_cpu_resource = NULL;
if (maxmin_system_cpu_KCCFLN05) {
surf_cpu_resource->common_public->action_free = action_cpu_KCCFLN05_free;
surf_cpu_resource->common_public->action_cancel = NULL;
surf_cpu_resource->common_public->action_recycle = NULL;
- surf_cpu_resource->common_public->action_change_state = surf_action_change_state;
+ surf_cpu_resource->common_public->action_change_state = action_cpu_KCCFLN05_change_state;
surf_cpu_resource->common_public->action_set_data = surf_action_set_data;
surf_cpu_resource->common_public->name = "CPU KCCFLN05";
failed_action_set);
xbt_swag_free(surf_network_resource->common_public->states.
done_action_set);
- xbt_free(surf_network_resource->common_public);
- xbt_free(surf_network_resource->common_private);
- xbt_free(surf_network_resource->extension_public);
+ free(surf_network_resource->common_public);
+ free(surf_network_resource->common_private);
+ free(surf_network_resource->extension_public);
- xbt_free(surf_network_resource);
+ free(surf_network_resource);
surf_network_resource = NULL;
for (i = 0; i < nb_workstation; i++)
for (j = 0; j < nb_workstation; j++)
- xbt_free(ROUTE(i,j).links);
- xbt_free(routing_table);
+ free(ROUTE(i,j).links);
+ free(routing_table);
routing_table = NULL;
nb_workstation = 0;
xbt_swag_free(surf_workstation_resource->common_public->states.failed_action_set);
xbt_swag_free(surf_workstation_resource->common_public->states.done_action_set);
- xbt_free(surf_workstation_resource->common_public);
- xbt_free(surf_workstation_resource->common_private);
- xbt_free(surf_workstation_resource->extension_public);
+ free(surf_workstation_resource->common_public);
+ free(surf_workstation_resource->common_private);
+ free(surf_workstation_resource->extension_public);
- xbt_free(surf_workstation_resource);
+ free(surf_workstation_resource);
surf_workstation_resource = NULL;
}
surf_workstation_resource->common_public->action_get_state =
surf_action_get_state;
surf_workstation_resource->common_public->action_free = action_free;
+ surf_workstation_resource->common_public->action_use = action_use;
surf_workstation_resource->common_public->action_cancel = NULL;
surf_workstation_resource->common_public->action_recycle = NULL;
surf_workstation_resource->common_public->action_change_state = action_change_state;