#include "xbt/ex.h"
#include "xbt/dict.h"
-#include "gras_config.h"
+#include "portable.h"
#include "workstation_private.h"
#include "cpu_private.h"
-#include "network_private.h"
+#include "network_common.h"
+
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_workstation, surf,
+ "Logging specific to the SURF workstation module");
surf_workstation_model_t surf_workstation_model = NULL;
xbt_dict_t workstation_set = NULL;
-static xbt_dict_t parallel_task_network_link_set = NULL;
static workstation_CLM03_t workstation_new(const char *name,
void *cpu, void *card)
free(workstation);
}
-static void create_workstations(void)
+void create_workstations(void)
{
xbt_dict_cursor_t cursor = NULL;
char *name = NULL;
return xbt_dict_get_or_null(workstation_set, name);
}
-static const char *get_model_name(void *model_id)
+static const char *get_resource_name(void *resource_id)
{
- return ((workstation_CLM03_t) model_id)->name;
+ return ((workstation_CLM03_t) resource_id)->name;
}
-static int model_used(void *model_id)
+static int resource_used(void *resource_id)
{
- xbt_assert0(0,
- "Workstation is a virtual model. I should not be there!");
- return 0;
+ THROW_IMPOSSIBLE; /* This model does not implement parallel tasks */
+}
+
+static void parallel_action_cancel(surf_action_t action)
+{
+ THROW_UNIMPLEMENTED; /* This model does not implement parallel tasks */
}
static int parallel_action_free(surf_action_t action)
{
- action->using--;
- if (!action->using) {
- xbt_swag_remove(action, action->state_set);
- if (((surf_action_parallel_task_CSL05_t) action)->variable)
- lmm_variable_free(maxmin_system,
- ((surf_action_parallel_task_CSL05_t) action)->
- variable);
- free(action);
- return 1;
- }
- return 0;
+ THROW_UNIMPLEMENTED; /* This model does not implement parallel tasks */
}
static void parallel_action_use(surf_action_t action)
{
- action->using++;
+ THROW_UNIMPLEMENTED; /* This model does not implement parallel tasks */
}
static int action_free(surf_action_t action)
surf_cpu_model->common_public->action_cancel(action);
else if (action->model_type ==
(surf_model_t) surf_workstation_model)
- parallel_action_use(action);
+ parallel_action_cancel(action);
else
DIE_IMPOSSIBLE;
return;
return;
}
-static double share_models(double now)
+static double share_resources(double now)
{
- s_surf_action_parallel_task_CSL05_t action;
- return generic_maxmin_share_models(surf_workstation_model->
- common_public->states.
- running_action_set,
- xbt_swag_offset(action, variable));
+ return -1.0;
}
static void update_actions_state(double now, double delta)
{
- surf_action_parallel_task_CSL05_t action = NULL;
- surf_action_parallel_task_CSL05_t next_action = NULL;
- xbt_swag_t running_actions =
- surf_workstation_model->common_public->states.running_action_set;
- /* FIXME: unused
- xbt_swag_t failed_actions =
- surf_workstation_model->common_public->states.failed_action_set;
- */
-
- xbt_swag_foreach_safe(action, next_action, running_actions) {
- double_update(&(action->generic_action.remains),
- lmm_variable_getvalue(action->variable) * delta);
- if (action->generic_action.max_duration != NO_MAX_DURATION)
- double_update(&(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();
- action_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();
- action_change_state((surf_action_t) action, SURF_ACTION_DONE);
- } else { /* Need to check that none of the model has failed */
- lmm_constraint_t cnst = NULL;
- int i = 0;
- surf_model_t model = NULL;
-
- while ((cnst =
- lmm_get_cnst_from_var(maxmin_system, action->variable,
- i++))) {
- model = (surf_model_t) lmm_constraint_id(cnst);
- if (model == (surf_model_t) surf_cpu_model) {
- cpu_Cas01_t cpu = lmm_constraint_id(cnst);
- if (cpu->state_current == SURF_CPU_OFF) {
- action->generic_action.finish = surf_get_clock();
- action_change_state((surf_action_t) action,
- SURF_ACTION_FAILED);
- break;
- }
- } else if (model == (surf_model_t) surf_network_model) {
- network_link_CM02_t nw_link = lmm_constraint_id(cnst);
-
- if (nw_link->state_current == SURF_NETWORK_LINK_OFF) {
- action->generic_action.finish = surf_get_clock();
- action_change_state((surf_action_t) action,
- SURF_ACTION_FAILED);
- break;
- }
- }
- }
- }
- }
-
return;
}
-static void update_model_state(void *id,
+static void update_resource_state(void *id,
tmgr_trace_event_t event_type,
- double value)
+ double value, double date)
{
- return;
+ THROW_IMPOSSIBLE; /* This model does not implement parallel tasks */
}
static surf_action_t execute(void *workstation, double size)
get_available_speed(((workstation_CLM03_t) workstation)->cpu);
}
-static surf_action_t execute_parallel_task_bogus(int workstation_nb,
- void **workstation_list,
- double
- *computation_amount,
- double
- *communication_amount,
- double amount,
- double rate)
+static xbt_dict_t get_properties(void *workstation)
{
- xbt_assert0(0, "This model does not implement parallel tasks");
+ return surf_cpu_model->common_public->
+ get_properties(((workstation_CLM03_t) workstation)->cpu);
}
static surf_action_t execute_parallel_task(int workstation_nb,
void **workstation_list,
double *computation_amount,
double *communication_amount,
- double amount, double rate)
+ double amount,
+ double rate)
{
- surf_action_parallel_task_CSL05_t action = NULL;
- int i, j, k;
- int nb_link = 0;
- int nb_host = 0;
-
- if (parallel_task_network_link_set == NULL) {
- parallel_task_network_link_set =
- xbt_dict_new_ext(workstation_nb * workstation_nb * 10);
- }
-
- /* Compute the number of affected models... */
- for (i = 0; i < workstation_nb; i++) {
- for (j = 0; j < workstation_nb; j++) {
- network_card_CM02_t card_src =
- ((workstation_CLM03_t *) workstation_list)[i]->network_card;
- network_card_CM02_t card_dst =
- ((workstation_CLM03_t *) workstation_list)[j]->network_card;
- int route_size = ROUTE_SIZE(card_src->id, card_dst->id);
- network_link_CM02_t *route = ROUTE(card_src->id, card_dst->id);
-
- if (communication_amount[i * workstation_nb + j] > 0)
- for (k = 0; k < route_size; k++) {
- xbt_dict_set(parallel_task_network_link_set, route[k]->name,
- route[k], NULL);
- }
- }
- }
-
- 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 + workstation_nb == 0)
- return NULL;
-
- action = xbt_new0(s_surf_action_parallel_task_CSL05_t, 1);
- 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 = surf_get_clock();
- action->generic_action.finish = -1.0;
- 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_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(maxmin_system, action, 1.0, -1.0,
- nb_host + nb_link);
- else
- action->variable =
- lmm_variable_new(maxmin_system, action, 1.0, action->rate,
- nb_host + nb_link);
-
- for (i = 0; i < workstation_nb; i++)
- if (computation_amount[i] > 0)
- lmm_expand(maxmin_system,
- ((cpu_Cas01_t)
- ((workstation_CLM03_t) workstation_list[i])->cpu)->
- constraint, action->variable, computation_amount[i]);
-
- for (i = 0; i < workstation_nb; i++) {
- for (j = 0; j < workstation_nb; j++) {
- network_card_CM02_t card_src =
- ((workstation_CLM03_t *) workstation_list)[i]->network_card;
- network_card_CM02_t card_dst =
- ((workstation_CLM03_t *) workstation_list)[j]->network_card;
- int route_size = ROUTE_SIZE(card_src->id, card_dst->id);
- network_link_CM02_t *route = ROUTE(card_src->id, card_dst->id);
-
- for (k = 0; k < route_size; k++) {
- if (communication_amount[i * workstation_nb + j] > 0) {
- lmm_expand_add(maxmin_system, route[k]->constraint,
- action->variable,
- communication_amount[i * workstation_nb + j]);
- }
- }
- }
- }
-
- return (surf_action_t) action;
+ THROW_UNIMPLEMENTED; /* This model does not implement parallel tasks */
}
+
/* returns an array of network_link_CM02_t */
static const void **get_route(void *src, void *dst)
{
return surf_network_model->extension_public->get_link_latency(link);
}
+static int link_shared(const void *link)
+{
+ return surf_network_model->extension_public->get_link_latency(link);
+}
+
static void finalize(void)
{
xbt_dict_free(&workstation_set);
xbt_swag_new(xbt_swag_offset(action, state_hookup));
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->get_resource_name =
+ get_resource_name;
surf_workstation_model->common_public->action_get_state =
surf_action_get_state;
surf_workstation_model->common_public->action_get_start_time =
surf_action_set_data;
surf_workstation_model->common_public->name = "Workstation";
- surf_workstation_model->common_private->model_used = model_used;
- surf_workstation_model->common_private->share_models =
- share_models;
+ surf_workstation_model->common_private->resource_used = resource_used;
+ surf_workstation_model->common_private->share_resources =
+ share_resources;
surf_workstation_model->common_private->update_actions_state =
update_actions_state;
- surf_workstation_model->common_private->update_model_state =
- update_model_state;
+ surf_workstation_model->common_private->update_resource_state =
+ update_resource_state;
surf_workstation_model->common_private->finalize = finalize;
surf_workstation_model->common_public->suspend = action_suspend;
surf_workstation_model->extension_public->get_speed = get_speed;
surf_workstation_model->extension_public->get_available_speed =
get_available_speed;
+
+ /*manage the properties of the workstation*/
+ surf_workstation_model->common_public->get_properties = get_properties;
+
surf_workstation_model->extension_public->communicate = communicate;
surf_workstation_model->extension_public->execute_parallel_task =
- execute_parallel_task_bogus;
+ execute_parallel_task;
surf_workstation_model->extension_public->get_route = get_route;
surf_workstation_model->extension_public->get_route_size =
get_route_size;
get_link_bandwidth;
surf_workstation_model->extension_public->get_link_latency =
get_link_latency;
- workstation_set = xbt_dict_new();
+ surf_workstation_model->extension_public->link_shared =
+ link_shared;
- xbt_assert0(maxmin_system, "surf_init has to be called first!");
+ workstation_set = xbt_dict_new();
}
/********************************************************************/
surf_workstation_model_init_internal();
surf_cpu_model_init_Cas01(filename);
surf_network_model_init_CM02(filename);
- create_workstations();
update_model_description(surf_workstation_model_description,
- surf_workstation_model_description_size,
- "CLM03",
- (surf_model_t) surf_workstation_model);
+ "CLM03",
+ (surf_model_t) surf_workstation_model);
xbt_dynar_push(model_list, &surf_workstation_model);
}
xbt_assert0(surf_cpu_model, "No CPU model defined yet!");
xbt_assert0(surf_network_model, "No network model defined yet!");
surf_workstation_model_init_internal();
- create_workstations();
update_model_description(surf_workstation_model_description,
- surf_workstation_model_description_size,
- "compound",
- (surf_model_t) surf_workstation_model);
+ "compound",
+ (surf_model_t) surf_workstation_model);
xbt_dynar_push(model_list, &surf_workstation_model);
}