X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f3507930c130404d05f982cf9fe960fb95f7eb4b..f4ae32c676421a6cd5c076b273dd7a07f2695957:/src/surf/workstation_ptask_L07.c diff --git a/src/surf/workstation_ptask_L07.c b/src/surf/workstation_ptask_L07.c index b78601f011..989379e83b 100644 --- a/src/surf/workstation_ptask_L07.c +++ b/src/surf/workstation_ptask_L07.c @@ -6,6 +6,7 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include "xbt/ex.h" +#include "xbt/str.h" #include "xbt/dict.h" #include "surf_private.h" /* extern lmm_system_t maxmin_system; */ @@ -143,15 +144,15 @@ static xbt_dict_t get_properties(void *r) { static void action_use(surf_action_t action) { - action->using++; + action->refcount ++; return; } static int action_free(surf_action_t action) { - action->using--; + action->refcount --; - if (!action->using) { + if (!action->refcount ) { xbt_swag_remove(action, action->state_set); if (((surf_action_workstation_L07_t) action)->variable) lmm_variable_free(ptask_maxmin_system, @@ -360,7 +361,7 @@ static void update_actions_state(double now, double delta) static void update_resource_state(void *id, tmgr_trace_event_t event_type, - double value) + double value, double date) { cpu_L07_t cpu = id; link_L07_t nw_link = id; @@ -374,10 +375,11 @@ static void update_resource_state(void *id, } else if (event_type == nw_link->lat_event) { lmm_variable_t var = NULL; surf_action_workstation_L07_t action = NULL; + lmm_element_t elem = NULL; nw_link->lat_current = value; - while (lmm_get_var_from_cnst - (ptask_maxmin_system, nw_link->constraint, &var)) { + while ((var = lmm_get_var_from_cnst + (ptask_maxmin_system, nw_link->constraint, &elem))) { action = lmm_variable_id(var); @@ -399,7 +401,7 @@ static void update_resource_state(void *id, if (event_type == cpu->power_event) { cpu->power_current = value; lmm_update_constraint_bound(ptask_maxmin_system, cpu->constraint, - cpu->power_current); + cpu->power_current * cpu->power_scale); } else if (event_type == cpu->state_event) { if (value > 0) cpu->state_current = SURF_CPU_ON; @@ -485,10 +487,8 @@ static surf_action_t execute_parallel_task(int workstation_nb, int nb_host = 0; double latency = 0.0; - if (parallel_task_link_set == NULL) { - parallel_task_link_set = - xbt_dict_new_ext(workstation_nb * workstation_nb * 10); - } + if (parallel_task_link_set == NULL) + parallel_task_link_set = xbt_dict_new(); xbt_dict_reset(parallel_task_link_set); @@ -521,7 +521,7 @@ static surf_action_t execute_parallel_task(int workstation_nb, action = xbt_new0(s_surf_action_workstation_L07_t, 1); DEBUG3("Creating a parallel task (%p) with %d cpus and %d links.", action, workstation_nb, nb_link); - action->generic_action.using = 1; + action->generic_action.refcount = 1; action->generic_action.cost = amount; action->generic_action.remains = amount; action->generic_action.max_duration = NO_MAX_DURATION; @@ -542,14 +542,10 @@ static surf_action_t execute_parallel_task(int workstation_nb, xbt_swag_insert(action, action->generic_action.state_set); action->rate = rate; - if (action->rate > 0) - action->variable = - lmm_variable_new(ptask_maxmin_system, action, 1.0, -1.0, - workstation_nb + nb_link); - else - action->variable = - lmm_variable_new(ptask_maxmin_system, action, 1.0, action->rate, - workstation_nb + nb_link); + action->variable = + 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); @@ -665,6 +661,10 @@ static double get_link_latency(const void *link) return ((link_L07_t) link)->lat_current; } +static int link_shared(const void *link) +{ + return lmm_constraint_is_shared(((link_L07_t) link)->constraint); +} /**************************************/ /*** Resource Creation & Destruction **/ @@ -673,6 +673,7 @@ static double get_link_latency(const void *link) static void cpu_free(void *cpu) { free(((cpu_L07_t) cpu)->name); + xbt_dict_free(&(((cpu_L07_t)cpu)->properties)); free(cpu); } @@ -751,6 +752,7 @@ static void parse_cpu_init(void) static void link_free(void *nw_link) { free(((link_L07_t) nw_link)->name); + xbt_dict_free(&(((link_L07_t)nw_link)->properties)); free(nw_link); } @@ -868,8 +870,6 @@ static void parse_route_set_endpoints(void) dst_id = cpu_tmp->id; route_action = A_surfxml_route_action; - - route_link_list = xbt_dynar_new(sizeof(char*), &free_string); } static void parse_route_set_route(void) @@ -877,7 +877,6 @@ static void parse_route_set_route(void) char* name; if (src_id != -1 && dst_id != -1) { name = bprintf("%x#%x",src_id, dst_id); - manage_route(route_table, name, route_action, 0); free(name); } @@ -910,9 +909,10 @@ static void add_route(void) int link_list_capacity = 0; link_L07_t *link_list = NULL; xbt_dict_cursor_t cursor = NULL; - char *key,*data; + char *key,*data, *end; const char *sep = "#"; xbt_dynar_t links, keys; + char* link = NULL; if (routing_table == NULL) create_routing_table(); @@ -921,13 +921,13 @@ static void add_route(void) links = (xbt_dynar_t)data; keys = xbt_str_split_str(key, sep); - src_id = atoi(xbt_dynar_get_as(keys, 0, char*)); - dst_id = atoi(xbt_dynar_get_as(keys, 1, char*)); + src_id = strtol(xbt_dynar_get_as(keys, 0, char*), &end, 16); + dst_id = strtol(xbt_dynar_get_as(keys, 1, char*), &end, 16); link_list_capacity = xbt_dynar_length(links); link_list = xbt_new(link_L07_t, link_list_capacity); - char* link = NULL; + xbt_dynar_foreach (links, cpt, link) { TRY { link_list[nb_link++] = xbt_dict_get(link_set, link); @@ -937,25 +937,68 @@ static void add_route(void) } } route_new(src_id, dst_id, link_list, nb_link); - xbt_dynar_free(&links); } - - xbt_dict_free(&route_table); } -static void add_traces(void) -{ - xbt_dynar_t trace_connect = NULL; - unsigned int cpt; - int connect_element, connect_kind; - char *value, *trace_id, *connector_id; - link_L07_t link; - cpu_L07_t host = NULL; - tmgr_trace_t trace; +static void add_traces(void) { + xbt_dict_cursor_t cursor=NULL; + char *trace_name,*elm; - if (!traces_connect_list) return; + if (!trace_connect_list_host_avail) return; - /*for all trace connects parse them and update traces for hosts or links */ + /* 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 = xbt_dict_get_or_null(workstation_set, elm); + + xbt_assert1(host, "Host %s undefined", elm); + xbt_assert1(trace, "Trace %s undefined", trace_name); + + 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 = xbt_dict_get_or_null(workstation_set, elm); + + xbt_assert1(host, "Host %s undefined", elm); + xbt_assert1(trace, "Trace %s undefined", trace_name); + + 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(link_set, elm); + + xbt_assert1(link, "Link %s undefined", elm); + xbt_assert1(trace, "Trace %s undefined", trace_name); + + 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(link_set, elm); + + xbt_assert1(link, "Link %s undefined", elm); + xbt_assert1(trace, "Trace %s undefined", trace_name); + + link->bw_event = tmgr_history_add_trace(history, trace, 0.0, 0, link); + } + + 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(link_set, elm); + + xbt_assert1(link, "Link %s undefined", elm); + xbt_assert1(trace, "Trace %s undefined", trace_name); + + link->lat_event = tmgr_history_add_trace(history, trace, 0.0, 0, link); + } +/* + xbt_dynar_foreach (traces_connect_list, cpt, value) { trace_connect = xbt_str_split_str(value, "#"); trace_id = xbt_dynar_get_as(trace_connect, 0, char*); @@ -981,10 +1024,7 @@ static void add_traces(void) } } } - - xbt_dynar_free(&trace_connect); - xbt_dynar_free(&traces_connect_list); - xbt_dict_free(&traces_set_list); +*/ } static void define_callbacks(const char *file) @@ -992,25 +1032,12 @@ static void define_callbacks(const char *file) /* Adding callback functions */ surf_parse_reset_parser(); surfxml_add_callback(STag_surfxml_host_cb_list, &parse_cpu_init); - surfxml_add_callback(STag_surfxml_prop_cb_list, &parse_properties); surfxml_add_callback(STag_surfxml_link_cb_list, &parse_link_init); surfxml_add_callback(STag_surfxml_route_cb_list, &parse_route_set_endpoints); - surfxml_add_callback(ETag_surfxml_link_c_ctn_cb_list, &parse_route_elem); surfxml_add_callback(ETag_surfxml_route_cb_list, &parse_route_set_route); - surfxml_add_callback(STag_surfxml_platform_cb_list, &init_data); surfxml_add_callback(ETag_surfxml_platform_cb_list, &add_route); surfxml_add_callback(ETag_surfxml_platform_cb_list, &add_loopback); surfxml_add_callback(ETag_surfxml_platform_cb_list, &add_traces); - surfxml_add_callback(STag_surfxml_set_cb_list, &parse_sets); - surfxml_add_callback(STag_surfxml_route_c_multi_cb_list, &parse_route_multi_set_endpoints); - surfxml_add_callback(ETag_surfxml_route_c_multi_cb_list, &parse_route_multi_set_route); - surfxml_add_callback(STag_surfxml_foreach_cb_list, &parse_foreach); - surfxml_add_callback(STag_surfxml_cluster_cb_list, &parse_cluster); - surfxml_add_callback(STag_surfxml_trace_cb_list, &parse_trace_init); - surfxml_add_callback(ETag_surfxml_trace_cb_list, &parse_trace_finalize); - surfxml_add_callback(STag_surfxml_trace_c_connect_cb_list, &parse_trace_c_connect); - surfxml_add_callback(STag_surfxml_random_cb_list, &init_randomness); - surfxml_add_callback(ETag_surfxml_random_cb_list, &add_randomness); } @@ -1096,11 +1123,13 @@ static void model_init_internal(void) get_link_bandwidth; surf_workstation_model->extension_public->get_link_latency = get_link_latency; + surf_workstation_model->extension_public->link_shared = + link_shared; surf_workstation_model->common_public->get_properties = get_properties; - workstation_set = xbt_dict_new_ext(1024); - link_set = xbt_dict_new_ext(1024); + workstation_set = xbt_dict_new(); + link_set = xbt_dict_new(); if (!ptask_maxmin_system) ptask_maxmin_system = lmm_system_new(); @@ -1118,8 +1147,7 @@ void surf_workstation_model_init_ptask_L07(const char *filename) define_callbacks(filename); update_model_description(surf_workstation_model_description, - surf_workstation_model_description_size, - "ptask_L07", - (surf_model_t) surf_workstation_model); + "ptask_L07", + (surf_model_t) surf_workstation_model); xbt_dynar_push(model_list, &surf_workstation_model); }