X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5e52cdafc655354a1c98193c817fc205d5be353e..2e6cdac131b649b1ccd7d8e8c5fe85c0dcf57904:/src/surf/workstation_ptask_L07.c diff --git a/src/surf/workstation_ptask_L07.c b/src/surf/workstation_ptask_L07.c index 5d94ad59fb..3a63505533 100644 --- a/src/surf/workstation_ptask_L07.c +++ b/src/surf/workstation_ptask_L07.c @@ -13,7 +13,7 @@ typedef enum { SURF_WORKSTATION_RESOURCE_CPU, - SURF_WORKSTATION_RESOURCE_LINK, + SURF_WORKSTATION_RESOURCE_LINK } e_surf_workstation_model_type_t; /**************************************/ @@ -26,9 +26,9 @@ typedef struct cpu_L07 { 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; - int id; /* cpu and network card are a single object... */ + e_surf_resource_state_t state_current; + sg_routing_edge_t info; } s_cpu_L07_t, *cpu_L07_t; /**************************************/ @@ -69,6 +69,19 @@ static int ptask_host_count = 0; static xbt_dict_t ptask_parallel_task_link_set = NULL; lmm_system_t ptask_maxmin_system = NULL; +static surf_action_t die_impossible_communicate (sg_routing_edge_t src, + sg_routing_edge_t dst, + double size, double rate) +{ + DIE_IMPOSSIBLE; + return NULL; +} + +static xbt_dynar_t die_impossible_get_route(void *src, void *dst) +{ + DIE_IMPOSSIBLE; + return NULL; +} static void ptask_update_action_bound(surf_action_workstation_L07_t action) { @@ -76,28 +89,19 @@ 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(((cpu_L07_t)surf_workstation_resource_priv(action->workstation_list[i]))->info, + ((cpu_L07_t)surf_workstation_resource_priv(action->workstation_list[j]))->info, + &route, &lat); lat_current = MAX(lat_current, - lat * action->communication_amount[i * workstation_nb + - j]); + lat * action->communication_amount[i * workstation_nb + j]); } } } @@ -130,6 +134,9 @@ static int ptask_action_unref(surf_action_t action) 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); +#ifdef HAVE_TRACING + xbt_free(action->category); +#endif surf_action_free(&action); return 1; } @@ -195,8 +202,8 @@ static void ptask_action_set_priority(surf_action_t action, static double ptask_action_get_remains(surf_action_t action) { XBT_IN("(%p)", action); - return action->remains; XBT_OUT(); + return action->remains; } /**************************************/ @@ -298,19 +305,19 @@ static void ptask_update_actions_state(double now, double delta) i++))) { constraint_id = lmm_constraint_id(cnst); -/* if(((link_L07_t)constraint_id)->type== */ -/* SURF_WORKSTATION_RESOURCE_LINK) { */ -/* 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) { */ -/* 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"); */ -/* } */ +/* if(((link_L07_t)constraint_id)->type== */ +/* SURF_WORKSTATION_RESOURCE_LINK) { */ +/* 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) { */ +/* 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"); */ +/* } */ if (((((link_L07_t) constraint_id)->type == SURF_WORKSTATION_RESOURCE_LINK) && @@ -340,7 +347,8 @@ static void ptask_update_resource_state(void *id, link_L07_t nw_link = id; if (nw_link->type == SURF_WORKSTATION_RESOURCE_LINK) { - XBT_DEBUG("Updating link %s (%p)", surf_resource_name(nw_link), nw_link); + XBT_DEBUG("Updating link %s (%p) with value=%f for date=%g", + surf_resource_name(nw_link), nw_link, value, date); if (event_type == nw_link->bw_event) { nw_link->bw_current = value; lmm_update_constraint_bound(ptask_maxmin_system, nw_link->constraint, @@ -425,17 +433,17 @@ static void ptask_finalize(void) static e_surf_resource_state_t ptask_resource_get_state(void *cpu) { - return ((cpu_L07_t) cpu)->state_current; + return ((cpu_L07_t)surf_workstation_resource_priv(cpu))->state_current; } static double ptask_get_speed(void *cpu, double load) { - return load * (((cpu_L07_t) cpu)->power_scale); + return load * ((cpu_L07_t)surf_workstation_resource_priv(cpu))->power_scale; } static double ptask_get_available_speed(void *cpu) { - return ((cpu_L07_t) cpu)->power_current; + return ((cpu_L07_t)surf_workstation_resource_priv(cpu))->power_current; } static surf_action_t ptask_execute_parallel_task(int workstation_nb, @@ -443,7 +451,6 @@ static surf_action_t ptask_execute_parallel_task(int workstation_nb, double *computation_amount, double *communication_amount, - double amount, double rate) { surf_action_workstation_L07_t action = NULL; @@ -454,28 +461,30 @@ static surf_action_t ptask_execute_parallel_task(int workstation_nb, 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( + ((cpu_L07_t)surf_workstation_resource_priv(workstation_list[i]))->info, + ((cpu_L07_t)surf_workstation_resource_priv(workstation_list[j]))->info, + &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); + } } } @@ -487,7 +496,7 @@ 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_action_new(sizeof(s_surf_action_workstation_L07_t), 1, surf_workstation_model, 0); XBT_DEBUG("Creating a parallel task (%p) with %d cpus and %d links.", action, workstation_nb, nb_link); @@ -510,20 +519,21 @@ static surf_action_t ptask_execute_parallel_task(int workstation_nb, for (i = 0; i < workstation_nb; i++) lmm_expand(ptask_maxmin_system, - ((cpu_L07_t) workstation_list[i])->constraint, + ((cpu_L07_t)surf_workstation_resource_priv(workstation_list[i]))->constraint, action->variable, computation_amount[i]); 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( + ((cpu_L07_t)surf_workstation_resource_priv(workstation_list[i]))->info, + ((cpu_L07_t)surf_workstation_resource_priv(workstation_list[j]))->info, + &route,NULL); + xbt_dynar_foreach(route, cpt, link) { lmm_expand_add(ptask_maxmin_system, link->constraint, action->variable, @@ -552,7 +562,7 @@ static surf_action_t ptask_execute(void *cpu, double size) return ptask_execute_parallel_task(1, workstation_list, computation_amount, - communication_amount, 1, -1); + communication_amount, -1); } static surf_action_t ptask_communicate(void *src, void *dst, double size, @@ -569,7 +579,7 @@ static surf_action_t ptask_communicate(void *src, void *dst, double size, res = ptask_execute_parallel_task(2, workstation_list, computation_amount, - communication_amount, 1, rate); + communication_amount, rate); return res; } @@ -589,10 +599,13 @@ static surf_action_t ptask_action_sleep(void *cpu, double duration) 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( + ((cpu_L07_t)surf_workstation_resource_priv(src))->info, ((cpu_L07_t)surf_workstation_resource_priv(dst))->info, + &route,NULL); + return route; } static double ptask_get_link_bandwidth(const void *link) @@ -622,7 +635,7 @@ static void* ptask_cpu_create_resource(const char *name, double power_scale, xbt_dict_t cpu_properties) { cpu_L07_t cpu = NULL; - xbt_assert(!surf_workstation_resource_by_name(name), + xbt_assert(!surf_workstation_resource_priv(surf_workstation_resource_by_name(name)), "Host '%s' declared several times in the platform file.", name); @@ -630,7 +643,8 @@ static void* ptask_cpu_create_resource(const char *name, double power_scale, surf_workstation_model, name,cpu_properties); cpu->type = SURF_WORKSTATION_RESOURCE_CPU; - cpu->id = ptask_host_count++; + cpu->info = xbt_lib_get_or_null(host_lib, name, ROUTING_HOST_LEVEL); + if(!(cpu->info)) xbt_die("Don't find ROUTING_HOST_LEVEL for '%s'",name); cpu->power_scale = power_scale; xbt_assert(cpu->power_scale > 0, "Power has to be >0"); @@ -651,19 +665,19 @@ static void* ptask_cpu_create_resource(const char *name, double power_scale, xbt_lib_set(host_lib, name, SURF_WKS_LEVEL, cpu); - return cpu; + return xbt_lib_get_elm_or_null(host_lib, name); } static void ptask_parse_cpu_init(sg_platf_host_cbarg_t host) { ptask_cpu_create_resource( - host->id, - host->power_peak, - host->power_scale, - host->power_trace, - host->initial_state, - host->state_trace, - host->properties); + 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, @@ -726,7 +740,7 @@ static void ptask_parse_link_init(sg_platf_link_cbarg_t 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, @@ -764,7 +778,7 @@ 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_workstation_resource_by_name(elm); + cpu_L07_t host = surf_workstation_resource_priv(surf_workstation_resource_by_name(elm)); xbt_assert(host, "Host %s undefined", elm); xbt_assert(trace, "Trace %s undefined", trace_name); @@ -775,7 +789,7 @@ static void ptask_add_traces(void) 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_workstation_resource_by_name(elm); + cpu_L07_t host = surf_workstation_resource_priv(surf_workstation_resource_by_name(elm)); xbt_assert(host, "Host %s undefined", elm); xbt_assert(trace, "Trace %s undefined", trace_name); @@ -788,7 +802,7 @@ static void ptask_add_traces(void) 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_lib_get_or_null(link_lib, elm, SURF_LINK_LEVEL); + xbt_lib_get_or_null(link_lib, elm, SURF_LINK_LEVEL); xbt_assert(link, "Link %s undefined", elm); xbt_assert(trace, "Trace %s undefined", trace_name); @@ -800,7 +814,7 @@ static void ptask_add_traces(void) 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_lib_get_or_null(link_lib, elm, SURF_LINK_LEVEL); + xbt_lib_get_or_null(link_lib, elm, SURF_LINK_LEVEL); xbt_assert(link, "Link %s undefined", elm); xbt_assert(trace, "Trace %s undefined", trace_name); @@ -811,7 +825,7 @@ 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_lib_get_or_null(link_lib, elm, SURF_LINK_LEVEL); + xbt_lib_get_or_null(link_lib, elm, SURF_LINK_LEVEL); xbt_assert(link, "Link %s undefined", elm); xbt_assert(trace, "Trace %s undefined", trace_name); @@ -879,23 +893,26 @@ static void ptask_model_init_internal(void) ptask_link_shared; surf_workstation_model->extension.workstation.get_properties = surf_resource_properties; - surf_workstation_model->extension.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; 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__", + routing_model_create(ptask_link_create_resource("__loopback__", 498000000, NULL, 0.000015, NULL, SURF_RESOURCE_ON, NULL, 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; } /**************************************/ @@ -906,7 +923,6 @@ 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(); ptask_model_init_internal(); xbt_dynar_push(model_list, &surf_workstation_model);