typedef enum {
SURF_WORKSTATION_RESOURCE_CPU,
SURF_WORKSTATION_RESOURCE_LINK,
-} e_surf_workstation_resource_type_t;
+} e_surf_workstation_model_type_t;
/**************************************/
/********* cpu object *****************/
/**************************************/
typedef struct cpu_L07 {
- surf_resource_t resource; /* Do not move this field */
- e_surf_workstation_resource_type_t type; /* Do not move this field */
+ surf_model_t model; /* Do not move this field */
+ e_surf_workstation_model_type_t type; /* Do not move this field */
char *name; /* Do not move this field */
lmm_constraint_t constraint; /* Do not move this field */
double power_scale;
/**************************************/
typedef struct network_link_L07 {
- surf_resource_t resource; /* Do not move this field */
- e_surf_workstation_resource_type_t type; /* Do not move this field */
+ surf_model_t model; /* Do not move this field */
+ e_surf_workstation_model_type_t type; /* Do not move this field */
char *name; /* Do not move this field */
lmm_constraint_t constraint; /* Do not move this field */
double bw_current;
return xbt_dict_get_or_null(workstation_set, name);
}
-static const char *get_resource_name(void *resource_id)
+static const char *get_model_name(void *model_id)
{
/* We can freely cast as a cpu_L07_t because it has the same
prefix as network_link_L07_t. However, only cpu_L07_t
will theoretically be given as an argument here. */
- return ((cpu_L07_t) resource_id)->name;
+ return ((cpu_L07_t) model_id)->name;
}
/* action_get_state is inherited from the surf module */
/******* Resource Private **********/
/**************************************/
-static int resource_used(void *resource_id)
+static int model_used(void *model_id)
{
/* We can freely cast as a network_link_L07_t because it has
the same prefix as cpu_L07_t */
return lmm_constraint_used(ptask_maxmin_system,
- ((network_link_L07_t) resource_id)->
+ ((network_link_L07_t) model_id)->
constraint);
}
-static double share_resources(double now)
+static double share_models(double now)
{
s_surf_action_workstation_L07_t s_action;
xbt_swag_t running_actions =
- surf_workstation_resource->common_public->states.running_action_set;
- double min = generic_maxmin_share_resources2(running_actions,
+ surf_workstation_model->common_public->states.running_action_set;
+ double min = generic_maxmin_share_models2(running_actions,
xbt_swag_offset(s_action,
variable),
ptask_maxmin_system,
surf_action_workstation_L07_t action = NULL;
surf_action_workstation_L07_t next_action = NULL;
xbt_swag_t running_actions =
- surf_workstation_resource->common_public->states.running_action_set;
+ surf_workstation_model->common_public->states.running_action_set;
xbt_swag_foreach_safe(action, next_action, running_actions) {
DEBUG3("Action (%p) : remains (%g) updated by %g.",
if (action->generic_action.max_duration != NO_MAX_DURATION)
double_update(&(action->generic_action.max_duration), delta);
+ DEBUG2("Action (%p) : remains (%g).",
+ action, action->generic_action.remains);
if ((action->generic_action.remains <= 0) &&
(lmm_get_variable_weight(action->variable) > 0)) {
action->generic_action.finish = surf_get_clock();
action->generic_action.finish = surf_get_clock();
surf_action_change_state((surf_action_t) action, SURF_ACTION_DONE);
} else {
- /* Need to check that none of the resource has failed */
+ /* Need to check that none of the model has failed */
lmm_constraint_t cnst = NULL;
int i = 0;
void *constraint_id = NULL;
return;
}
-static void update_resource_state(void *id,
+static void update_model_state(void *id,
tmgr_trace_event_t event_type,
double value)
{
if (parallel_task_network_link_set != NULL) {
xbt_dict_free(¶llel_task_network_link_set);
}
- xbt_swag_free(surf_workstation_resource->common_public->states.
+ xbt_swag_free(surf_workstation_model->common_public->states.
ready_action_set);
- xbt_swag_free(surf_workstation_resource->common_public->states.
+ xbt_swag_free(surf_workstation_model->common_public->states.
running_action_set);
- xbt_swag_free(surf_workstation_resource->common_public->states.
+ xbt_swag_free(surf_workstation_model->common_public->states.
failed_action_set);
- xbt_swag_free(surf_workstation_resource->common_public->states.
+ xbt_swag_free(surf_workstation_model->common_public->states.
done_action_set);
- free(surf_workstation_resource->common_public);
- free(surf_workstation_resource->common_private);
- free(surf_workstation_resource->extension_public);
+ free(surf_workstation_model->common_public);
+ free(surf_workstation_model->common_private);
+ free(surf_workstation_model->extension_public);
- free(surf_workstation_resource);
- surf_workstation_resource = NULL;
+ free(surf_workstation_model);
+ surf_workstation_model = NULL;
for (i = 0; i < nb_workstation; i++)
for (j = 0; j < nb_workstation; j++)
/******* Resource Private **********/
/**************************************/
-static e_surf_cpu_state_t resource_get_state(void *cpu)
+static e_surf_cpu_state_t model_get_state(void *cpu)
{
return ((cpu_L07_t) cpu)->state_current;
}
xbt_dict_new_ext(workstation_nb * workstation_nb * 10);
}
- /* Compute the number of affected resources... */
+ /* Compute the number of affected models... */
for (i = 0; i < workstation_nb; i++) {
for (j = 0; j < workstation_nb; j++) {
cpu_L07_t card_src = workstation_list[i];
nb_link = xbt_dict_length(parallel_task_network_link_set);
xbt_dict_reset(parallel_task_network_link_set);
-
for (i = 0; i < workstation_nb; i++)
if (computation_amount[i] > 0)
nb_host++;
-
- if (nb_link + nb_host == 0) /* was workstation_nb... */
- return NULL;
-
action = xbt_new0(s_surf_action_workstation_L07_t, 1);
DEBUG3("Creating a parallel task (%p) with %d cpus and %d links.",
- action, nb_host, nb_link);
+ action, workstation_nb, nb_link);
action->generic_action.using = 1;
action->generic_action.cost = amount;
action->generic_action.remains = amount;
action->generic_action.max_duration = NO_MAX_DURATION;
action->generic_action.start = -1.0;
action->generic_action.finish = -1.0;
- action->generic_action.resource_type =
- (surf_resource_t) surf_workstation_resource;
+ action->generic_action.model_type =
+ (surf_model_t) surf_workstation_model;
action->suspended = 0; /* Should be useless because of the
calloc but it seems to help valgrind... */
action->generic_action.state_set =
- surf_workstation_resource->common_public->states.running_action_set;
+ surf_workstation_model->common_public->states.running_action_set;
xbt_swag_insert(action, action->generic_action.state_set);
action->rate = rate;
if (action->rate > 0)
action->variable =
lmm_variable_new(ptask_maxmin_system, action, 1.0, -1.0,
- nb_host + nb_link);
+ workstation_nb + nb_link);
else
action->variable =
lmm_variable_new(ptask_maxmin_system, action, 1.0, action->rate,
- nb_host + nb_link);
+ workstation_nb + nb_link);
for (i = 0; i < workstation_nb; i++)
- if (computation_amount[i] > 0)
- lmm_expand(ptask_maxmin_system,
- ((cpu_L07_t) workstation_list[i])->constraint,
- action->variable, computation_amount[i]);
-
+ lmm_expand(ptask_maxmin_system,
+ ((cpu_L07_t) workstation_list[i])->constraint,
+ action->variable, computation_amount[i]);
+
for (i = 0; i < workstation_nb; i++) {
for (j = 0; j < workstation_nb; j++) {
cpu_L07_t card_src = workstation_list[i];
cpu_L07_t card_dst = workstation_list[j];
int route_size = ROUTE(card_src->id, card_dst->id).size;
network_link_L07_t *route = ROUTE(card_src->id, card_dst->id).links;
-
+
+ if (communication_amount[i * workstation_nb + j] == 0.0)
+ continue;
for (k = 0; k < route_size; k++) {
- if (communication_amount[i * workstation_nb + j] > 0) {
lmm_expand_add(ptask_maxmin_system, route[k]->constraint,
action->variable,
communication_amount[i * workstation_nb + j]);
- }
}
}
}
+ if (nb_link + nb_host == 0) {
+ action->generic_action.cost = 1.0;
+ action->generic_action.remains = 0.0;
+ }
+
return (surf_action_t) action;
}
surf_action_t res = NULL;
workstation_list[0] = src;
- workstation_list[1] = src;
+ workstation_list[1] = dst;
communication_amount[1] = size;
res = execute_parallel_task(2, workstation_list,
static double get_link_latency(const void *link)
{
- xbt_assert0(0, "This model does not implement latencies");
+ static int warned = 0;
+
+ if(!warned) {
+ WARN0("This model does not take latency into account.");
+ warned = 1;
+ }
+ return 0.0;
}
/**************************************/
{
cpu_L07_t cpu = xbt_new0(s_cpu_L07_t, 1);
- cpu->resource = (surf_resource_t) surf_workstation_resource;
+ cpu->model = (surf_model_t) surf_workstation_model;
cpu->type = SURF_WORKSTATION_RESOURCE_CPU;
cpu->name = xbt_strdup(name);
cpu->id = nb_workstation++;
network_link_L07_t nw_link = xbt_new0(s_network_link_L07_t, 1);
- nw_link->resource = (surf_resource_t) surf_workstation_resource;
+ nw_link->model = (surf_model_t) surf_workstation_model;
nw_link->type = SURF_WORKSTATION_RESOURCE_LINK;
nw_link->name = name;
nw_link->bw_current = bw_initial;
/********* Module creation ***********/
/**************************************/
-static void resource_init_internal(void)
+static void model_init_internal(void)
{
s_surf_action_t action;
- surf_workstation_resource = xbt_new0(s_surf_workstation_resource_t, 1);
+ surf_workstation_model = xbt_new0(s_surf_workstation_model_t, 1);
- surf_workstation_resource->common_private =
- xbt_new0(s_surf_resource_private_t, 1);
- surf_workstation_resource->common_public =
- xbt_new0(s_surf_resource_public_t, 1);
- surf_workstation_resource->extension_public =
- xbt_new0(s_surf_workstation_resource_extension_public_t, 1);
+ surf_workstation_model->common_private =
+ xbt_new0(s_surf_model_private_t, 1);
+ surf_workstation_model->common_public =
+ xbt_new0(s_surf_model_public_t, 1);
+ surf_workstation_model->extension_public =
+ xbt_new0(s_surf_workstation_model_extension_public_t, 1);
- surf_workstation_resource->common_public->states.ready_action_set =
+ surf_workstation_model->common_public->states.ready_action_set =
xbt_swag_new(xbt_swag_offset(action, state_hookup));
- surf_workstation_resource->common_public->states.running_action_set =
+ surf_workstation_model->common_public->states.running_action_set =
xbt_swag_new(xbt_swag_offset(action, state_hookup));
- surf_workstation_resource->common_public->states.failed_action_set =
+ surf_workstation_model->common_public->states.failed_action_set =
xbt_swag_new(xbt_swag_offset(action, state_hookup));
- surf_workstation_resource->common_public->states.done_action_set =
+ surf_workstation_model->common_public->states.done_action_set =
xbt_swag_new(xbt_swag_offset(action, state_hookup));
- surf_workstation_resource->common_public->name_service = name_service;
- surf_workstation_resource->common_public->get_resource_name =
- get_resource_name;
- surf_workstation_resource->common_public->action_get_state =
+ surf_workstation_model->common_public->name_service = name_service;
+ surf_workstation_model->common_public->get_model_name =
+ get_model_name;
+ surf_workstation_model->common_public->action_get_state =
surf_action_get_state;
- surf_workstation_resource->common_public->action_get_start_time =
+ surf_workstation_model->common_public->action_get_start_time =
surf_action_get_start_time;
- surf_workstation_resource->common_public->action_get_finish_time =
+ surf_workstation_model->common_public->action_get_finish_time =
surf_action_get_finish_time;
- surf_workstation_resource->common_public->action_use = action_use;
- surf_workstation_resource->common_public->action_free = action_free;
- surf_workstation_resource->common_public->action_cancel = action_cancel;
- surf_workstation_resource->common_public->action_recycle =
+ surf_workstation_model->common_public->action_use = action_use;
+ surf_workstation_model->common_public->action_free = action_free;
+ surf_workstation_model->common_public->action_cancel = action_cancel;
+ surf_workstation_model->common_public->action_recycle =
action_recycle;
- surf_workstation_resource->common_public->action_change_state =
+ surf_workstation_model->common_public->action_change_state =
surf_action_change_state;
- surf_workstation_resource->common_public->action_set_data =
+ surf_workstation_model->common_public->action_set_data =
surf_action_set_data;
- surf_workstation_resource->common_public->suspend = action_suspend;
- surf_workstation_resource->common_public->resume = action_resume;
- surf_workstation_resource->common_public->is_suspended =
+ surf_workstation_model->common_public->suspend = action_suspend;
+ surf_workstation_model->common_public->resume = action_resume;
+ surf_workstation_model->common_public->is_suspended =
action_is_suspended;
- surf_workstation_resource->common_public->set_max_duration =
+ surf_workstation_model->common_public->set_max_duration =
action_set_max_duration;
- surf_workstation_resource->common_public->set_priority =
+ surf_workstation_model->common_public->set_priority =
action_set_priority;
- surf_workstation_resource->common_public->name = "Workstation ptask_L07";
+ surf_workstation_model->common_public->name = "Workstation ptask_L07";
- surf_workstation_resource->common_private->resource_used = resource_used;
- surf_workstation_resource->common_private->share_resources =
- share_resources;
- surf_workstation_resource->common_private->update_actions_state =
+ surf_workstation_model->common_private->model_used = model_used;
+ surf_workstation_model->common_private->share_models =
+ share_models;
+ surf_workstation_model->common_private->update_actions_state =
update_actions_state;
- surf_workstation_resource->common_private->update_resource_state =
- update_resource_state;
- surf_workstation_resource->common_private->finalize = finalize;
-
- surf_workstation_resource->extension_public->execute = execute;
- surf_workstation_resource->extension_public->sleep = action_sleep;
- surf_workstation_resource->extension_public->get_state =
- resource_get_state;
- surf_workstation_resource->extension_public->get_speed = get_speed;
- surf_workstation_resource->extension_public->get_available_speed =
+ surf_workstation_model->common_private->update_model_state =
+ update_model_state;
+ surf_workstation_model->common_private->finalize = finalize;
+
+ surf_workstation_model->extension_public->execute = execute;
+ surf_workstation_model->extension_public->sleep = action_sleep;
+ surf_workstation_model->extension_public->get_state =
+ model_get_state;
+ surf_workstation_model->extension_public->get_speed = get_speed;
+ surf_workstation_model->extension_public->get_available_speed =
get_available_speed;
- surf_workstation_resource->extension_public->communicate = communicate;
- surf_workstation_resource->extension_public->execute_parallel_task =
+ surf_workstation_model->extension_public->communicate = communicate;
+ surf_workstation_model->extension_public->execute_parallel_task =
execute_parallel_task;
- surf_workstation_resource->extension_public->get_route = get_route;
- surf_workstation_resource->extension_public->get_route_size =
+ surf_workstation_model->extension_public->get_route = get_route;
+ surf_workstation_model->extension_public->get_route_size =
get_route_size;
- surf_workstation_resource->extension_public->get_link_name =
+ surf_workstation_model->extension_public->get_link_name =
get_link_name;
- surf_workstation_resource->extension_public->get_link_bandwidth =
+ surf_workstation_model->extension_public->get_link_bandwidth =
get_link_bandwidth;
- surf_workstation_resource->extension_public->get_link_latency =
+ surf_workstation_model->extension_public->get_link_latency =
get_link_latency;
workstation_set = xbt_dict_new();
/**************************************/
/*************** Generic **************/
/**************************************/
-void surf_workstation_resource_init_ptask_L07(const char *filename)
+void surf_workstation_model_init_ptask_L07(const char *filename)
{
- xbt_assert0(!surf_cpu_resource, "CPU resource type already defined");
- xbt_assert0(!surf_network_resource,
- "network resource type already defined");
- resource_init_internal();
+ xbt_assert0(!surf_cpu_model, "CPU model type already defined");
+ xbt_assert0(!surf_network_model,
+ "network model type already defined");
+ model_init_internal();
parse_file(filename);
+ WARN0("This model does not take latency into account.");
- update_resource_description(surf_workstation_resource_description,
- surf_workstation_resource_description_size,
+ update_model_description(surf_workstation_model_description,
+ surf_workstation_model_description_size,
"ptask_L07",
- (surf_resource_t) surf_workstation_resource);
- xbt_dynar_push(resource_list, &surf_workstation_resource);
+ (surf_model_t) surf_workstation_model);
+ xbt_dynar_push(model_list, &surf_workstation_model);
}
