/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
+#include "xbt/ex.h"
#include "xbt/dict.h"
#include "workstation_private.h"
#include "cpu_private.h"
#include "network_private.h"
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(workstation, surf,
- "Logging specific to the SURF workstation module");
-
surf_workstation_resource_t surf_workstation_resource = NULL;
xbt_dict_t workstation_set = NULL;
static void create_workstations(void)
{
- xbt_dict_cursor_t cursor = NULL;
+ xbt_dict_cursor_t cursor = NULL;
char *name = NULL;
void *cpu = NULL;
void *nw_card = NULL;
xbt_dict_foreach(cpu_set, cursor, name, cpu) {
- nw_card = NULL;
- xbt_dict_get(network_card_set, name, (void *) &nw_card);
- xbt_assert1(nw_card, "No corresponding card found for %s",name);
+ nw_card = xbt_dict_get_or_null(network_card_set, name);
+ xbt_assert1(nw_card,
+ "No corresponding card found for %s",name);
+
xbt_dict_set(workstation_set, name,
workstation_new(name, cpu, nw_card), workstation_free);
}
static void *name_service(const char *name)
{
- void *workstation = NULL;
-
- xbt_dict_get(workstation_set, name, &workstation);
-
- return workstation;
+ return xbt_dict_get_or_null(workstation_set, name);
}
static const char *get_resource_name(void *resource_id)
else if(action->resource_type==(surf_resource_t)surf_cpu_resource)
surf_cpu_resource->common_public->action_use(action);
else if(action->resource_type==(surf_resource_t)surf_workstation_resource)
- return parallel_action_use(action);
+ parallel_action_use(action);
else DIE_IMPOSSIBLE;
return;
}
static void action_cancel(surf_action_t action)
{
- DIE_IMPOSSIBLE;
+ if(action->resource_type==(surf_resource_t)surf_network_resource)
+ surf_network_resource->common_public->action_cancel(action);
+ else if(action->resource_type==(surf_resource_t)surf_cpu_resource)
+ surf_cpu_resource->common_public->action_cancel(action);
+ else if(action->resource_type==(surf_resource_t)surf_workstation_resource)
+ parallel_action_use(action);
+ else DIE_IMPOSSIBLE;
return;
}
surf_action_parallel_task_CSL05_t next_action = NULL;
xbt_swag_t running_actions =
surf_workstation_resource->common_public->states.running_action_set;
+ /* FIXME: unused
xbt_swag_t failed_actions =
surf_workstation_resource->common_public->states.failed_action_set;
+ */
xbt_swag_foreach_safe(action, next_action, running_actions) {
surf_double_update(&(action->generic_action.remains),
surf_cpu_resource->common_public->set_max_duration(action,duration);
else DIE_IMPOSSIBLE;
}
+
+static void action_set_priority(surf_action_t action, double priority)
+{
+ if(action->resource_type==(surf_resource_t)surf_network_resource)
+ surf_network_resource->common_public->set_priority(action,priority);
+ else if(action->resource_type==(surf_resource_t)surf_cpu_resource)
+ surf_cpu_resource->common_public->set_priority(action,priority);
+ else DIE_IMPOSSIBLE;
+}
static surf_action_t communicate(void *workstation_src,
void *workstation_dst, double size,
get_state(((workstation_CLM03_t) workstation)->cpu);
}
+static double get_speed(void *workstation, double load)
+{
+ return surf_cpu_resource->extension_public->
+ get_speed(((workstation_CLM03_t) workstation)->cpu, load);
+}
+
+static double get_available_speed(void *workstation)
+{
+ return surf_cpu_resource->extension_public->
+ get_available_speed(((workstation_CLM03_t) workstation)->cpu);
+}
+
static surf_action_t execute_parallel_task (int workstation_nb,
void **workstation_list,
double *computation_amount,
{
surf_action_parallel_task_CSL05_t action = NULL;
int i, j, k;
- xbt_dict_t network_link_set = xbt_dict_new();
- xbt_dict_cursor_t cursor = NULL;
- char *name = NULL;
+ static xbt_dict_t network_link_set;
+ static int first_run = 1;
int nb_link = 0;
int nb_host = 0;
- network_link_CM02_t link;
+
+ if (first_run) {
+ network_link_set = xbt_dict_new_ext(workstation_nb * workstation_nb * 10);
+ first_run = 0;
+ }
+ else {
+ xbt_dict_reset(network_link_set);
+ }
/* Compute the number of affected resources... */
for(i=0; i< workstation_nb; i++) {
}
}
- xbt_dict_foreach(network_link_set, cursor, name, link) {
- nb_link++;
- }
-
- xbt_dict_free(&network_link_set);
+ nb_link = xbt_dict_length(network_link_set);
for (i = 0; i<workstation_nb; i++)
if(computation_amount[i]>0) nb_host++;
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.start = surf_get_clock();
action->generic_action.finish = -1.0;
action->generic_action.resource_type =
(surf_resource_t) surf_workstation_resource;
return (surf_action_t) action;
}
+/* returns an array of network_link_CM02_t */
+static const void** get_route(void *src, void *dst) {
+ workstation_CLM03_t workstation_src = (workstation_CLM03_t) src;
+ workstation_CLM03_t workstation_dst = (workstation_CLM03_t) dst;
+ return surf_network_resource->extension_public->get_route(workstation_src->network_card, workstation_dst->network_card);
+}
+
+static int get_route_size(void *src, void *dst) {
+ workstation_CLM03_t workstation_src = (workstation_CLM03_t) src;
+ workstation_CLM03_t workstation_dst = (workstation_CLM03_t) dst;
+ return surf_network_resource->extension_public->get_route_size(workstation_src->network_card, workstation_dst->network_card);
+}
+
+static const char *get_link_name(const void *link) {
+ return surf_network_resource->extension_public->get_link_name(link);
+}
+
+static double get_link_bandwidth(const void *link) {
+ return surf_network_resource->extension_public->get_link_bandwidth(link);
+}
+
+static double get_link_latency(const void *link) {
+ return surf_network_resource->extension_public->get_link_latency(link);
+}
+
static void finalize(void)
{
xbt_dict_free(&workstation_set);
get_resource_name;
surf_workstation_resource->common_public->action_get_state =
surf_action_get_state;
+ surf_workstation_resource->common_public->action_get_start_time =
+ surf_action_get_start_time;
+ surf_workstation_resource->common_public->action_get_finish_time =
+ surf_action_get_finish_time;
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 = action_cancel;
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->common_public->set_priority = action_set_priority;
surf_workstation_resource->extension_public->execute = execute;
surf_workstation_resource->extension_public->sleep = action_sleep;
surf_workstation_resource->extension_public->get_state = get_state;
+ surf_workstation_resource->extension_public->get_speed = get_speed;
+ surf_workstation_resource->extension_public->get_available_speed = get_available_speed;
surf_workstation_resource->extension_public->communicate = communicate;
surf_workstation_resource->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 = get_route_size;
+ surf_workstation_resource->extension_public->get_link_name = get_link_name;
+ surf_workstation_resource->extension_public->get_link_bandwidth = get_link_bandwidth;
+ surf_workstation_resource->extension_public->get_link_latency = get_link_latency;
workstation_set = xbt_dict_new();
xbt_assert0(maxmin_system, "surf_init has to be called first!");
