X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d0eb42a2080d1645f465c7fefbab948ab31ef03e..de6dd9c41648c42ed5e8088be046408cc5ddb8c0:/src/surf/workstation_ptask_L07.c diff --git a/src/surf/workstation_ptask_L07.c b/src/surf/workstation_ptask_L07.c index d0a27e30e5..a376717b38 100644 --- a/src/surf/workstation_ptask_L07.c +++ b/src/surf/workstation_ptask_L07.c @@ -28,7 +28,7 @@ typedef struct cpu_L07 { tmgr_trace_event_t power_event; tmgr_trace_event_t state_event; e_surf_resource_state_t state_current; - network_element_t info; + sg_routing_edge_t info; } s_cpu_L07_t, *cpu_L07_t; /**************************************/ @@ -69,8 +69,8 @@ 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 (network_element_t src, - network_element_t dst, +static surf_action_t die_impossible_communicate (sg_routing_edge_t src, + sg_routing_edge_t dst, double size, double rate) { DIE_IMPOSSIBLE; @@ -302,19 +302,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) && @@ -447,7 +447,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; @@ -493,7 +492,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); @@ -559,7 +558,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, @@ -576,7 +575,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; } @@ -668,13 +667,13 @@ static void* ptask_cpu_create_resource(const char *name, double power_scale, 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, @@ -799,7 +798,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); @@ -811,7 +810,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); @@ -822,7 +821,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); @@ -900,8 +899,7 @@ static void ptask_model_init_internal(void) if (!ptask_maxmin_system) 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,