X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b6a7838d1e4d157188e8d4dc381a11d0035361fe..20427e1463985c071ac551547d0906e282b43520:/src/surf/workstation_ptask_L07.c diff --git a/src/surf/workstation_ptask_L07.c b/src/surf/workstation_ptask_L07.c index cb67b6e97b..087e1a7412 100644 --- a/src/surf/workstation_ptask_L07.c +++ b/src/surf/workstation_ptask_L07.c @@ -614,22 +614,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,33 +654,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) { - double power_scale = 0.0; - double power_initial = 0.0; - tmgr_trace_t power_trace = NULL; - e_surf_resource_state_t state_initial = SURF_RESOURCE_OFF; - tmgr_trace_t state_trace = NULL; - - power_scale = get_cpu_power(A_surfxml_host_power); - surf_parse_get_double(&power_initial, A_surfxml_host_availability); - power_trace = tmgr_trace_new(A_surfxml_host_availability_file); - - xbt_assert((A_surfxml_host_state == A_surfxml_host_state_ON) || - (A_surfxml_host_state == A_surfxml_host_state_OFF), - "Invalid state"); - if (A_surfxml_host_state == A_surfxml_host_state_ON) - state_initial = SURF_RESOURCE_ON; - if (A_surfxml_host_state == A_surfxml_host_state_OFF) - state_initial = SURF_RESOURCE_OFF; - state_trace = tmgr_trace_new(A_surfxml_host_state_file); - - ptask_cpu_create_resource(A_surfxml_host_id, power_scale, power_initial, power_trace, - state_initial, state_trace, current_property_set); - current_property_set=NULL; -} - -static void* ptask_link_create_resource(char *name, + ptask_cpu_create_resource( + host->V_host_id, + host->V_host_power_peak, + host->V_host_power_scale, + host->V_host_power_trace, + host->V_host_state_initial, + host->V_host_state_trace, + host->properties); +} + +static void* ptask_link_create_resource(const char *name, double bw_initial, tmgr_trace_t bw_trace, double lat_initial, @@ -698,7 +684,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) @@ -726,61 +712,22 @@ static void* ptask_link_create_resource(char *name, static void ptask_parse_link_init(void) { - double bw_initial; - tmgr_trace_t bw_trace; - double lat_initial; - tmgr_trace_t lat_trace; - e_surf_resource_state_t state_initial_link = SURF_RESOURCE_ON; - e_surf_link_sharing_policy_t policy_initial_link = SURF_LINK_SHARED; - tmgr_trace_t state_trace; - char *name_link_up = NULL; - char *name_link_down = NULL; - char *name_link = NULL; - - if(A_surfxml_link_sharing_policy == - A_surfxml_link_sharing_policy_FULLDUPLEX) { - name_link_up = bprintf("%s_UP", A_surfxml_link_id); - name_link_down = bprintf("%s_DOWN", A_surfxml_link_id); - } else { - name_link = xbt_strdup(A_surfxml_link_id); - } - surf_parse_get_double(&bw_initial, A_surfxml_link_bandwidth); - bw_trace = tmgr_trace_new(A_surfxml_link_bandwidth_file); - surf_parse_get_double(&lat_initial, A_surfxml_link_latency); - lat_trace = tmgr_trace_new(A_surfxml_link_latency_file); - - xbt_assert((A_surfxml_link_state == A_surfxml_link_state_ON) - || (A_surfxml_link_state == - A_surfxml_link_state_OFF), "Invalid state"); - if (A_surfxml_link_state == A_surfxml_link_state_ON) - state_initial_link = SURF_RESOURCE_ON; - else if (A_surfxml_link_state == A_surfxml_link_state_OFF) - state_initial_link = SURF_RESOURCE_OFF; - - if (A_surfxml_link_sharing_policy == A_surfxml_link_sharing_policy_SHARED) - policy_initial_link = SURF_LINK_SHARED; - if (A_surfxml_link_sharing_policy == A_surfxml_link_sharing_policy_FATPIPE) - policy_initial_link = SURF_LINK_FATPIPE; - if (A_surfxml_link_sharing_policy == A_surfxml_link_sharing_policy_FULLDUPLEX) - policy_initial_link = SURF_LINK_FULLDUPLEX; - - state_trace = tmgr_trace_new(A_surfxml_link_state_file); - - if(policy_initial_link == SURF_LINK_FULLDUPLEX) + if(struct_lnk->V_policy_initial_link == SURF_LINK_FULLDUPLEX) { - ptask_link_create_resource(name_link_up, bw_initial, bw_trace, lat_initial, lat_trace, - state_initial_link, state_trace, policy_initial_link, - current_property_set); - ptask_link_create_resource(name_link_down, bw_initial, bw_trace, lat_initial, lat_trace, - state_initial_link, state_trace, policy_initial_link, - current_property_set); + 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(name_link, bw_initial, bw_trace, lat_initial, lat_trace, - state_initial_link, state_trace, policy_initial_link, - current_property_set); + 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); } + current_property_set = NULL; } @@ -851,10 +798,10 @@ static void ptask_add_traces(void) } } -static void ptask_define_callbacks(const char *file) +static void ptask_define_callbacks() { /* Adding callback functions */ - surfxml_add_callback(ETag_surfxml_host_cb_list, &ptask_parse_cpu_init); + sg_platf_host_add_cb(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); } @@ -933,13 +880,13 @@ static void ptask_model_init_internal(void) /**************************************/ /*************** Generic **************/ /**************************************/ -void surf_workstation_model_init_ptask_L07(const char *filename) +void surf_workstation_model_init_ptask_L07(void) { 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(filename); + ptask_define_callbacks(); ptask_model_init_internal(); update_model_description(surf_workstation_model_description,