/************ 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,
tmgr_trace_t state_trace,
double interference_send,
double interference_recv,
- double interference_send_recv)
+ double interference_send_recv,
+ double max_outgoing_rate)
{
workstation_KCCFLN05_t workstation = xbt_new0(s_workstation_KCCFLN05_t, 1);
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 =
workstation->constraint =
lmm_constraint_new(maxmin_system_cpu_KCCFLN05, workstation,
workstation->power_current * workstation->power_scale);
+ if(max_outgoing_rate>0)
+ workstation->bus=
+ lmm_constraint_new(maxmin_system_cpu_KCCFLN05, workstation,
+ max_outgoing_rate);
workstation->incomming_communications =
xbt_dynar_new(sizeof(surf_action_network_KCCFLN05_t),NULL);
double interference_send = 0.0;
double interference_recv = 0.0;
double interference_send_recv = 0.0;
-
+ double max_outgoing_rate = -1.0;
+
surf_parse_get_double(&power_scale,A_cpu_power);
surf_parse_get_double(&power_initial,A_cpu_availability);
surf_parse_get_trace(&power_trace,A_cpu_availability_file);
surf_parse_get_double(&interference_send,A_cpu_interference_send);
surf_parse_get_double(&interference_recv,A_cpu_interference_recv);
surf_parse_get_double(&interference_send_recv,A_cpu_interference_send_recv);
+ surf_parse_get_double(&max_outgoing_rate,A_cpu_max_outgoing_rate);
workstation_new(A_cpu_name, power_scale, power_initial, power_trace, state_initial,
state_trace, interference_send, interference_recv,
- interference_send_recv);
+ interference_send_recv, max_outgoing_rate);
}
/*********** resource management ***********/
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;
}
surf_network_resource->common_public->states.failed_action_set;
xbt_swag_foreach_safe(action, next_action, running_actions) {
- action->generic_action.remains -=
- lmm_variable_getvalue(action->variable) * delta;
+ surf_double_update(&(action->generic_action.remains),
+ lmm_variable_getvalue(action->variable) * delta);
if (action->generic_action.max_duration != NO_MAX_DURATION)
- action->generic_action.max_duration -= delta;
- if ((action->generic_action.remains <= 0) &&
+ surf_double_update(&(action->generic_action.max_duration), delta);
+ if ((action->generic_action.remains <= 0.0) &&
(lmm_get_variable_weight(action->variable)>0)) {
action->generic_action.finish = surf_get_clock();
action_network_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.max_duration <= 0.0)) {
action->generic_action.finish = surf_get_clock();
action_network_KCCFLN05_change_state((surf_action_t) action, SURF_ACTION_DONE);
} else { /* Need to check that none of the resource has failed */
}
}
- xbt_swag_foreach_safe(action, next_action, failed_actions) {
- lmm_variable_disable(maxmin_system_network_KCCFLN05, action->variable);
- }
-
return;
}
-static surf_action_t communicate_KCCFLN05(void *src, void *dst, double size)
+static surf_action_t communicate_KCCFLN05(void *src, void *dst, double size,
+ double rate)
{
surf_action_network_KCCFLN05_t action = NULL;
workstation_KCCFLN05_t card_src = src;
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;
xbt_swag_insert(action, action->generic_action.state_set);
- action->variable = lmm_variable_new(maxmin_system_network_KCCFLN05, action, 1.0, -1.0,
- route->size);
+ if(rate>0)
+ action->variable = lmm_variable_new(maxmin_system_network_KCCFLN05, action, 1.0, rate,
+ route->size+1);
+ else
+ action->variable = lmm_variable_new(maxmin_system_network_KCCFLN05, action, 1.0, -1.0,
+ route->size+1);
for (i = 0; i < route->size; i++)
lmm_expand(maxmin_system_network_KCCFLN05, route->links[i]->constraint,
action->variable, 1.0);
+ if(card_src->bus)
+ lmm_expand(maxmin_system_network_KCCFLN05, card_src->bus,
+ action->variable, 1.0);
+
action->src=src;
action->dst=dst;
return (surf_action_t) action;
}
+static void network_KCCFLN05_action_suspend(surf_action_t action)
+{
+ lmm_update_variable_weight(maxmin_system_network_KCCFLN05,
+ ((surf_action_network_KCCFLN05_t) action)->variable, 0.0);
+}
+
+static void network_KCCFLN05_action_resume(surf_action_t action)
+{
+ lmm_update_variable_weight(maxmin_system_network_KCCFLN05,
+ ((surf_action_network_KCCFLN05_t) action)->variable, 1.0);
+}
+
+static int network_KCCFLN05_action_is_suspended(surf_action_t action)
+{
+ return (lmm_get_variable_weight(((surf_action_network_KCCFLN05_t) action)->variable) == 0.0);
+}
+
+static void network_KCCFLN05_action_set_max_duration(surf_action_t action, double duration)
+{
+ action->max_duration = 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;
}
-/* #define WARNING(format, ...) (fprintf(stderr, "[%s , %s : %d] ", __FILE__, __FUNCTION__, __LINE__),\ */
-/* fprintf(stderr, format, ## __VA_ARGS__), \ */
-/* fprintf(stderr, "\n")) */
-/* #define VOIRP(expr) WARNING(" {" #expr " = %p }", expr) */
-/* #define VOIRD(expr) WARNING(" {" #expr " = %d }", expr) */
-/* #define VOIRG(expr) WARNING(" {" #expr " = %lg }", expr) */
+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;
+}
static double share_cpu_KCCFLN05_resources(double now)
{
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_src *
lmm_variable_getvalue(action->variable);
}
- xbt_assert0(scale>0.0,"Negative interference !");
+ if(scale<0.0) scale=0.0;
+ xbt_assert0(scale>=0.0,"Negative interference !");
} else if((xbt_dynar_length(workstation->incomming_communications)) &&
(!xbt_dynar_length(workstation->outgoing_communications))) {
scale = workstation->interference_recv;
scale -= ROUTE(action->src->id,action->dst->id).impact_on_dst *
lmm_variable_getvalue(action->variable);
}
- xbt_assert0(scale>0.0,"Negative interference !");
+ if(scale<0.0) scale=0.0;
+ xbt_assert0(scale>=0.0,"Negative interference !");
} else {
scale = workstation->interference_send_recv;
xbt_dynar_foreach (workstation->outgoing_communications,cpt,action) {
scale -= ROUTE(action->src->id,action->dst->id).impact_on_dst_with_other_send *
lmm_variable_getvalue(action->variable);
}
- xbt_assert0(scale>0.0,"Negative interference !");
+ if(scale<0.0) scale=0.1;
+ xbt_assert0(scale>=0.0,"Negative interference !");
}
lmm_update_constraint_bound(maxmin_system_cpu_KCCFLN05,workstation->constraint,
W*scale);
surf_cpu_resource->common_public->states.failed_action_set;
xbt_swag_foreach_safe(action, next_action, running_actions) {
- action->generic_action.remains -=
- lmm_variable_getvalue(action->variable) * delta;
+ surf_double_update(&(action->generic_action.remains),
+ lmm_variable_getvalue(action->variable) * delta);
if (action->generic_action.max_duration != NO_MAX_DURATION)
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();
- 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 cpu_KCCFLN05_action_suspend(surf_action_t action)
{
- if(action->resource_type==(surf_resource_t)surf_network_resource)
- lmm_update_variable_weight(maxmin_system_network_KCCFLN05,
- ((surf_action_network_KCCFLN05_t) action)->variable, 0.0);
- else if(action->resource_type==(surf_resource_t)surf_cpu_resource)
- lmm_update_variable_weight(maxmin_system_cpu_KCCFLN05,
- ((surf_action_cpu_KCCFLN05_t) action)->variable, 0.0);
- else DIE_IMPOSSIBLE;
+ lmm_update_variable_weight(maxmin_system_cpu_KCCFLN05,
+ ((surf_action_cpu_KCCFLN05_t) action)->variable, 0.0);
}
static void cpu_KCCFLN05_action_resume(surf_action_t action)
{
- if(action->resource_type==(surf_resource_t)surf_network_resource)
- lmm_update_variable_weight(maxmin_system_network_KCCFLN05,
- ((surf_action_network_KCCFLN05_t) action)->variable, 1.0);
- else if(action->resource_type==(surf_resource_t)surf_cpu_resource)
- lmm_update_variable_weight(maxmin_system_cpu_KCCFLN05,
- ((surf_action_cpu_KCCFLN05_t) action)->variable, 1.0);
- else DIE_IMPOSSIBLE;
+ lmm_update_variable_weight(maxmin_system_cpu_KCCFLN05,
+ ((surf_action_cpu_KCCFLN05_t) action)->variable, 1.0);
}
static int cpu_KCCFLN05_action_is_suspended(surf_action_t action)
{
- if(action->resource_type==(surf_resource_t)surf_network_resource)
- return (lmm_get_variable_weight(((surf_action_cpu_KCCFLN05_t) action)->variable) == 0.0);
- if(action->resource_type==(surf_resource_t)surf_cpu_resource)
- return (lmm_get_variable_weight(((surf_action_network_KCCFLN05_t) action)->variable) == 0.0);
- DIE_IMPOSSIBLE;
+ return (lmm_get_variable_weight(((surf_action_cpu_KCCFLN05_t) action)->variable) == 0.0);
+}
+
+static void cpu_KCCFLN05_action_set_max_duration(surf_action_t action, double duration)
+{
+ action->max_duration = duration;
}
/************* workstation ************/
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;
}
static void action_suspend(surf_action_t action)
{
- xbt_assert0(action->resource_type ==
- ((surf_resource_t) surf_cpu_resource),
- "Resource type mismatch");
- surf_cpu_resource->extension_public->suspend(action);
+ if(action->resource_type==(surf_resource_t)surf_network_resource)
+ surf_network_resource->common_public->suspend(action);
+ else if(action->resource_type==(surf_resource_t)surf_cpu_resource)
+ surf_cpu_resource->common_public->suspend(action);
+ else DIE_IMPOSSIBLE;
}
static void action_resume(surf_action_t action)
{
- xbt_assert0(action->resource_type ==
- ((surf_resource_t) surf_cpu_resource),
- "Resource type mismatch");
- surf_cpu_resource->extension_public->resume(action);
+ if(action->resource_type==(surf_resource_t)surf_network_resource)
+ surf_network_resource->common_public->resume(action);
+ else if(action->resource_type==(surf_resource_t)surf_cpu_resource)
+ surf_cpu_resource->common_public->resume(action);
+ else DIE_IMPOSSIBLE;
}
static int action_is_suspended(surf_action_t action)
{
if(action->resource_type==(surf_resource_t)surf_network_resource)
- return 0;
+ return surf_network_resource->common_public->is_suspended(action);
if(action->resource_type==(surf_resource_t)surf_cpu_resource)
- return surf_cpu_resource->extension_public->is_suspended(action);
+ return surf_cpu_resource->common_public->is_suspended(action);
+ DIE_IMPOSSIBLE;
+}
+
+static void action_set_max_duration(surf_action_t action, double duration)
+{
+ if(action->resource_type==(surf_resource_t)surf_network_resource)
+ return surf_network_resource->common_public->set_max_duration(action,duration);
+ if(action->resource_type==(surf_resource_t)surf_cpu_resource)
+ return surf_cpu_resource->common_public->set_max_duration(action,duration);
DIE_IMPOSSIBLE;
}
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";
surf_cpu_resource->extension_public->execute = execute_KCCFLN05;
/*FIXME*//* surf_cpu_resource->extension_public->sleep = action_sleep; */
- surf_cpu_resource->extension_public->suspend = cpu_KCCFLN05_action_suspend;
- surf_cpu_resource->extension_public->resume = cpu_KCCFLN05_action_resume;
- surf_cpu_resource->extension_public->is_suspended = cpu_KCCFLN05_action_is_suspended;
+
+ surf_cpu_resource->common_public->suspend = cpu_KCCFLN05_action_suspend;
+ surf_cpu_resource->common_public->resume = cpu_KCCFLN05_action_resume;
+ surf_cpu_resource->common_public->is_suspended = cpu_KCCFLN05_action_is_suspended;
surf_cpu_resource->extension_public->get_state = get_state;
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;
update_network_KCCFLN05_state;
surf_network_resource->common_private->finalize = network_KCCFLN05_finalize;
- surf_network_resource->extension_public->communicate = communicate_KCCFLN05;
+ surf_network_resource->common_public->suspend = network_KCCFLN05_action_suspend;
+ surf_network_resource->common_public->resume = network_KCCFLN05_action_resume;
+ surf_network_resource->common_public->is_suspended = network_KCCFLN05_action_is_suspended;
+
+ surf_network_resource->extension_public->communicate = communicate_KCCFLN05;
network_link_set = xbt_dict_new();
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;
surf_workstation_resource->common_private->update_resource_state = update_resource_state;
surf_workstation_resource->common_private->finalize = workstation_KCCFLN05_finalize;
+
+ surf_workstation_resource->common_public->suspend = action_suspend;
+ surf_workstation_resource->common_public->resume = action_resume;
+ surf_workstation_resource->common_public->is_suspended = action_is_suspended;
+ surf_workstation_resource->common_public->set_max_duration = action_set_max_duration;
+
surf_workstation_resource->extension_public->execute = execute_KCCFLN05;
/*FIXME*//* surf_workstation_resource->extension_public->sleep = action_sleep; */
- surf_workstation_resource->extension_public->suspend = action_suspend;
- surf_workstation_resource->extension_public->resume = action_resume;
- surf_workstation_resource->extension_public->is_suspended = action_is_suspended;
surf_workstation_resource->extension_public->get_state = get_state;
surf_workstation_resource->extension_public->communicate = communicate_KCCFLN05;
}
