#include "xbt/ex.h"
#include "xbt/dict.h"
-#include "workstation_KCCFLN05_private.h"
+#include "surf_private.h"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_workstation, surf,
"Logging specific to the SURF workstation module (KCCFLN05)");
+typedef enum {
+ SURF_WORKSTATION_RESOURCE_CPU,
+ SURF_WORKSTATION_RESOURCE_LINK,
+} e_surf_workstation_model_type_t;
+
+
+/**************************************/
+/********* router object **************/
+/**************************************/
+typedef struct router_KCCFLN05 {
+ char *name;
+ unsigned int id;
+} s_router_KCCFLN05_t, *router_KCCFLN05_t;
+
+
+/**************************************/
+/********* cpu object *****************/
+/**************************************/
+typedef struct cpu_KCCFLN05 {
+ surf_model_t model;
+ e_surf_workstation_model_type_t type; /* Do not move this field */
+ char *name; /* Do not move this field */
+ lmm_constraint_t constraint;
+ lmm_constraint_t bus;
+ double power_scale;
+ double power_current;
+ double interference_send;
+ double interference_recv;
+ double interference_send_recv;
+ tmgr_trace_event_t power_event;
+ e_surf_cpu_state_t state_current;
+ tmgr_trace_event_t state_event;
+ int id; /* cpu and network card are a single object... */
+ xbt_dynar_t incomming_communications;
+ xbt_dynar_t outgoing_communications;
+} s_cpu_KCCFLN05_t, *cpu_KCCFLN05_t;
+
+/**************************************/
+/*********** network object ***********/
+/**************************************/
+
+typedef struct network_link_KCCFLN05 {
+ surf_model_t model;
+ e_surf_workstation_model_type_t type; /* Do not move this field */
+ char *name; /* Do not move this field */
+ lmm_constraint_t constraint;
+ double lat_current;
+ tmgr_trace_event_t lat_event;
+ double bw_current;
+ tmgr_trace_event_t bw_event;
+ e_surf_network_link_state_t state_current;
+ tmgr_trace_event_t state_event;
+} s_network_link_KCCFLN05_t, *network_link_KCCFLN05_t;
+
+
+typedef struct s_route_KCCFLN05 {
+ double impact_on_src;
+ double impact_on_dst;
+ double impact_on_src_with_other_recv;
+ double impact_on_dst_with_other_send;
+ network_link_KCCFLN05_t *links;
+ int size;
+} s_route_KCCFLN05_t, *route_KCCFLN05_t;
+
+/**************************************/
+/*************** actions **************/
+/**************************************/
+typedef struct surf_action_workstation_KCCFLN05 {
+ s_surf_action_t generic_action;
+ double latency;
+ double lat_current;
+ lmm_variable_t variable;
+ double rate;
+ int suspended;
+ cpu_KCCFLN05_t src; /* could be avoided */
+ cpu_KCCFLN05_t dst; /* could be avoided */
+} s_surf_action_workstation_KCCFLN05_t,
+ *surf_action_workstation_KCCFLN05_t;
+
+
+
static int nb_workstation = 0;
static s_route_KCCFLN05_t *routing_table = NULL;
#define ROUTE(i,j) routing_table[(i)+(j)*nb_workstation]
static xbt_dict_t parallel_task_network_link_set = NULL;
//added to work with GTNETS
static xbt_dict_t router_set = NULL;
-
+static lmm_system_t maxmin_system = NULL;
/*xbt_dict_t network_link_set = NULL;*/
if (((surf_action_workstation_KCCFLN05_t) action)->lat_current == 0.0)
lmm_update_variable_weight(maxmin_system,
((surf_action_workstation_KCCFLN05_t)
- action)->variable, 1.0);
+ action)->variable, action->priority);
else
lmm_update_variable_weight(maxmin_system,
((surf_action_workstation_KCCFLN05_t)
static void action_set_priority(surf_action_t action, double priority)
-{ /* FIXME: should inherit */
+{
XBT_IN2("(%p,%g)", action, priority);
action->priority = priority;
+ lmm_update_variable_weight(maxmin_system, ((surf_action_workstation_KCCFLN05_t) action)->variable, priority);
+
XBT_OUT;
}
surf_action_workstation_KCCFLN05_t 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;
double min = generic_maxmin_share_resources(running_actions,
xbt_swag_offset(s_action,
- variable));
+ variable),
+ maxmin_system,
+ lmm_solve);
xbt_swag_foreach(action, running_actions) {
if (action->latency > 0) {
surf_action_workstation_KCCFLN05_t action = NULL;
surf_action_workstation_KCCFLN05_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) {
deltap = delta;
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++)
action->generic_action.max_duration = NO_MAX_DURATION;
action->generic_action.start = surf_get_clock();
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;
if (CPU->state_current == SURF_CPU_ON)
action->generic_action.state_set =
- surf_workstation_resource->common_public->states.
+ surf_workstation_model->common_public->states.
running_action_set;
else
action->generic_action.state_set =
- surf_workstation_resource->common_public->states.failed_action_set;
+ surf_workstation_model->common_public->states.failed_action_set;
xbt_swag_insert(action, action->generic_action.state_set);
action->variable = lmm_variable_new(maxmin_system, action,
action->generic_action.finish = -1.0;
action->src = src;
action->dst = dst;
- 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_dynar_push(card_src->outgoing_communications, &action);
xbt_dynar_push(card_dst->incomming_communications, &action);
}
lmm_update_variable_latency(maxmin_system, action->variable,
- action->latency);
+ action->latency); /* Should be useless */
for (i = 0; i < route_size; i++)
lmm_expand(maxmin_system, route->links[i]->constraint,
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_KCCFLN05_t, 1);
DEBUG3("Creating a parallel task (%p) with %d cpus and %d links.",
action, nb_host, nb_link);
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;
+ 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 (nb_link + nb_host == 0) {
+ action->generic_action.cost = 1.0;
+ action->generic_action.remains = 0.0;
+ }
+
return (surf_action_t) action;
}
static void router_new(const char *name)
{
static unsigned int nb_routers = 0;
+ router_KCCFLN05_t router;
INFO1("Creating a router %s", name);
- router_KCCFLN05_t router;
router = xbt_new0(s_router_KCCFLN05_t, 1);
router->name = xbt_strdup(name);
{
cpu_KCCFLN05_t cpu = xbt_new0(s_cpu_KCCFLN05_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_KCCFLN05_t nw_link = xbt_new0(s_network_link_KCCFLN05_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 =
+ surf_workstation_model->common_public->name_service = name_service;
+ surf_workstation_model->common_public->get_resource_name =
get_resource_name;
- surf_workstation_resource->common_public->action_get_state =
+ 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 KCCFLN05";
+ surf_workstation_model->common_public->name = "Workstation KCCFLN05";
- surf_workstation_resource->common_private->resource_used = resource_used;
- surf_workstation_resource->common_private->share_resources =
+ surf_workstation_model->common_private->resource_used = resource_used;
+ surf_workstation_model->common_private->share_resources =
share_resources;
- surf_workstation_resource->common_private->update_actions_state =
+ surf_workstation_model->common_private->update_actions_state =
update_actions_state;
- surf_workstation_resource->common_private->update_resource_state =
+ surf_workstation_model->common_private->update_resource_state =
update_resource_state;
- surf_workstation_resource->common_private->finalize = finalize;
+ surf_workstation_model->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 =
+ surf_workstation_model->extension_public->execute = execute;
+ surf_workstation_model->extension_public->sleep = action_sleep;
+ surf_workstation_model->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->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();
router_set = xbt_dict_new();
- network_link_set = xbt_dict_new();
-
- xbt_assert0(maxmin_system, "surf_init has to be called first!");
+ network_link_set = xbt_dict_new();
+ if (!maxmin_system)
+ maxmin_system = lmm_system_new();
}
/**************************************/
/*************** Generic **************/
/**************************************/
-void surf_workstation_resource_init_KCCFLN05(const char *filename)
+void surf_workstation_model_init_KCCFLN05(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);
- xbt_dynar_push(resource_list, &surf_workstation_resource);
+ xbt_dynar_push(model_list, &surf_workstation_model);
}
