X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e2e0a4d7c93175de4ff8c3e1d9dfc2b1917a4c25..f57edc1d5b4f497883b451fc85d2d653d27a8247:/src/surf/workstation_ptask_L07.c diff --git a/src/surf/workstation_ptask_L07.c b/src/surf/workstation_ptask_L07.c index fd5607e661..399435536a 100644 --- a/src/surf/workstation_ptask_L07.c +++ b/src/surf/workstation_ptask_L07.c @@ -79,9 +79,13 @@ static void ptask_update_action_bound(surf_action_workstation_L07_t action) for (i = 0; i < workstation_nb; i++) { for (j = 0; j < workstation_nb; j++) { - cpu_L07_t card_src = action->workstation_list[i]; - cpu_L07_t card_dst = action->workstation_list[j]; - xbt_dynar_t route = used_routing->get_route(card_src->id, card_dst->id); + 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; if (action->communication_amount[i * workstation_nb + j] > 0) { @@ -89,13 +93,14 @@ static void ptask_update_action_bound(surf_action_workstation_L07_t action) lat += link->lat_current; } lat_current = - MAX(lat_current, - lat * action->communication_amount[i * workstation_nb + j]); + MAX(lat_current, + lat * action->communication_amount[i * workstation_nb + + j]); } } } lat_bound = sg_tcp_gamma / (2.0 * lat_current); - DEBUG2("action (%p) : lat_bound = %g", action, lat_bound); + XBT_DEBUG("action (%p) : lat_bound = %g", action, lat_bound); if ((action->latency == 0.0) && (action->suspended == 0)) { if (action->rate < 0) lmm_update_variable_bound(ptask_maxmin_system, action->variable, @@ -118,11 +123,12 @@ static int ptask_action_unref(surf_action_t action) xbt_swag_remove(action, action->state_set); if (((surf_action_workstation_L07_t) action)->variable) lmm_variable_free(ptask_maxmin_system, - ((surf_action_workstation_L07_t) action)->variable); + ((surf_action_workstation_L07_t) + action)->variable); free(((surf_action_workstation_L07_t) action)->workstation_list); free(((surf_action_workstation_L07_t) action)->communication_amount); free(((surf_action_workstation_L07_t) action)->computation_amount); - free(action); + surf_action_free(&action); return 1; } return 0; @@ -139,26 +145,27 @@ static void ptask_action_cancel(surf_action_t action) static void ptask_action_suspend(surf_action_t action) { - XBT_IN1("(%p))", action); + XBT_IN("(%p))", action); if (((surf_action_workstation_L07_t) action)->suspended != 2) { ((surf_action_workstation_L07_t) action)->suspended = 1; lmm_update_variable_weight(ptask_maxmin_system, ((surf_action_workstation_L07_t) action)->variable, 0.0); } - XBT_OUT; + XBT_OUT(); } static void ptask_action_resume(surf_action_t action) { - surf_action_workstation_L07_t act = (surf_action_workstation_L07_t) action; + surf_action_workstation_L07_t act = + (surf_action_workstation_L07_t) action; - XBT_IN1("(%p)", act); + XBT_IN("(%p)", act); if (act->suspended != 2) { lmm_update_variable_weight(ptask_maxmin_system, act->variable, 1.0); act->suspended = 0; } - XBT_OUT; + XBT_OUT(); } static int ptask_action_is_suspended(surf_action_t action) @@ -166,26 +173,28 @@ static int ptask_action_is_suspended(surf_action_t action) return (((surf_action_workstation_L07_t) action)->suspended == 1); } -static void ptask_action_set_max_duration(surf_action_t action, double duration) +static void ptask_action_set_max_duration(surf_action_t action, + double duration) { /* FIXME: should inherit */ - XBT_IN2("(%p,%g)", action, duration); + XBT_IN("(%p,%g)", action, duration); action->max_duration = duration; - XBT_OUT; + XBT_OUT(); } -static void ptask_action_set_priority(surf_action_t action, double priority) +static void ptask_action_set_priority(surf_action_t action, + double priority) { /* FIXME: should inherit */ - XBT_IN2("(%p,%g)", action, priority); + XBT_IN("(%p,%g)", action, priority); action->priority = priority; - XBT_OUT; + XBT_OUT(); } static double ptask_action_get_remains(surf_action_t action) { - XBT_IN1("(%p)", action); + XBT_IN("(%p)", action); return action->remains; - XBT_OUT; + XBT_OUT(); } /**************************************/ @@ -207,7 +216,7 @@ static double ptask_share_resources(double now) surf_action_workstation_L07_t action = NULL; xbt_swag_t running_actions = - surf_workstation_model->states.running_action_set; + surf_workstation_model->states.running_action_set; double min = generic_maxmin_share_resources(running_actions, xbt_swag_offset(s_action, variable), @@ -218,17 +227,17 @@ static double ptask_share_resources(double now) if (action->latency > 0) { if (min < 0) { min = action->latency; - DEBUG3("Updating min (value) with %p (start %f): %f", action, + XBT_DEBUG("Updating min (value) with %p (start %f): %f", action, action->generic_action.start, min); } else if (action->latency < min) { min = action->latency; - DEBUG3("Updating min (latency) with %p (start %f): %f", action, + XBT_DEBUG("Updating min (latency) with %p (start %f): %f", action, action->generic_action.start, min); } } } - DEBUG1("min value : %f", min); + XBT_DEBUG("min value : %f", min); return min; } @@ -239,7 +248,7 @@ static void ptask_update_actions_state(double now, double delta) surf_action_workstation_L07_t action = NULL; surf_action_workstation_L07_t next_action = NULL; xbt_swag_t running_actions = - surf_workstation_model->states.running_action_set; + surf_workstation_model->states.running_action_set; xbt_swag_foreach_safe(action, next_action, running_actions) { deltap = delta; @@ -257,7 +266,7 @@ static void ptask_update_actions_state(double now, double delta) 1.0); } } - DEBUG3("Action (%p) : remains (%g) updated by %g.", + XBT_DEBUG("Action (%p) : remains (%g) updated by %g.", action, action->generic_action.remains, lmm_variable_getvalue(action->variable) * delta); double_update(&(action->generic_action.remains), @@ -266,7 +275,7 @@ static void ptask_update_actions_state(double now, double delta) if (action->generic_action.max_duration != NO_MAX_DURATION) double_update(&(action->generic_action.max_duration), delta); - DEBUG2("Action (%p) : remains (%g).", + XBT_DEBUG("Action (%p) : remains (%g).", action, action->generic_action.remains); if ((action->generic_action.remains <= 0) && (lmm_get_variable_weight(action->variable) > 0)) { @@ -289,13 +298,13 @@ static void ptask_update_actions_state(double now, double delta) /* if(((link_L07_t)constraint_id)->type== */ /* SURF_WORKSTATION_RESOURCE_LINK) { */ -/* DEBUG2("Checking for link %s (%p)", */ +/* XBT_DEBUG("Checking for link %s (%p)", */ /* ((link_L07_t)constraint_id)->name, */ /* ((link_L07_t)constraint_id)); */ /* } */ /* if(((cpu_L07_t)constraint_id)->type== */ /* SURF_WORKSTATION_RESOURCE_CPU) { */ -/* DEBUG3("Checking for cpu %s (%p) : %s", */ +/* XBT_DEBUG("Checking for cpu %s (%p) : %s", */ /* ((cpu_L07_t)constraint_id)->name, */ /* ((cpu_L07_t)constraint_id), */ /* ((cpu_L07_t)constraint_id)->state_current==SURF_CPU_OFF?"Off":"On"); */ @@ -309,9 +318,10 @@ static void ptask_update_actions_state(double now, double delta) SURF_WORKSTATION_RESOURCE_CPU) && (((cpu_L07_t) constraint_id)->state_current == SURF_RESOURCE_OFF))) { - DEBUG1("Action (%p) Failed!!", action); + XBT_DEBUG("Action (%p) Failed!!", action); action->generic_action.finish = surf_get_clock(); - surf_action_state_set((surf_action_t) action, SURF_ACTION_FAILED); + surf_action_state_set((surf_action_t) action, + SURF_ACTION_FAILED); break; } } @@ -321,14 +331,14 @@ static void ptask_update_actions_state(double now, double delta) } static void ptask_update_resource_state(void *id, - tmgr_trace_event_t event_type, - double value, double date) + tmgr_trace_event_t event_type, + double value, double date) { cpu_L07_t cpu = id; link_L07_t nw_link = id; if (nw_link->type == SURF_WORKSTATION_RESOURCE_LINK) { - DEBUG2("Updating link %s (%p)", surf_resource_name(nw_link), nw_link); + XBT_DEBUG("Updating link %s (%p)", surf_resource_name(nw_link), nw_link); if (event_type == nw_link->bw_event) { nw_link->bw_current = value; lmm_update_constraint_bound(ptask_maxmin_system, nw_link->constraint, @@ -359,13 +369,13 @@ static void ptask_update_resource_state(void *id, if (tmgr_trace_event_free(event_type)) nw_link->state_event = NULL; } else { - CRITICAL0("Unknown event ! \n"); + XBT_CRITICAL("Unknown event ! \n"); xbt_abort(); } return; } else if (cpu->type == SURF_WORKSTATION_RESOURCE_CPU) { - DEBUG3("Updating cpu %s (%p) with value %g", surf_resource_name(cpu), cpu, - value); + XBT_DEBUG("Updating cpu %s (%p) with value %g", surf_resource_name(cpu), + cpu, value); if (event_type == cpu->power_event) { cpu->power_current = value; lmm_update_constraint_bound(ptask_maxmin_system, cpu->constraint, @@ -380,7 +390,7 @@ static void ptask_update_resource_state(void *id, if (tmgr_trace_event_free(event_type)) cpu->state_event = NULL; } else { - CRITICAL0("Unknown event ! \n"); + XBT_CRITICAL("Unknown event ! \n"); xbt_abort(); } return; @@ -399,7 +409,7 @@ static void ptask_finalize(void) surf_workstation_model = NULL; surf_model_exit(surf_network_model); surf_network_model = NULL; - used_routing->finalize(); + global_routing->finalize(); ptask_host_count = 0; @@ -429,10 +439,12 @@ static double ptask_get_available_speed(void *cpu) } static surf_action_t ptask_execute_parallel_task(int workstation_nb, - void **workstation_list, - double *computation_amount, - double *communication_amount, - double amount, double rate) + void **workstation_list, + double + *computation_amount, double + *communication_amount, + double amount, + double rate) { surf_action_workstation_L07_t action = NULL; int i, j; @@ -449,17 +461,19 @@ static surf_action_t ptask_execute_parallel_task(int workstation_nb, /* Compute the number of affected resources... */ for (i = 0; i < workstation_nb; i++) { for (j = 0; j < workstation_nb; j++) { - cpu_L07_t card_src = workstation_list[i]; - cpu_L07_t card_dst = workstation_list[j]; link_L07_t link; - xbt_dynar_t route = used_routing->get_route(card_src->id, card_dst->id); + 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_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); } @@ -473,10 +487,10 @@ static surf_action_t ptask_execute_parallel_task(int workstation_nb, nb_host++; action = - surf_action_new(sizeof(s_surf_action_workstation_L07_t), amount, - surf_workstation_model, 0); - DEBUG3("Creating a parallel task (%p) with %d cpus and %d links.", action, - workstation_nb, nb_link); + surf_action_new(sizeof(s_surf_action_workstation_L07_t), amount, + surf_workstation_model, 0); + XBT_DEBUG("Creating a parallel task (%p) with %d cpus and %d links.", + action, workstation_nb, nb_link); action->suspended = 0; /* Should be useless because of the calloc but it seems to help valgrind... */ action->workstation_nb = workstation_nb; @@ -487,9 +501,9 @@ static surf_action_t ptask_execute_parallel_task(int workstation_nb, action->rate = rate; action->variable = - lmm_variable_new(ptask_maxmin_system, action, 1.0, - (action->rate > 0) ? action->rate : -1.0, - workstation_nb + nb_link); + lmm_variable_new(ptask_maxmin_system, action, 1.0, + (action->rate > 0) ? action->rate : -1.0, + workstation_nb + nb_link); if (action->latency > 0) lmm_update_variable_weight(ptask_maxmin_system, action->variable, 0.0); @@ -501,10 +515,12 @@ static surf_action_t ptask_execute_parallel_task(int workstation_nb, for (i = 0; i < workstation_nb; i++) { for (j = 0; j < workstation_nb; j++) { - cpu_L07_t card_src = workstation_list[i]; - cpu_L07_t card_dst = workstation_list[j]; link_L07_t link; - xbt_dynar_t route = used_routing->get_route(card_src->id, card_dst->id); + xbt_dynar_t route = + global_routing->get_route(surf_resource_name + (workstation_list[i]), + surf_resource_name(workstation_list + [j])); if (communication_amount[i * workstation_nb + j] == 0.0) continue; @@ -534,12 +550,13 @@ static surf_action_t ptask_execute(void *cpu, double size) communication_amount[0] = 0.0; computation_amount[0] = size; - return ptask_execute_parallel_task(1, workstation_list, computation_amount, - communication_amount, 1, -1); + return ptask_execute_parallel_task(1, workstation_list, + computation_amount, + communication_amount, 1, -1); } static surf_action_t ptask_communicate(void *src, void *dst, double size, - double rate) + double rate) { void **workstation_list = xbt_new0(void *, 2); double *computation_amount = xbt_new0(double, 2); @@ -551,8 +568,8 @@ static surf_action_t ptask_communicate(void *src, void *dst, double size, communication_amount[1] = size; res = ptask_execute_parallel_task(2, workstation_list, - computation_amount, communication_amount, - 1, rate); + computation_amount, + communication_amount, 1, rate); return res; } @@ -561,23 +578,21 @@ static surf_action_t ptask_action_sleep(void *cpu, double duration) { surf_action_workstation_L07_t action = NULL; - XBT_IN2("(%s,%g)", surf_resource_name(cpu), duration); + XBT_IN("(%s,%g)", surf_resource_name(cpu), duration); action = (surf_action_workstation_L07_t) ptask_execute(cpu, 1.0); action->generic_action.max_duration = duration; action->suspended = 2; lmm_update_variable_weight(ptask_maxmin_system, action->variable, 0.0); - XBT_OUT; + XBT_OUT(); return (surf_action_t) action; } static xbt_dynar_t ptask_get_route(void *src, void *dst) { - cpu_L07_t host_src = src; - cpu_L07_t host_dst = dst; - - return used_routing->get_route(host_src->id, host_dst->id); + return global_routing->get_route(surf_resource_name(src), + surf_resource_name(dst)); } static double ptask_get_link_bandwidth(const void *link) @@ -599,96 +614,74 @@ static int ptask_link_shared(const void *link) /*** Resource Creation & Destruction **/ /**************************************/ -static cpu_L07_t ptask_cpu_new(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) +static void* ptask_cpu_create_resource(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); - xbt_assert1(!surf_model_resource_by_name(surf_workstation_model, name), - "Host '%s' declared several times in the platform file.", name); + 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->type = SURF_WORKSTATION_RESOURCE_CPU; cpu->generic_resource.name = xbt_strdup(name); - cpu->generic_resource.properties = current_property_set; + cpu->generic_resource.properties = cpu_properties; cpu->id = ptask_host_count++; cpu->power_scale = power_scale; - xbt_assert0(cpu->power_scale > 0, "Power has to be >0"); + xbt_assert(cpu->power_scale > 0, "Power has to be >0"); cpu->power_current = power_initial; if (power_trace) cpu->power_event = - tmgr_history_add_trace(history, power_trace, 0.0, 0, cpu); + tmgr_history_add_trace(history, power_trace, 0.0, 0, cpu); cpu->state_current = state_initial; if (state_trace) cpu->state_event = - tmgr_history_add_trace(history, state_trace, 0.0, 0, cpu); + tmgr_history_add_trace(history, state_trace, 0.0, 0, cpu); cpu->constraint = - lmm_constraint_new(ptask_maxmin_system, cpu, - cpu->power_current * cpu->power_scale); + lmm_constraint_new(ptask_maxmin_system, cpu, + cpu->power_current * cpu->power_scale); - xbt_dict_set(surf_model_resource_set(surf_workstation_model), name, cpu, - surf_resource_free); + xbt_lib_set(host_lib, name, SURF_WKS_LEVEL, cpu); return cpu; } static void ptask_parse_cpu_init(void) { - 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_assert0((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); - - current_property_set = xbt_dict_new(); - ptask_cpu_new(A_surfxml_host_id, power_scale, power_initial, power_trace, - state_initial, state_trace, current_property_set); -} - -static void ptask_cpu_create_resource(char *name, double power_peak, - double power_scale, - tmgr_trace_t power_trace, - e_surf_resource_state_t state_initial, - tmgr_trace_t state_trace, - xbt_dict_t cpu_properties) -{ - ptask_cpu_new(xbt_strdup(name),power_peak,power_scale,power_trace, - state_initial,state_trace,cpu_properties); -} - -static link_L07_t ptask_link_new(char *name, - double bw_initial, - tmgr_trace_t bw_trace, - double lat_initial, - tmgr_trace_t lat_trace, - e_surf_resource_state_t - state_initial, - tmgr_trace_t state_trace, - e_surf_link_sharing_policy_t - policy, xbt_dict_t properties) + 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; +} + +static void* ptask_link_create_resource(char *name, + double bw_initial, + tmgr_trace_t bw_trace, + double lat_initial, + tmgr_trace_t lat_trace, + e_surf_resource_state_t + state_initial, + tmgr_trace_t state_trace, + e_surf_link_sharing_policy_t + policy, xbt_dict_t properties) { link_L07_t nw_link = xbt_new0(s_link_L07_t, 1); - xbt_assert1(!xbt_dict_get_or_null(surf_network_model->resource_set, name), - "Link '%s' declared several times in the platform file.", name); + xbt_assert(!xbt_lib_get_or_null(link_lib, name, SURF_LINK_LEVEL), + "Link '%s' declared several times in the platform file.", + name); nw_link->generic_resource.model = surf_workstation_model; nw_link->generic_resource.properties = properties; @@ -697,100 +690,48 @@ static link_L07_t ptask_link_new(char *name, nw_link->bw_current = bw_initial; if (bw_trace) nw_link->bw_event = - tmgr_history_add_trace(history, bw_trace, 0.0, 0, nw_link); + tmgr_history_add_trace(history, bw_trace, 0.0, 0, nw_link); nw_link->state_current = state_initial; nw_link->lat_current = lat_initial; if (lat_trace) nw_link->lat_event = - tmgr_history_add_trace(history, lat_trace, 0.0, 0, nw_link); + tmgr_history_add_trace(history, lat_trace, 0.0, 0, nw_link); if (state_trace) nw_link->state_event = - tmgr_history_add_trace(history, state_trace, 0.0, 0, nw_link); + tmgr_history_add_trace(history, state_trace, 0.0, 0, nw_link); nw_link->constraint = - lmm_constraint_new(ptask_maxmin_system, nw_link, nw_link->bw_current); + lmm_constraint_new(ptask_maxmin_system, nw_link, + nw_link->bw_current); if (policy == SURF_LINK_FATPIPE) lmm_constraint_shared(nw_link->constraint); - - xbt_dict_set(surf_network_model->resource_set, name, nw_link, - surf_resource_free); - + xbt_lib_set(link_lib, name, SURF_LINK_LEVEL, nw_link); return nw_link; } static void ptask_parse_link_init(void) { - char *name_link; - 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; - - 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_assert0((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; - else if (A_surfxml_link_sharing_policy == - A_surfxml_link_sharing_policy_FATPIPE) - policy_initial_link = SURF_LINK_FATPIPE; - - state_trace = tmgr_trace_new(A_surfxml_link_state_file); - - current_property_set = xbt_dict_new(); - ptask_link_new(name_link, bw_initial, bw_trace, lat_initial, lat_trace, - state_initial_link, state_trace, policy_initial_link, - current_property_set); -} - -/** - * FIXME : still improvable - */ -void workstation_link_create_resource(char *name, - double initial_bandwidth,double initial_latency) -{ - - char* name_link; - 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; - - name_link = xbt_strdup(name); - bw_initial = initial_bandwidth; - bw_trace = tmgr_trace_new(""); - lat_initial = initial_latency; - lat_trace = tmgr_trace_new(""); - // FIXME Hard Coded Values - //state_initial_link = SURF_RESOURCE_ON; - //policy_initial_link = SURF_LINK_SHARED; - state_trace = tmgr_trace_new(""); + 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); + } - ptask_link_new(name_link, bw_initial, bw_trace, - lat_initial, lat_trace, state_initial_link, state_trace, - policy_initial_link, xbt_dict_new()); + current_property_set = NULL; } - static void ptask_add_traces(void) { xbt_dict_cursor_t cursor = NULL; @@ -802,43 +743,46 @@ static void ptask_add_traces(void) /* Connect traces relative to cpu */ xbt_dict_foreach(trace_connect_list_host_avail, cursor, trace_name, elm) { tmgr_trace_t trace = xbt_dict_get_or_null(traces_set_list, trace_name); - cpu_L07_t host = surf_model_resource_by_name(surf_workstation_model, elm); + cpu_L07_t host = surf_workstation_resource_by_name(elm); - xbt_assert1(host, "Host %s undefined", elm); - xbt_assert1(trace, "Trace %s undefined", trace_name); + xbt_assert(host, "Host %s undefined", elm); + xbt_assert(trace, "Trace %s undefined", trace_name); - host->state_event = tmgr_history_add_trace(history, trace, 0.0, 0, host); + host->state_event = + tmgr_history_add_trace(history, trace, 0.0, 0, host); } xbt_dict_foreach(trace_connect_list_power, cursor, trace_name, elm) { tmgr_trace_t trace = xbt_dict_get_or_null(traces_set_list, trace_name); - cpu_L07_t host = surf_model_resource_by_name(surf_workstation_model, elm); + cpu_L07_t host = surf_workstation_resource_by_name(elm); - xbt_assert1(host, "Host %s undefined", elm); - xbt_assert1(trace, "Trace %s undefined", trace_name); + xbt_assert(host, "Host %s undefined", elm); + xbt_assert(trace, "Trace %s undefined", trace_name); - host->power_event = tmgr_history_add_trace(history, trace, 0.0, 0, host); + host->power_event = + tmgr_history_add_trace(history, trace, 0.0, 0, host); } /* Connect traces relative to network */ xbt_dict_foreach(trace_connect_list_link_avail, cursor, trace_name, elm) { tmgr_trace_t trace = xbt_dict_get_or_null(traces_set_list, trace_name); link_L07_t link = - xbt_dict_get_or_null(surf_network_model->resource_set, elm); + xbt_lib_get_or_null(link_lib, elm, SURF_LINK_LEVEL); - xbt_assert1(link, "Link %s undefined", elm); - xbt_assert1(trace, "Trace %s undefined", trace_name); + xbt_assert(link, "Link %s undefined", elm); + xbt_assert(trace, "Trace %s undefined", trace_name); - link->state_event = tmgr_history_add_trace(history, trace, 0.0, 0, link); + link->state_event = + tmgr_history_add_trace(history, trace, 0.0, 0, link); } xbt_dict_foreach(trace_connect_list_bandwidth, cursor, trace_name, elm) { tmgr_trace_t trace = xbt_dict_get_or_null(traces_set_list, trace_name); link_L07_t link = - xbt_dict_get_or_null(surf_network_model->resource_set, elm); + xbt_lib_get_or_null(link_lib, elm, SURF_LINK_LEVEL); - xbt_assert1(link, "Link %s undefined", elm); - xbt_assert1(trace, "Trace %s undefined", trace_name); + xbt_assert(link, "Link %s undefined", elm); + xbt_assert(trace, "Trace %s undefined", trace_name); link->bw_event = tmgr_history_add_trace(history, trace, 0.0, 0, link); } @@ -846,10 +790,10 @@ static void ptask_add_traces(void) xbt_dict_foreach(trace_connect_list_latency, cursor, trace_name, elm) { tmgr_trace_t trace = xbt_dict_get_or_null(traces_set_list, trace_name); link_L07_t link = - xbt_dict_get_or_null(surf_network_model->resource_set, elm); + xbt_lib_get_or_null(link_lib, elm, SURF_LINK_LEVEL); - xbt_assert1(link, "Link %s undefined", elm); - xbt_assert1(trace, "Trace %s undefined", trace_name); + xbt_assert(link, "Link %s undefined", elm); + xbt_assert(trace, "Trace %s undefined", trace_name); link->lat_event = tmgr_history_add_trace(history, trace, 0.0, 0, link); } @@ -858,9 +802,8 @@ static void ptask_add_traces(void) static void ptask_define_callbacks(const char *file) { /* Adding callback functions */ - surf_parse_reset_parser(); - surfxml_add_callback(STag_surfxml_host_cb_list, &ptask_parse_cpu_init); - surfxml_add_callback(STag_surfxml_link_cb_list, &ptask_parse_link_init); + 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); } @@ -883,47 +826,55 @@ static void ptask_model_init_internal(void) surf_workstation_model->get_remains = ptask_action_get_remains; surf_workstation_model->name = "Workstation ptask_L07"; - surf_workstation_model->model_private->resource_used = ptask_resource_used; - surf_workstation_model->model_private->share_resources = ptask_share_resources; + surf_workstation_model->model_private->resource_used = + ptask_resource_used; + surf_workstation_model->model_private->share_resources = + ptask_share_resources; surf_workstation_model->model_private->update_actions_state = - ptask_update_actions_state; + ptask_update_actions_state; surf_workstation_model->model_private->update_resource_state = - ptask_update_resource_state; + ptask_update_resource_state; surf_workstation_model->model_private->finalize = ptask_finalize; surf_workstation_model->extension.workstation.execute = ptask_execute; surf_workstation_model->extension.workstation.sleep = ptask_action_sleep; surf_workstation_model->extension.workstation.get_state = - ptask_resource_get_state; - surf_workstation_model->extension.workstation.get_speed = ptask_get_speed; + ptask_resource_get_state; + surf_workstation_model->extension.workstation.get_speed = + ptask_get_speed; surf_workstation_model->extension.workstation.get_available_speed = - ptask_get_available_speed; - surf_workstation_model->extension.workstation.communicate = ptask_communicate; - surf_workstation_model->extension.workstation.get_route = ptask_get_route; + ptask_get_available_speed; + surf_workstation_model->extension.workstation.communicate = + ptask_communicate; + surf_workstation_model->extension.workstation.get_route = + ptask_get_route; surf_workstation_model->extension.workstation.execute_parallel_task = - ptask_execute_parallel_task; + ptask_execute_parallel_task; surf_workstation_model->extension.workstation.get_link_bandwidth = - ptask_get_link_bandwidth; + ptask_get_link_bandwidth; surf_workstation_model->extension.workstation.get_link_latency = - ptask_get_link_latency; - surf_workstation_model->extension.workstation.link_shared = ptask_link_shared; + ptask_get_link_latency; + surf_workstation_model->extension.workstation.link_shared = + ptask_link_shared; surf_workstation_model->extension.workstation.get_properties = - surf_resource_properties; + surf_resource_properties; surf_workstation_model->extension.workstation.link_create_resource = - workstation_link_create_resource; + ptask_link_create_resource; surf_workstation_model->extension.workstation.cpu_create_resource = - ptask_cpu_create_resource; - surf_workstation_model->extension.workstation.add_traces = ptask_add_traces; + ptask_cpu_create_resource; + surf_workstation_model->extension.workstation.add_traces = + ptask_add_traces; if (!ptask_maxmin_system) ptask_maxmin_system = lmm_system_new(); routing_model_create(sizeof(link_L07_t), - ptask_link_new(xbt_strdup("__loopback__"), - 498000000, NULL, 0.000015, NULL, - SURF_RESOURCE_ON, NULL, SURF_LINK_FATPIPE, - NULL)); + ptask_link_create_resource(xbt_strdup("__loopback__"), + 498000000, NULL, 0.000015, NULL, + SURF_RESOURCE_ON, NULL, + SURF_LINK_FATPIPE, NULL), + ptask_get_link_latency); } @@ -932,9 +883,9 @@ static void ptask_model_init_internal(void) /**************************************/ void surf_workstation_model_init_ptask_L07(const char *filename) { - INFO0("surf_workstation_model_init_ptask_L07"); - xbt_assert0(!surf_cpu_model, "CPU model type already defined"); - xbt_assert0(!surf_network_model, "network model type already defined"); + 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_model_init_internal();