#include "xbt/str.h"
#include "xbt/dict.h"
#include "surf_private.h"
+#include "surf/surf_resource.h"
+//#include "surf/surf_resource_lmm.h"
typedef enum {
SURF_WORKSTATION_RESOURCE_CPU,
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]));
+ xbt_dynar_t route=NULL;
+ routing_get_route_and_latency(surf_resource_name
+ (action->workstation_list[i]),
+ surf_resource_name(action->workstation_list[j]),
+ &route, NULL);
+ // FIXME do we really need to recompute the latency here?
double lat = 0.0;
if (action->communication_amount[i * workstation_nb + j] > 0) {
static void ptask_finalize(void)
{
- if (ptask_parallel_task_link_set != NULL)
- xbt_dict_free(&ptask_parallel_task_link_set);
+ xbt_dict_free(&ptask_parallel_task_link_set);
surf_model_exit(surf_workstation_model);
surf_workstation_model = NULL;
surf_model_exit(surf_network_model);
surf_network_model = NULL;
- global_routing->finalize();
ptask_host_count = 0;
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;
+ routing_get_route_and_latency(
+ surf_resource_name(workstation_list[i]),
+ surf_resource_name(workstation_list[j]),
+ &route,NULL); // FIXME: do we want to recompute the latency?
double lat = 0.0;
if (communication_amount[i * workstation_nb + j] > 0)
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;
+ routing_get_route_and_latency(
+ surf_resource_name(workstation_list[i]),
+ surf_resource_name(workstation_list[j]),
+ &route,NULL);
if (communication_amount[i * workstation_nb + j] == 0.0)
continue;
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)
return cpu;
}
-static void ptask_parse_cpu_init(void)
+static void ptask_parse_cpu_init(sg_platf_host_cbarg_t host)
{
ptask_cpu_create_resource(
- struct_host->V_host_id,
- struct_host->V_host_power_peak,
- struct_host->V_host_power_scale,
- struct_host->V_host_power_trace,
- struct_host->V_host_state_initial,
- struct_host->V_host_state_trace,
- current_property_set);
- current_property_set=NULL;
+ host->id,
+ host->power_peak,
+ host->power_scale,
+ host->power_trace,
+ host->initial_state,
+ host->state_trace,
+ host->properties);
}
static void* ptask_link_create_resource(const char *name,
return nw_link;
}
-static void ptask_parse_link_init(void)
+static void ptask_parse_link_init(sg_platf_link_cbarg_t link)
{
- if(struct_lnk->V_policy_initial_link == SURF_LINK_FULLDUPLEX)
- {
- ptask_link_create_resource(bprintf("%s_UP",struct_lnk->V_link_id), struct_lnk->V_link_bandwidth, struct_lnk->V_link_bandwidth_file,
- struct_lnk->V_link_latency, struct_lnk->V_link_latency_file, struct_lnk->V_link_state, struct_lnk->V_link_state_file,
- struct_lnk->V_policy_initial_link, current_property_set);
- ptask_link_create_resource(bprintf("%s_DOWN",struct_lnk->V_link_id), struct_lnk->V_link_bandwidth, struct_lnk->V_link_bandwidth_file,
- struct_lnk->V_link_latency, struct_lnk->V_link_latency_file, struct_lnk->V_link_state, struct_lnk->V_link_state_file,
- struct_lnk->V_policy_initial_link, current_property_set);
- }
- else
- {
- ptask_link_create_resource(xbt_strdup(struct_lnk->V_link_id), struct_lnk->V_link_bandwidth, struct_lnk->V_link_bandwidth_file,
- struct_lnk->V_link_latency, struct_lnk->V_link_latency_file, struct_lnk->V_link_state, struct_lnk->V_link_state_file,
- struct_lnk->V_policy_initial_link, current_property_set);
+ if (link->policy == SURF_LINK_FULLDUPLEX) {
+ char *link_id;
+ link_id = bprintf("%s_UP", link->id);
+ ptask_link_create_resource(link_id,
+ link->bandwidth,
+ link->bandwidth_trace,
+ link->latency,
+ link->latency_trace,
+ link->state,
+ link->state_trace,
+ link->policy,
+ link->properties);
+ xbt_free(link_id);
+ link_id = bprintf("%s_DOWN", link->id);
+ ptask_link_create_resource(link_id,
+ link->bandwidth,
+ link->bandwidth_trace,
+ link->latency,
+ link->latency_trace,
+ link->state,
+ link->state_trace,
+ link->policy,
+ NULL); /* FIXME: We need to deep copy the
+ * properties or we won't be able to free
+ * it */
+ xbt_free(link_id);
+ } else {
+ ptask_link_create_resource(link->id,
+ link->bandwidth,
+ link->bandwidth_trace,
+ link->latency,
+ link->latency_trace,
+ link->state,
+ link->state_trace,
+ link->policy,
+ link->properties);
}
current_property_set = NULL;
static void ptask_define_callbacks()
{
- /* Adding callback functions */
- surfxml_add_callback(ETag_surfxml_host_cb_list, &ptask_parse_cpu_init);
- surfxml_add_callback(ETag_surfxml_link_cb_list, &ptask_parse_link_init);
- surfxml_add_callback(ETag_surfxml_platform_cb_list, &ptask_add_traces);
+ sg_platf_host_add_cb(ptask_parse_cpu_init);
+ sg_platf_link_add_cb(ptask_parse_link_init);
+ sg_platf_postparse_add_cb(ptask_add_traces);
}
/**************************************/
ptask_maxmin_system = lmm_system_new();
routing_model_create(sizeof(link_L07_t),
- ptask_link_create_resource(xbt_strdup("__loopback__"),
- 498000000, NULL, 0.000015, NULL,
- SURF_RESOURCE_ON, NULL,
- SURF_LINK_FATPIPE, NULL),
- ptask_get_link_latency);
+ ptask_link_create_resource("__loopback__",
+ 498000000, NULL,
+ 0.000015, NULL,
+ SURF_RESOURCE_ON, NULL,
+ SURF_LINK_FATPIPE, NULL));
}
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);
}
