X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a4f777f30924d7890b9e1da29f9d1a637035531b..8cc10e99f53995bc7486e4467b4e6ad8d7be3460:/src/surf/workstation_ptask_L07.c diff --git a/src/surf/workstation_ptask_L07.c b/src/surf/workstation_ptask_L07.c index 709e1a95ef..82acc84256 100644 --- a/src/surf/workstation_ptask_L07.c +++ b/src/surf/workstation_ptask_L07.c @@ -8,6 +8,8 @@ #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, @@ -402,8 +404,7 @@ static void ptask_update_resource_state(void *id, 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; @@ -614,22 +615,22 @@ static int ptask_link_shared(const void *link) /*** Resource Creation & Destruction **/ /**************************************/ -static void* ptask_cpu_create_resource(char *name, double power_scale, +static void* ptask_cpu_create_resource(const char *name, double power_scale, double power_initial, tmgr_trace_t power_trace, e_surf_resource_state_t state_initial, tmgr_trace_t state_trace, xbt_dict_t cpu_properties) { - cpu_L07_t cpu = xbt_new0(s_cpu_L07_t, 1); + cpu_L07_t cpu = NULL; xbt_assert(!surf_workstation_resource_by_name(name), "Host '%s' declared several times in the platform file.", name); - cpu->generic_resource.model = surf_workstation_model; + cpu = (cpu_L07_t) surf_resource_new(sizeof(s_cpu_L07_t), + surf_workstation_model, name,cpu_properties); + cpu->type = SURF_WORKSTATION_RESOURCE_CPU; - cpu->generic_resource.name = xbt_strdup(name); - cpu->generic_resource.properties = cpu_properties; cpu->id = ptask_host_count++; cpu->power_scale = power_scale; @@ -654,20 +655,19 @@ static void* ptask_cpu_create_resource(char *name, double power_scale, 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(char *name, +static void* ptask_link_create_resource(const char *name, double bw_initial, tmgr_trace_t bw_trace, double lat_initial, @@ -685,7 +685,7 @@ static void* ptask_link_create_resource(char *name, nw_link->generic_resource.model = surf_workstation_model; nw_link->generic_resource.properties = properties; - nw_link->generic_resource.name = name; + nw_link->generic_resource.name = xbt_strdup(name); nw_link->type = SURF_WORKSTATION_RESOURCE_LINK; nw_link->bw_current = bw_initial; if (bw_trace) @@ -711,22 +711,44 @@ static void* ptask_link_create_resource(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(bprintf("%s_DOWN", 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; @@ -801,10 +823,9 @@ static void ptask_add_traces(void) 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); } /**************************************/ @@ -870,11 +891,11 @@ static void ptask_model_init_internal(void) 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)); } @@ -889,8 +910,5 @@ void surf_workstation_model_init_ptask_L07(void) 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); }