X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4959dfb50f77f6569ae7c59a2b1bdb18d07bfc02..07ce716b44d53a070fc2358ec727bb1975198200:/src/surf/workstation_ptask_L07.c diff --git a/src/surf/workstation_ptask_L07.c b/src/surf/workstation_ptask_L07.c index 666d7d7fd0..6b7e0aa30d 100644 --- a/src/surf/workstation_ptask_L07.c +++ b/src/surf/workstation_ptask_L07.c @@ -19,14 +19,13 @@ typedef enum { /********* cpu object *****************/ /**************************************/ typedef struct cpu_L07 { - s_surf_resource_t generic_resource; /* Do not move this field: must match surf_resource_t */ - xbt_dict_t properties; /* Do not move this field: must match link_L07_t */ + s_surf_resource_t generic_resource; /* Do not move this field: must match surf_resource_t */ e_surf_workstation_model_type_t type; /* Do not move this field: must match link_L07_t */ lmm_constraint_t constraint; /* Do not move this field: must match link_L07_t */ double power_scale; double power_current; tmgr_trace_event_t power_event; - e_surf_cpu_state_t state_current; + e_surf_resource_state_t state_current; tmgr_trace_event_t state_event; int id; /* cpu and network card are a single object... */ } s_cpu_L07_t, *cpu_L07_t; @@ -36,24 +35,17 @@ typedef struct cpu_L07 { /**************************************/ typedef struct link_L07 { - s_surf_resource_t generic_resource; /* Do not move this field: must match surf_resource_t */ - xbt_dict_t properties; /* Do not move this field: must match link_L07_t */ + s_surf_resource_t generic_resource; /* Do not move this field: must match surf_resource_t */ e_surf_workstation_model_type_t type; /* Do not move this field: must match cpu_L07_t */ lmm_constraint_t constraint; /* Do not move this field: must match cpu_L07_t */ double lat_current; tmgr_trace_event_t lat_event; double bw_current; tmgr_trace_event_t bw_event; - e_surf_link_state_t state_current; + e_surf_resource_state_t state_current; tmgr_trace_event_t state_event; } s_link_L07_t, *link_L07_t; - -typedef struct s_route_L07 { - link_L07_t *links; - int size; -} s_route_L07_t, *route_L07_t; - /**************************************/ /*************** actions **************/ /**************************************/ @@ -72,32 +64,30 @@ typedef struct surf_action_workstation_L07 { XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_workstation); -static int nb_workstation = 0; -static s_route_L07_t *routing_table = NULL; -#define ROUTE(i,j) routing_table[(i)+(j)*nb_workstation] -static link_L07_t loopback = NULL; -static xbt_dict_t parallel_task_link_set = NULL; +static int ptask_host_count = 0; +static xbt_dict_t ptask_parallel_task_link_set = NULL; lmm_system_t ptask_maxmin_system = NULL; -static void update_action_bound(surf_action_workstation_L07_t action) +static void ptask_update_action_bound(surf_action_workstation_L07_t action) { int workstation_nb = action->workstation_nb; double lat_current = 0.0; double lat_bound = -1.0; - int i, j, k; + int i, j; + unsigned int cpt; + link_L07_t link; 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]; - int route_size = ROUTE(card_src->id, card_dst->id).size; - link_L07_t *route = ROUTE(card_src->id, card_dst->id).links; + xbt_dynar_t route = used_routing->get_route(card_src->id, card_dst->id); double lat = 0.0; if (action->communication_amount[i * workstation_nb + j] > 0) { - for (k = 0; k < route_size; k++) { - lat += route[k]->lat_current; + xbt_dynar_foreach(route, cpt, link) { + lat += link->lat_current; } lat_current = MAX(lat_current, @@ -121,13 +111,7 @@ static void update_action_bound(surf_action_workstation_L07_t action) /******* Resource Public **********/ /**************************************/ -static xbt_dict_t get_properties(void *r) -{ - /* We can freely cast as a cpu_L07_t since it has the same prefix than link_L07_t */ - return ((cpu_L07_t) r)->properties; -} - -static int action_unref(surf_action_t action) +static int ptask_action_unref(surf_action_t action) { action->refcount--; @@ -145,7 +129,7 @@ static int action_unref(surf_action_t action) return 0; } -static void action_cancel(surf_action_t action) +static void ptask_action_cancel(surf_action_t action) { surf_action_state_set(action, SURF_ACTION_FAILED); return; @@ -154,7 +138,7 @@ static void action_cancel(surf_action_t action) /* action_change_state is inherited from the surf module */ /* action_set_data is inherited from the surf module */ -static void action_suspend(surf_action_t action) +static void ptask_action_suspend(surf_action_t action) { XBT_IN1("(%p))", action); if (((surf_action_workstation_L07_t) action)->suspended != 2) { @@ -166,7 +150,7 @@ static void action_suspend(surf_action_t action) XBT_OUT; } -static void action_resume(surf_action_t action) +static void ptask_action_resume(surf_action_t action) { surf_action_workstation_L07_t act = (surf_action_workstation_L07_t) action; @@ -178,12 +162,12 @@ static void action_resume(surf_action_t action) XBT_OUT; } -static int action_is_suspended(surf_action_t action) +static int ptask_action_is_suspended(surf_action_t action) { return (((surf_action_workstation_L07_t) action)->suspended == 1); } -static void 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); action->max_duration = duration; @@ -191,18 +175,25 @@ static void action_set_max_duration(surf_action_t action, double duration) } -static void 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); action->priority = priority; XBT_OUT; } +static double ptask_action_get_remains(surf_action_t action) +{ + XBT_IN1("(%p)", action); + return action->remains; + XBT_OUT; +} + /**************************************/ /******* Resource Private **********/ /**************************************/ -static int resource_used(void *resource_id) +static int ptask_resource_used(void *resource_id) { /* We can freely cast as a link_L07_t because it has the same prefix as cpu_L07_t */ @@ -211,7 +202,7 @@ static int resource_used(void *resource_id) } -static double share_resources(double now) +static double ptask_share_resources(double now) { s_surf_action_workstation_L07_t s_action; surf_action_workstation_L07_t action = NULL; @@ -243,7 +234,7 @@ static double share_resources(double now) return min; } -static void update_actions_state(double now, double delta) +static void ptask_update_actions_state(double now, double delta) { double deltap = 0.0; surf_action_workstation_L07_t action = NULL; @@ -262,7 +253,7 @@ static void update_actions_state(double now, double delta) action->latency = 0.0; } if ((action->latency == 0.0) && (action->suspended == 0)) { - update_action_bound(action); + ptask_update_action_bound(action); lmm_update_variable_weight(ptask_maxmin_system, action->variable, 1.0); } @@ -314,14 +305,14 @@ static void update_actions_state(double now, double delta) if (((((link_L07_t) constraint_id)->type == SURF_WORKSTATION_RESOURCE_LINK) && (((link_L07_t) constraint_id)->state_current == - SURF_LINK_OFF)) || + SURF_RESOURCE_OFF)) || ((((cpu_L07_t) constraint_id)->type == SURF_WORKSTATION_RESOURCE_CPU) && - (((cpu_L07_t) constraint_id)->state_current == SURF_CPU_OFF))) { + (((cpu_L07_t) constraint_id)->state_current == + SURF_RESOURCE_OFF))) { DEBUG1("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; } } @@ -330,7 +321,7 @@ static void update_actions_state(double now, double delta) return; } -static void update_resource_state(void *id, +static void ptask_update_resource_state(void *id, tmgr_trace_event_t event_type, double value, double date) { @@ -338,11 +329,13 @@ static void update_resource_state(void *id, link_L07_t nw_link = id; if (nw_link->type == SURF_WORKSTATION_RESOURCE_LINK) { - DEBUG2("Updating link %s (%p)", nw_link->generic_resource.name, nw_link); + DEBUG2("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, nw_link->bw_current); + if (tmgr_trace_event_free(event_type)) + nw_link->bw_event = NULL; } else if (event_type == nw_link->lat_event) { lmm_variable_t var = NULL; surf_action_workstation_L07_t action = NULL; @@ -354,30 +347,39 @@ static void update_resource_state(void *id, action = lmm_variable_id(var); - update_action_bound(action); + ptask_update_action_bound(action); } + if (tmgr_trace_event_free(event_type)) + nw_link->lat_event = NULL; } else if (event_type == nw_link->state_event) { if (value > 0) - nw_link->state_current = SURF_LINK_ON; + nw_link->state_current = SURF_RESOURCE_ON; else - nw_link->state_current = SURF_LINK_OFF; + nw_link->state_current = SURF_RESOURCE_OFF; + if (tmgr_trace_event_free(event_type)) + nw_link->state_event = NULL; } else { CRITICAL0("Unknown event ! \n"); xbt_abort(); } return; } else if (cpu->type == SURF_WORKSTATION_RESOURCE_CPU) { - DEBUG3("Updating cpu %s (%p) with value %g", cpu->generic_resource.name, cpu, value); + DEBUG3("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, cpu->power_current * cpu->power_scale); + if (tmgr_trace_event_free(event_type)) + cpu->power_event = NULL; } else if (event_type == cpu->state_event) { if (value > 0) - cpu->state_current = SURF_CPU_ON; + cpu->state_current = SURF_RESOURCE_ON; else - cpu->state_current = SURF_CPU_OFF; + cpu->state_current = SURF_RESOURCE_OFF; + if (tmgr_trace_event_free(event_type)) + cpu->state_event = NULL; } else { CRITICAL0("Unknown event ! \n"); xbt_abort(); @@ -389,24 +391,18 @@ static void update_resource_state(void *id, return; } -static void finalize(void) +static void ptask_finalize(void) { - int i, j; - - xbt_dict_free(&link_set); - if (parallel_task_link_set != NULL) { - xbt_dict_free(¶llel_task_link_set); - } + if (ptask_parallel_task_link_set != NULL) + xbt_dict_free(&ptask_parallel_task_link_set); surf_model_exit(surf_workstation_model); surf_workstation_model = NULL; + surf_model_exit(surf_network_model); + surf_network_model = NULL; + used_routing->finalize(); - for (i = 0; i < nb_workstation; i++) - for (j = 0; j < nb_workstation; j++) - free(ROUTE(i, j).links); - free(routing_table); - routing_table = NULL; - nb_workstation = 0; + ptask_host_count = 0; if (ptask_maxmin_system) { lmm_system_free(ptask_maxmin_system); @@ -418,74 +414,70 @@ static void finalize(void) /******* Resource Private **********/ /**************************************/ -static e_surf_cpu_state_t resource_get_state(void *cpu) +static e_surf_resource_state_t ptask_resource_get_state(void *cpu) { return ((cpu_L07_t) cpu)->state_current; } -static double get_speed(void *cpu, double load) +static double ptask_get_speed(void *cpu, double load) { return load * (((cpu_L07_t) cpu)->power_scale); } -static double get_available_speed(void *cpu) +static double ptask_get_available_speed(void *cpu) { return ((cpu_L07_t) cpu)->power_current; } -static surf_action_t execute_parallel_task(int workstation_nb, +static surf_action_t ptask_execute_parallel_task(int workstation_nb, void **workstation_list, double *computation_amount, double *communication_amount, double amount, double rate) { surf_action_workstation_L07_t action = NULL; - int i, j, k; + int i, j; + unsigned int cpt; int nb_link = 0; int nb_host = 0; double latency = 0.0; - if (parallel_task_link_set == NULL) - parallel_task_link_set = xbt_dict_new(); + if (ptask_parallel_task_link_set == NULL) + ptask_parallel_task_link_set = xbt_dict_new(); - xbt_dict_reset(parallel_task_link_set); + 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++) { cpu_L07_t card_src = workstation_list[i]; cpu_L07_t card_dst = workstation_list[j]; - int route_size = ROUTE(card_src->id, card_dst->id).size; - link_L07_t *route = ROUTE(card_src->id, card_dst->id).links; + link_L07_t link; + xbt_dynar_t route = used_routing->get_route(card_src->id, card_dst->id); double lat = 0.0; if (communication_amount[i * workstation_nb + j] > 0) - for (k = 0; k < route_size; k++) { - lat += route[k]->lat_current; - xbt_dict_set(parallel_task_link_set, route[k]->generic_resource.name, - route[k], NULL); + xbt_dynar_foreach(route, cpt, link) { + lat += link->lat_current; + xbt_dict_set(ptask_parallel_task_link_set, link->generic_resource.name, + link, NULL); } latency = MAX(latency, lat); } } - nb_link = xbt_dict_length(parallel_task_link_set); - xbt_dict_reset(parallel_task_link_set); + nb_link = xbt_dict_length(ptask_parallel_task_link_set); + xbt_dict_reset(ptask_parallel_task_link_set); for (i = 0; i < workstation_nb; i++) if (computation_amount[i] > 0) nb_host++; - 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.refcount = 1; - action->generic_action.cost = amount; - action->generic_action.remains = amount; - action->generic_action.max_duration = NO_MAX_DURATION; - action->generic_action.start = surf_get_clock(); - action->generic_action.finish = -1.0; - action->generic_action.model_type = surf_workstation_model; + 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); action->suspended = 0; /* Should be useless because of the calloc but it seems to help valgrind... */ action->workstation_nb = workstation_nb; @@ -493,10 +485,6 @@ static surf_action_t execute_parallel_task(int workstation_nb, action->computation_amount = computation_amount; action->communication_amount = communication_amount; action->latency = latency; - action->generic_action.state_set = - surf_workstation_model->states.running_action_set; - - xbt_swag_insert(action, action->generic_action.state_set); action->rate = rate; action->variable = @@ -516,13 +504,13 @@ static surf_action_t execute_parallel_task(int workstation_nb, for (j = 0; j < workstation_nb; j++) { cpu_L07_t card_src = workstation_list[i]; cpu_L07_t card_dst = workstation_list[j]; - int route_size = ROUTE(card_src->id, card_dst->id).size; - link_L07_t *route = ROUTE(card_src->id, card_dst->id).links; + link_L07_t link; + xbt_dynar_t route = used_routing->get_route(card_src->id, card_dst->id); if (communication_amount[i * workstation_nb + j] == 0.0) continue; - for (k = 0; k < route_size; k++) { - lmm_expand_add(ptask_maxmin_system, route[k]->constraint, + xbt_dynar_foreach(route, cpt, link) { + lmm_expand_add(ptask_maxmin_system, link->constraint, action->variable, communication_amount[i * workstation_nb + j]); } @@ -537,7 +525,7 @@ static surf_action_t execute_parallel_task(int workstation_nb, return (surf_action_t) action; } -static surf_action_t execute(void *cpu, double size) +static surf_action_t ptask_execute(void *cpu, double size) { void **workstation_list = xbt_new0(void *, 1); double *computation_amount = xbt_new0(double, 1); @@ -547,11 +535,11 @@ static surf_action_t execute(void *cpu, double size) communication_amount[0] = 0.0; computation_amount[0] = size; - return execute_parallel_task(1, workstation_list, computation_amount, + return ptask_execute_parallel_task(1, workstation_list, computation_amount, communication_amount, 1, -1); } -static surf_action_t communicate(void *src, void *dst, double size, +static surf_action_t ptask_communicate(void *src, void *dst, double size, double rate) { void **workstation_list = xbt_new0(void *, 2); @@ -563,20 +551,20 @@ static surf_action_t communicate(void *src, void *dst, double size, workstation_list[1] = dst; communication_amount[1] = size; - res = execute_parallel_task(2, workstation_list, + res = ptask_execute_parallel_task(2, workstation_list, computation_amount, communication_amount, 1, rate); return res; } -static surf_action_t action_sleep(void *cpu, double duration) +static surf_action_t ptask_action_sleep(void *cpu, double duration) { surf_action_workstation_L07_t action = NULL; - XBT_IN2("(%s,%g)", ((cpu_L07_t) cpu)->generic_resource.name, duration); + XBT_IN2("(%s,%g)", surf_resource_name(cpu), duration); - action = (surf_action_workstation_L07_t) execute(cpu, 1.0); + 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); @@ -585,35 +573,25 @@ static surf_action_t action_sleep(void *cpu, double duration) return (surf_action_t) action; } -/* returns an array of link_L07_t */ -static const void **get_route(void *src, void *dst) +static xbt_dynar_t ptask_get_route(void *src, void *dst) { - cpu_L07_t card_src = src; - cpu_L07_t card_dst = dst; - route_L07_t route = &(ROUTE(card_src->id, card_dst->id)); + cpu_L07_t host_src = src; + cpu_L07_t host_dst = dst; - return (const void **) route->links; + return used_routing->get_route(host_src->id, host_dst->id); } -static int get_route_size(void *src, void *dst) -{ - cpu_L07_t card_src = src; - cpu_L07_t card_dst = dst; - route_L07_t route = &(ROUTE(card_src->id, card_dst->id)); - return route->size; -} - -static double get_link_bandwidth(const void *link) +static double ptask_get_link_bandwidth(const void *link) { return ((link_L07_t) link)->bw_current; } -static double get_link_latency(const void *link) +static double ptask_get_link_latency(const void *link) { return ((link_L07_t) link)->lat_current; } -static int link_shared(const void *link) +static int ptask_link_shared(const void *link) { return lmm_constraint_is_shared(((link_L07_t) link)->constraint); } @@ -622,16 +600,10 @@ static int link_shared(const void *link) /*** Resource Creation & Destruction **/ /**************************************/ -static void cpu_free(void *cpu) -{ - xbt_dict_free(&(((cpu_L07_t) cpu)->properties)); - surf_resource_free(cpu); -} - -static cpu_L07_t cpu_new(const char *name, double power_scale, +static cpu_L07_t ptask_cpu_new(const char *name, double power_scale, double power_initial, tmgr_trace_t power_trace, - e_surf_cpu_state_t state_initial, + 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); @@ -641,7 +613,8 @@ static cpu_L07_t cpu_new(const char *name, double power_scale, cpu->generic_resource.model = surf_workstation_model; cpu->type = SURF_WORKSTATION_RESOURCE_CPU; cpu->generic_resource.name = xbt_strdup(name); - cpu->id = nb_workstation++; + cpu->generic_resource.properties = current_property_set; + cpu->id = ptask_host_count++; cpu->power_scale = power_scale; xbt_assert0(cpu->power_scale > 0, "Power has to be >0"); @@ -660,70 +633,57 @@ static cpu_L07_t cpu_new(const char *name, double power_scale, lmm_constraint_new(ptask_maxmin_system, cpu, cpu->power_current * cpu->power_scale); - /*add the property set */ - cpu->properties = current_property_set; - xbt_dict_set(surf_model_resource_set(surf_workstation_model), name, cpu, - cpu_free); + surf_resource_free); return cpu; } -static void create_routing_table(void) -{ - routing_table = xbt_new0(s_route_L07_t, nb_workstation * nb_workstation); -} - -static void parse_cpu_init(void) +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_cpu_state_t state_initial = SURF_CPU_OFF; + 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); - surf_parse_get_trace(&power_trace, A_surfxml_host_availability_file); + 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_CPU_ON; + state_initial = SURF_RESOURCE_ON; if (A_surfxml_host_state == A_surfxml_host_state_OFF) - state_initial = SURF_CPU_OFF; - surf_parse_get_trace(&state_trace, A_surfxml_host_state_file); + state_initial = SURF_RESOURCE_OFF; + state_trace = tmgr_trace_new(A_surfxml_host_state_file); current_property_set = xbt_dict_new(); - cpu_new(A_surfxml_host_id, power_scale, power_initial, power_trace, + ptask_cpu_new(A_surfxml_host_id, power_scale, power_initial, power_trace, state_initial, state_trace, current_property_set); } -static void link_free(void *nw_link) -{ - xbt_dict_free(&(((link_L07_t) nw_link)->properties)); - surf_resource_free(nw_link); -} - -static link_L07_t link_new(char *name, +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_link_state_t + 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(link_set, name), + xbt_assert1(!xbt_dict_get_or_null(surf_network_model->resource_set, name), "Link '%s' declared several times in the platform file.", name); nw_link->generic_resource.model = surf_workstation_model; - nw_link->type = SURF_WORKSTATION_RESOURCE_LINK; + nw_link->generic_resource.properties = properties; nw_link->generic_resource.name = name; + nw_link->type = SURF_WORKSTATION_RESOURCE_LINK; nw_link->bw_current = bw_initial; if (bw_trace) nw_link->bw_event = @@ -743,37 +703,37 @@ static link_L07_t link_new(char *name, if (policy == SURF_LINK_FATPIPE) lmm_constraint_shared(nw_link->constraint); - nw_link->properties = properties; - xbt_dict_set(link_set, name, nw_link, link_free); + xbt_dict_set(surf_network_model->resource_set, name, nw_link, + surf_resource_free); return nw_link; } -static void parse_link_init(void) +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_link_state_t state_initial_link = SURF_LINK_ON; + 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); - surf_parse_get_trace(&bw_trace, A_surfxml_link_bandwidth_file); + bw_trace = tmgr_trace_new(A_surfxml_link_bandwidth_file); surf_parse_get_double(&lat_initial, A_surfxml_link_latency); - surf_parse_get_trace(&lat_trace, A_surfxml_link_latency_file); + 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_LINK_ON; + state_initial_link = SURF_RESOURCE_ON; else if (A_surfxml_link_state == A_surfxml_link_state_OFF) - state_initial_link = SURF_LINK_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; @@ -781,119 +741,15 @@ static void parse_link_init(void) A_surfxml_link_sharing_policy_FATPIPE) policy_initial_link = SURF_LINK_FATPIPE; - surf_parse_get_trace(&state_trace, A_surfxml_link_state_file); + state_trace = tmgr_trace_new(A_surfxml_link_state_file); current_property_set = xbt_dict_new(); - link_new(name_link, bw_initial, bw_trace, lat_initial, lat_trace, + ptask_link_new(name_link, bw_initial, bw_trace, lat_initial, lat_trace, state_initial_link, state_trace, policy_initial_link, current_property_set); } -static void route_new(int src_id, int dst_id, - link_L07_t * link_list, int nb_link) -{ - route_L07_t route = &(ROUTE(src_id, dst_id)); - - route->size = nb_link; - route->links = link_list = - xbt_realloc(link_list, sizeof(link_L07_t) * nb_link); -} - - -static int src_id = -1; -static int dst_id = -1; - -static void parse_route_set_endpoints(void) -{ - cpu_L07_t cpu_tmp = NULL; - - cpu_tmp = - (cpu_L07_t) surf_model_resource_by_name(surf_workstation_model, - A_surfxml_route_src); - xbt_assert1(cpu_tmp, "Invalid cpu %s", A_surfxml_route_src); - if (cpu_tmp != NULL) - src_id = cpu_tmp->id; - - cpu_tmp = - (cpu_L07_t) surf_model_resource_by_name(surf_workstation_model, - A_surfxml_route_dst); - xbt_assert1(cpu_tmp, "Invalid cpu %s", A_surfxml_route_dst); - if (cpu_tmp != NULL) - dst_id = cpu_tmp->id; - - route_action = A_surfxml_route_action; -} - -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); - } -} - -static void add_loopback(void) -{ - int i; - - /* Adding loopback if needed */ - for (i = 0; i < nb_workstation; i++) - if (!ROUTE(i, i).size) { - if (!loopback) - loopback = link_new(xbt_strdup("__MSG_loopback__"), - 498000000, NULL, 0.000015, NULL, - SURF_LINK_ON, NULL, SURF_LINK_FATPIPE, NULL); - - ROUTE(i, i).size = 1; - ROUTE(i, i).links = xbt_new0(link_L07_t, 1); - ROUTE(i, i).links[0] = loopback; - } -} - -static void add_route(void) -{ - xbt_ex_t e; - int nb_link = 0; - unsigned int cpt = 0; - int link_list_capacity = 0; - link_L07_t *link_list = NULL; - xbt_dict_cursor_t cursor = NULL; - char *key, *data, *end; - const char *sep = "#"; - xbt_dynar_t links, keys; - char *link = NULL; - - if (routing_table == NULL) - create_routing_table(); - - xbt_dict_foreach(route_table, cursor, key, data) { - nb_link = 0; - links = (xbt_dynar_t) data; - keys = xbt_str_split_str(key, sep); - - src_id = strtol(xbt_dynar_get_as(keys, 0, char *), &end, 16); - dst_id = strtol(xbt_dynar_get_as(keys, 1, char *), &end, 16); - xbt_dynar_free(&keys); - - link_list_capacity = xbt_dynar_length(links); - link_list = xbt_new(link_L07_t, link_list_capacity); - - - xbt_dynar_foreach(links, cpt, link) { - TRY { - link_list[nb_link++] = xbt_dict_get(link_set, link); - } - CATCH(e) { - RETHROW1("Link %s not found (dict raised this exception: %s)", link); - } - } - route_new(src_id, dst_id, link_list, nb_link); - } -} - -static void add_traces(void) +static void ptask_add_traces(void) { xbt_dict_cursor_t cursor = NULL; char *trace_name, *elm; @@ -925,7 +781,8 @@ static void add_traces(void) /* 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); + link_L07_t link = + xbt_dict_get_or_null(surf_network_model->resource_set, elm); xbt_assert1(link, "Link %s undefined", elm); xbt_assert1(trace, "Trace %s undefined", trace_name); @@ -935,7 +792,8 @@ static void 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_dict_get_or_null(link_set, elm); + link_L07_t link = + xbt_dict_get_or_null(surf_network_model->resource_set, elm); xbt_assert1(link, "Link %s undefined", elm); xbt_assert1(trace, "Trace %s undefined", trace_name); @@ -945,7 +803,8 @@ static void 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(link_set, elm); + link_L07_t link = + xbt_dict_get_or_null(surf_network_model->resource_set, elm); xbt_assert1(link, "Link %s undefined", elm); xbt_assert1(trace, "Trace %s undefined", trace_name); @@ -954,18 +813,13 @@ static void add_traces(void) } } -static void define_callbacks(const char *file) +static void ptask_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_link_cb_list, &parse_link_init); - surfxml_add_callback(STag_surfxml_route_cb_list, - &parse_route_set_endpoints); - surfxml_add_callback(ETag_surfxml_route_cb_list, &parse_route_set_route); - 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_host_cb_list, &ptask_parse_cpu_init); + surfxml_add_callback(STag_surfxml_link_cb_list, &ptask_parse_link_init); + surfxml_add_callback(ETag_surfxml_platform_cb_list, &ptask_add_traces); } @@ -973,53 +827,58 @@ static void define_callbacks(const char *file) /********* Module creation ***********/ /**************************************/ -static void model_init_internal(void) +static void ptask_model_init_internal(void) { surf_workstation_model = surf_model_init(); - surf_workstation_model->action_unref = action_unref; - surf_workstation_model->action_cancel = action_cancel; + surf_workstation_model->action_unref = ptask_action_unref; + surf_workstation_model->action_cancel = ptask_action_cancel; surf_workstation_model->action_state_set = surf_action_state_set; - surf_workstation_model->suspend = action_suspend; - surf_workstation_model->resume = action_resume; - surf_workstation_model->is_suspended = action_is_suspended; - surf_workstation_model->set_max_duration = action_set_max_duration; - surf_workstation_model->set_priority = action_set_priority; + surf_workstation_model->suspend = ptask_action_suspend; + surf_workstation_model->resume = ptask_action_resume; + surf_workstation_model->is_suspended = ptask_action_is_suspended; + surf_workstation_model->set_max_duration = ptask_action_set_max_duration; + surf_workstation_model->set_priority = ptask_action_set_priority; + surf_workstation_model->get_remains = ptask_action_get_remains; surf_workstation_model->name = "Workstation ptask_L07"; - surf_workstation_model->model_private->resource_used = resource_used; - surf_workstation_model->model_private->share_resources = 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 = - update_actions_state; + ptask_update_actions_state; surf_workstation_model->model_private->update_resource_state = - update_resource_state; - surf_workstation_model->model_private->finalize = finalize; + ptask_update_resource_state; + surf_workstation_model->model_private->finalize = ptask_finalize; - surf_workstation_model->extension.workstation.execute = execute; - surf_workstation_model->extension.workstation.sleep = action_sleep; + surf_workstation_model->extension.workstation.execute = ptask_execute; + surf_workstation_model->extension.workstation.sleep = ptask_action_sleep; surf_workstation_model->extension.workstation.get_state = - resource_get_state; - surf_workstation_model->extension.workstation.get_speed = get_speed; + ptask_resource_get_state; + surf_workstation_model->extension.workstation.get_speed = ptask_get_speed; surf_workstation_model->extension.workstation.get_available_speed = - get_available_speed; - surf_workstation_model->extension.workstation.communicate = communicate; + 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 = - execute_parallel_task; - surf_workstation_model->extension.workstation.get_route = get_route; - surf_workstation_model->extension.workstation.get_route_size = - get_route_size; + ptask_execute_parallel_task; surf_workstation_model->extension.workstation.get_link_bandwidth = - get_link_bandwidth; + ptask_get_link_bandwidth; surf_workstation_model->extension.workstation.get_link_latency = - get_link_latency; - surf_workstation_model->extension.workstation.link_shared = link_shared; - - surf_workstation_model->get_properties = get_properties; + ptask_get_link_latency; + surf_workstation_model->extension.workstation.link_shared = ptask_link_shared; + surf_workstation_model->extension.workstation.get_properties = + surf_resource_properties; - link_set = xbt_dict_new(); 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)); + } /**************************************/ @@ -1029,8 +888,9 @@ void surf_workstation_model_init_ptask_L07(const char *filename) { xbt_assert0(!surf_cpu_model, "CPU model type already defined"); xbt_assert0(!surf_network_model, "network model type already defined"); - model_init_internal(); - define_callbacks(filename); + surf_network_model = surf_model_init(); + ptask_define_callbacks(filename); + ptask_model_init_internal(); update_model_description(surf_workstation_model_description, "ptask_L07", surf_workstation_model);