typedef enum {
SURF_WORKSTATION_RESOURCE_CPU,
- SURF_WORKSTATION_RESOURCE_LINK,
+ SURF_WORKSTATION_RESOURCE_LINK
} e_surf_workstation_model_type_t;
/**************************************/
double power_scale;
double power_current;
tmgr_trace_event_t power_event;
- e_surf_resource_state_t state_current;
tmgr_trace_event_t state_event;
+ e_surf_resource_state_t state_current;
int id; /* cpu and network card are a single object... */
} s_cpu_L07_t, *cpu_L07_t;
static xbt_dict_t ptask_parallel_task_link_set = NULL;
lmm_system_t ptask_maxmin_system = NULL;
+static surf_action_t die_impossible_communicate (const char *src_name, const char *dst_name, double size, double rate)
+{
+ DIE_IMPOSSIBLE;
+ return NULL;
+}
+
+static xbt_dynar_t die_impossible_get_route(const char *src_name, const char *dst_name)
+{
+ DIE_IMPOSSIBLE;
+ return NULL;
+}
static void ptask_update_action_bound(surf_action_workstation_L07_t action)
{
double lat_current = 0.0;
double lat_bound = -1.0;
int i, j;
- unsigned int cpt;
- link_L07_t link;
for (i = 0; i < workstation_nb; i++) {
for (j = 0; j < workstation_nb; j++) {
- xbt_dynar_t route =
- global_routing->get_route(surf_resource_name
- (action->workstation_list[i]),
- surf_resource_name(action->
- workstation_list
- [j]));
-
- double lat = 0.0;
+ xbt_dynar_t route=NULL;
if (action->communication_amount[i * workstation_nb + j] > 0) {
- xbt_dynar_foreach(route, cpt, link) {
- lat += link->lat_current;
- }
+ double lat = 0.0;
+ routing_get_route_and_latency(surf_resource_name
+ (action->workstation_list[i]),
+ surf_resource_name(action->workstation_list[j]),
+ &route, &lat);
lat_current =
MAX(lat_current,
- lat * action->communication_amount[i * workstation_nb +
- j]);
+ lat * action->communication_amount[i * workstation_nb + j]);
}
}
}
static double ptask_action_get_remains(surf_action_t action)
{
XBT_IN("(%p)", action);
- return action->remains;
XBT_OUT();
+ return action->remains;
}
/**************************************/
surf_workstation_model = NULL;
surf_model_exit(surf_network_model);
surf_network_model = NULL;
- global_routing->finalize();
ptask_host_count = 0;
double latency = 0.0;
if (ptask_parallel_task_link_set == NULL)
- ptask_parallel_task_link_set = xbt_dict_new();
+ ptask_parallel_task_link_set = xbt_dict_new_homogeneous(NULL);
xbt_dict_reset(ptask_parallel_task_link_set);
/* Compute the number of affected resources... */
for (i = 0; i < workstation_nb; i++) {
for (j = 0; j < workstation_nb; j++) {
- link_L07_t link;
- xbt_dynar_t route =
- global_routing->get_route(surf_resource_name
- (workstation_list[i]),
- surf_resource_name(workstation_list
- [j]));
- double lat = 0.0;
-
- if (communication_amount[i * workstation_nb + j] > 0)
+ xbt_dynar_t route=NULL;
+
+ if (communication_amount[i * workstation_nb + j] > 0) {
+ double lat=0.0;
+ unsigned int cpt;
+ link_L07_t link;
+
+ routing_get_route_and_latency(
+ surf_resource_name(workstation_list[i]),
+ surf_resource_name(workstation_list[j]),
+ &route,&lat);
+ latency = MAX(latency, lat);
+
xbt_dynar_foreach(route, cpt, link) {
- lat += link->lat_current;
- xbt_dict_set(ptask_parallel_task_link_set,
- link->generic_resource.name, link, NULL);
+ xbt_dict_set(ptask_parallel_task_link_set,link->generic_resource.name,link,NULL);
}
- latency = MAX(latency, lat);
+ }
}
}
for (i = 0; i < workstation_nb; i++) {
for (j = 0; j < workstation_nb; j++) {
link_L07_t link;
- xbt_dynar_t route =
- global_routing->get_route(surf_resource_name
- (workstation_list[i]),
- surf_resource_name(workstation_list
- [j]));
-
+ xbt_dynar_t route=NULL;
if (communication_amount[i * workstation_nb + j] == 0.0)
continue;
+
+ routing_get_route_and_latency(
+ surf_resource_name(workstation_list[i]),
+ surf_resource_name(workstation_list[j]),
+ &route,NULL);
+
xbt_dynar_foreach(route, cpt, link) {
lmm_expand_add(ptask_maxmin_system, link->constraint,
action->variable,
return (surf_action_t) action;
}
-static xbt_dynar_t ptask_get_route(void *src, void *dst)
+static xbt_dynar_t ptask_get_route(void *src, void *dst) // FIXME: kill that callback kind?
{
- return global_routing->get_route(surf_resource_name(src),
- surf_resource_name(dst));
+ xbt_dynar_t route=NULL;
+ routing_get_route_and_latency(
+ surf_resource_name(src), surf_resource_name(dst),
+ &route,NULL);
+ return route;
}
static double ptask_get_link_bandwidth(const void *link)
link->properties);
xbt_free(link_id);
link_id = bprintf("%s_DOWN", link->id);
- ptask_link_create_resource(bprintf("%s_DOWN", link->id),
+ ptask_link_create_resource(link_id,
link->bandwidth,
link->bandwidth_trace,
link->latency,
ptask_add_traces;
if (!ptask_maxmin_system)
- ptask_maxmin_system = lmm_system_new();
+ ptask_maxmin_system = lmm_system_new(1);
routing_model_create(sizeof(link_L07_t),
ptask_link_create_resource("__loopback__",
498000000, NULL,
0.000015, NULL,
SURF_RESOURCE_ON, NULL,
- SURF_LINK_FATPIPE, NULL),
- ptask_get_link_latency);
+ SURF_LINK_FATPIPE, NULL));
+
+ surf_network_model = surf_model_init();
+ surf_network_model->extension.network.communicate = die_impossible_communicate;
+ surf_network_model->extension.network.get_route = die_impossible_get_route;
+ surf_network_model->extension.network.get_link_bandwidth = ptask_get_link_bandwidth;
+ surf_network_model->extension.network.get_link_latency = ptask_get_link_latency;
+ surf_network_model->extension.network.link_shared = ptask_link_shared;
+ surf_network_model->extension.network.add_traces = NULL;
+ surf_network_model->extension.network.create_resource = NULL;
}
/**************************************/
XBT_INFO("surf_workstation_model_init_ptask_L07");
xbt_assert(!surf_cpu_model, "CPU model type already defined");
xbt_assert(!surf_network_model, "network model type already defined");
- surf_network_model = surf_model_init();
ptask_define_callbacks();
ptask_model_init_internal();
-
- update_model_description(surf_workstation_model_description,
- "ptask_L07", surf_workstation_model);
xbt_dynar_push(model_list, &surf_workstation_model);
}