From: Martin Quinson Date: Thu, 20 Oct 2011 14:17:35 +0000 (+0200) Subject: use more consistently the resource create of models, killing some useless/borken... X-Git-Tag: exp_20120216~542 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/b6a7838d1e4d157188e8d4dc381a11d0035361fe?ds=inline use more consistently the resource create of models, killing some useless/borken forwarder methods --- diff --git a/src/include/surf/surf.h b/src/include/surf/surf.h index 10e9b3a7d6..582a746d5d 100644 --- a/src/include/surf/surf.h +++ b/src/include/surf/surf.h @@ -169,7 +169,7 @@ typedef struct surf_cpu_model_extension_public { e_surf_resource_state_t(*get_state) (void *cpu); double (*get_speed) (void *cpu, double load); double (*get_available_speed) (void *cpu); - void (*create_resource) (char *name, double power_peak, + void* (*create_resource) (char *name, double power_peak, double power_scale, tmgr_trace_t power_trace, int core, @@ -195,7 +195,7 @@ typedef struct surf_network_model_extension_public { double (*get_link_latency) (const void *link); int (*link_shared) (const void *link); void (*add_traces) (void); - void (*create_resource) (char *name, + void* (*create_resource) (char *name, double bw_initial, tmgr_trace_t bw_trace, double lat_initial, @@ -233,7 +233,7 @@ typedef struct surf_workstation_model_extension_public { double (*get_link_latency) (const void *link); /**< Return the current latency of a network link */ int (*link_shared) (const void *link); xbt_dict_t(*get_properties) (const void *resource); - void (*link_create_resource) (char *name, + void* (*link_create_resource) (char *name, double bw_initial, tmgr_trace_t bw_trace, double lat_initial, @@ -243,7 +243,7 @@ typedef struct surf_workstation_model_extension_public { tmgr_trace_t state_trace, e_surf_link_sharing_policy_t policy, xbt_dict_t properties); - void (*cpu_create_resource) (char *name, double power_peak, + void* (*cpu_create_resource) (char *name, double power_peak, double power_scale, tmgr_trace_t power_trace, e_surf_resource_state_t state_initial, @@ -731,7 +731,7 @@ XBT_PUBLIC(double) get_cpu_power(const char *power); * * see surfxml_parse.c * */ -XBT_PUBLIC(void) surf_host_create_resource(char *name, double power_peak, +XBT_PUBLIC(void*) surf_host_create_resource(char *name, double power_peak, double power_scale, tmgr_trace_t power_trace, int core, @@ -744,7 +744,7 @@ XBT_PUBLIC(void) surf_host_create_resource(char *name, double power_peak, * * see surfxml_parse.c * */ -XBT_PUBLIC(void) surf_wsL07_host_create_resource(char *name, +XBT_PUBLIC(void*) surf_wsL07_host_create_resource(char *name, double power_peak, double power_scale, tmgr_trace_t power_trace, @@ -757,7 +757,7 @@ XBT_PUBLIC(void) surf_wsL07_host_create_resource(char *name, * create link resource * see surfxml_parse.c */ -XBT_PUBLIC(void) surf_link_create_resource(char *name, +XBT_PUBLIC(void*) surf_link_create_resource(char *name, double bw_initial, tmgr_trace_t bw_trace, double lat_initial, @@ -769,7 +769,7 @@ XBT_PUBLIC(void) surf_link_create_resource(char *name, policy, xbt_dict_t properties); -XBT_PUBLIC(void) surf_wsL07_link_create_resource(char *name, +XBT_PUBLIC(void*) surf_wsL07_link_create_resource(char *name, double bw_initial, tmgr_trace_t bw_trace, double lat_initial, diff --git a/src/surf/cpu.c b/src/surf/cpu.c index 1a86a63c3f..4e9cdd772f 100644 --- a/src/surf/cpu.c +++ b/src/surf/cpu.c @@ -32,7 +32,7 @@ lmm_system_t cpu_maxmin_system = NULL; static xbt_swag_t cpu_running_action_set_that_does_not_need_being_checked = NULL; -static cpu_Cas01_t cpu_new(char *name, double power_peak, +static void* cpu_create_resource(char *name, double power_peak, double power_scale, tmgr_trace_t power_trace, int core, @@ -94,7 +94,7 @@ static void parse_cpu_init(void) state_initial = SURF_RESOURCE_OFF; state_trace = tmgr_trace_new(A_surfxml_host_state_file); - cpu_new(xbt_strdup(A_surfxml_host_id), power_peak, power_scale, + cpu_create_resource(xbt_strdup(A_surfxml_host_id), power_peak, power_scale, power_trace, core, state_initial, state_trace, current_property_set); current_property_set = NULL; } @@ -416,17 +416,6 @@ static double cpu_get_available_speed(void *cpu) return ((cpu_Cas01_t) cpu)->power_scale; } -static void cpu_create_resource(char *name, double power_peak, - double power_scale, - tmgr_trace_t power_trace, - int core, - e_surf_resource_state_t state_initial, - tmgr_trace_t state_trace, - xbt_dict_t cpu_properties) -{ - cpu_new(name, power_peak, power_scale, power_trace, core, - state_initial, state_trace, cpu_properties); -} static void cpu_finalize(void) { diff --git a/src/surf/cpu_im.c b/src/surf/cpu_im.c index 19f1743728..fbeda0e212 100644 --- a/src/surf/cpu_im.c +++ b/src/surf/cpu_im.c @@ -47,7 +47,7 @@ extern int sg_maxmin_selective_update; static xbt_swag_t cpu_im_running_action_set_that_does_not_need_being_checked = NULL; -static cpu_Cas01_im_t cpu_im_new(char *name, double power_peak, +static void* cpu_im_create_resource(char *name, double power_peak, double power_scale, tmgr_trace_t power_trace, int core, @@ -113,7 +113,7 @@ static void parse_cpu_im_init(void) state_initial = SURF_RESOURCE_OFF; state_trace = tmgr_trace_new(A_surfxml_host_state_file); - cpu_im_new(xbt_strdup(A_surfxml_host_id), power_peak, power_scale, + cpu_im_create_resource(xbt_strdup(A_surfxml_host_id), power_peak, power_scale, power_trace, core, state_initial, state_trace, current_property_set); current_property_set = NULL; @@ -580,18 +580,6 @@ static void cpu_im_action_update_index_heap(void *action, int i) ((surf_action_cpu_Cas01_im_t) action)->index_heap = i; } -static void cpu_im_create_resource(char *name, double power_peak, - double power_scale, - tmgr_trace_t power_trace, - int core, - e_surf_resource_state_t state_initial, - tmgr_trace_t state_trace, - xbt_dict_t cpu_properties) -{ - cpu_im_new(name, power_peak, power_scale, power_trace, core, - state_initial, state_trace, cpu_properties); -} - static void cpu_im_finalize(void) { void **cpu; diff --git a/src/surf/cpu_ti.c b/src/surf/cpu_ti.c index f40d1c62a6..9cc8e0460d 100644 --- a/src/surf/cpu_ti.c +++ b/src/surf/cpu_ti.c @@ -144,7 +144,7 @@ static surf_cpu_ti_tgmr_t cpu_ti_parse_trace(tmgr_trace_t power_trace, } -static cpu_ti_t cpu_ti_new(char *name, double power_peak, +static void* cpu_ti_create_resource(char *name, double power_peak, double power_scale, tmgr_trace_t power_trace, int core, @@ -156,6 +156,7 @@ static cpu_ti_t cpu_ti_new(char *name, double power_peak, s_tmgr_event_t val; cpu_ti_t cpu = xbt_new0(s_cpu_ti_t, 1); s_surf_action_cpu_ti_t ti_action; + xbt_assert(core==1,"Multi-core not handled with this model yet"); xbt_assert(!surf_cpu_resource_by_name(name), "Host '%s' declared several times in the platform file", name); @@ -214,7 +215,7 @@ static void parse_cpu_ti_init(void) state_initial = SURF_RESOURCE_OFF; state_trace = tmgr_trace_new(A_surfxml_host_state_file); - cpu_ti_new(xbt_strdup(A_surfxml_host_id), power_peak, power_scale, + cpu_ti_create_resource(xbt_strdup(A_surfxml_host_id), power_peak, power_scale, power_trace, core, state_initial, state_trace, current_property_set); current_property_set = NULL; @@ -746,19 +747,6 @@ static double cpu_ti_get_available_speed(void *cpu) return CPU->power_scale; } -static void cpu_ti_create_resource(char *name, double power_peak, - double power_scale, - tmgr_trace_t power_trace, - int core, - e_surf_resource_state_t state_initial, - tmgr_trace_t state_trace, - xbt_dict_t cpu_properties) -{ - xbt_assert(core==1,"Multi-core not handled with this model yet"); - cpu_ti_new(name, power_peak, power_scale, power_trace, core, - state_initial, state_trace, cpu_properties); -} - static void cpu_ti_finalize(void) { void **cpu; diff --git a/src/surf/network.c b/src/surf/network.c index e22c2b6d37..f1b96a1eab 100644 --- a/src/surf/network.c +++ b/src/surf/network.c @@ -153,7 +153,7 @@ static double (*bandwidth_constraint_callback) (double, double, double) = &constant_bandwidth_constraint; -static link_CM02_t net_link_new(char *name, +static void* net_create_resource(char *name, double bw_initial, tmgr_trace_t bw_trace, double lat_initial, @@ -229,38 +229,22 @@ static void net_parse_link_init(void) if(policy_initial_link == SURF_LINK_FULLDUPLEX) { - net_link_new(bprintf("%s_UP",name_link), bw_initial, bw_trace, + net_create_resource(bprintf("%s_UP",name_link), bw_initial, bw_trace, lat_initial, lat_trace, state_initial_link, state_trace, policy_initial_link, xbt_dict_new()); - net_link_new(bprintf("%s_DOWN",name_link), bw_initial, bw_trace, + net_create_resource(bprintf("%s_DOWN",name_link), bw_initial, bw_trace, lat_initial, lat_trace, state_initial_link, state_trace, policy_initial_link, xbt_dict_new()); } else { - net_link_new(name_link, bw_initial, bw_trace, + net_create_resource(name_link, bw_initial, bw_trace, lat_initial, lat_trace, state_initial_link, state_trace, policy_initial_link, xbt_dict_new()); } } -static void net_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) -{ - net_link_new(name, bw_initial, bw_trace, - lat_initial, lat_trace, state_initial, state_trace, - policy, xbt_dict_new()); -} - static void net_add_traces(void) { xbt_dict_cursor_t cursor = NULL; @@ -860,11 +844,11 @@ static void surf_network_model_init_internal(void) network_maxmin_system = lmm_system_new(); routing_model_create(sizeof(link_CM02_t), - net_link_new(xbt_strdup("__loopback__"), - 498000000, NULL, 0.000015, NULL, - SURF_RESOURCE_ON, NULL, - SURF_LINK_FATPIPE, NULL), - net_get_link_latency); + net_create_resource(xbt_strdup("__loopback__"), + 498000000, NULL, 0.000015, NULL, + SURF_RESOURCE_ON, NULL, + SURF_LINK_FATPIPE, NULL), + net_get_link_latency); } diff --git a/src/surf/network_im.c b/src/surf/network_im.c index 24b49425d4..a982bbb872 100644 --- a/src/surf/network_im.c +++ b/src/surf/network_im.c @@ -150,7 +150,7 @@ static double (*im_bandwidth_constraint_callback) (double, double, double) = &im_constant_bandwidth_constraint; -static link_CM02_im_t im_net_link_new(char *name, +static void* im_net_create_resource(char *name, double bw_initial, tmgr_trace_t bw_trace, double lat_initial, @@ -227,38 +227,22 @@ static void im_net_parse_link_init(void) if(policy_initial_link == SURF_LINK_FULLDUPLEX) { - im_net_link_new(bprintf("%s_UP",name_link), bw_initial, bw_trace, + im_net_create_resource(bprintf("%s_UP",name_link), bw_initial, bw_trace, lat_initial, lat_trace, state_initial_link, state_trace, policy_initial_link, xbt_dict_new()); - im_net_link_new(bprintf("%s_DOWN",name_link), bw_initial, bw_trace, + im_net_create_resource(bprintf("%s_DOWN",name_link), bw_initial, bw_trace, lat_initial, lat_trace, state_initial_link, state_trace, policy_initial_link, xbt_dict_new()); } else { - im_net_link_new(name_link, bw_initial, bw_trace, + im_net_create_resource(name_link, bw_initial, bw_trace, lat_initial, lat_trace, state_initial_link, state_trace, policy_initial_link, xbt_dict_new()); } } -static void im_net_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) -{ - im_net_link_new(name, bw_initial, bw_trace, - lat_initial, lat_trace, state_initial, state_trace, - policy, xbt_dict_new()); -} - static void im_net_add_traces(void) { xbt_dict_cursor_t cursor = NULL; @@ -918,11 +902,12 @@ static void im_surf_network_model_init_internal(void) xbt_heap_set_update_callback(im_net_action_heap, im_net_action_update_index_heap); - routing_model_create(sizeof(link_CM02_im_t), im_net_link_new(xbt_strdup("__loopback__"), - 498000000, NULL, 0.000015, NULL, - SURF_RESOURCE_ON, NULL, - SURF_LINK_FATPIPE, NULL), - im_net_get_link_latency); + routing_model_create(sizeof(link_CM02_im_t), + im_net_create_resource(xbt_strdup("__loopback__"), + 498000000, NULL, 0.000015, NULL, + SURF_RESOURCE_ON, NULL, + SURF_LINK_FATPIPE, NULL), + im_net_get_link_latency); im_net_modified_set = xbt_swag_new(xbt_swag_offset(comm, action_list_hookup)); keep_track = im_net_modified_set; diff --git a/src/surf/surfxml_parse.c b/src/surf/surfxml_parse.c index 92004540e8..0099307608 100644 --- a/src/surf/surfxml_parse.c +++ b/src/surf/surfxml_parse.c @@ -664,7 +664,7 @@ static void add_randomness(void) /** * create CPU resource via CPU Model */ -void surf_host_create_resource(char *name, double power_peak, +void* surf_host_create_resource(char *name, double power_peak, double power_scale, tmgr_trace_t power_trace, int core, e_surf_resource_state_t state_initial, @@ -684,14 +684,14 @@ void surf_host_create_resource(char *name, double power_peak, * create CPU resource via worsktation_ptask_L07 model */ -void surf_wsL07_host_create_resource(char *name, double power_peak, +void* surf_wsL07_host_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) { - surf_workstation_model->extension.workstation.cpu_create_resource(name, + return surf_workstation_model->extension.workstation.cpu_create_resource(name, power_peak, power_scale, power_trace, @@ -703,7 +703,7 @@ void surf_wsL07_host_create_resource(char *name, double power_peak, /** * create link resource via network Model */ -void surf_link_create_resource(char *name, +void* surf_link_create_resource(char *name, double bw_initial, tmgr_trace_t bw_trace, double lat_initial, @@ -729,7 +729,7 @@ void surf_link_create_resource(char *name, * create link resource via workstation_ptask_L07 model */ -void surf_wsL07_link_create_resource(char *name, +void* surf_wsL07_link_create_resource(char *name, double bw_initial, tmgr_trace_t bw_trace, double lat_initial, diff --git a/src/surf/workstation_ptask_L07.c b/src/surf/workstation_ptask_L07.c index 772221a03b..cb67b6e97b 100644 --- a/src/surf/workstation_ptask_L07.c +++ b/src/surf/workstation_ptask_L07.c @@ -614,7 +614,7 @@ static int ptask_link_shared(const void *link) /*** Resource Creation & Destruction **/ /**************************************/ -static cpu_L07_t ptask_cpu_new(const char *name, double power_scale, +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, @@ -675,24 +675,12 @@ static void ptask_parse_cpu_init(void) state_initial = SURF_RESOURCE_OFF; state_trace = tmgr_trace_new(A_surfxml_host_state_file); - ptask_cpu_new(A_surfxml_host_id, power_scale, power_initial, power_trace, + ptask_cpu_create_resource(A_surfxml_host_id, power_scale, power_initial, power_trace, state_initial, state_trace, current_property_set); current_property_set=NULL; } -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, +static void* ptask_link_create_resource(char *name, double bw_initial, tmgr_trace_t bw_trace, double lat_initial, @@ -780,39 +768,22 @@ static void ptask_parse_link_init(void) if(policy_initial_link == SURF_LINK_FULLDUPLEX) { - ptask_link_new(name_link_up, bw_initial, bw_trace, lat_initial, lat_trace, + ptask_link_create_resource(name_link_up, bw_initial, bw_trace, lat_initial, lat_trace, state_initial_link, state_trace, policy_initial_link, current_property_set); - ptask_link_new(name_link_down, bw_initial, bw_trace, lat_initial, lat_trace, + ptask_link_create_resource(name_link_down, bw_initial, bw_trace, lat_initial, lat_trace, state_initial_link, state_trace, policy_initial_link, current_property_set); } else { - ptask_link_new(name_link, bw_initial, bw_trace, lat_initial, lat_trace, + ptask_link_create_resource(name_link, bw_initial, bw_trace, lat_initial, lat_trace, state_initial_link, state_trace, policy_initial_link, 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) -{ - ptask_link_new(name, bw_initial, bw_trace, - lat_initial, lat_trace, state_initial, state_trace, - policy, properties); -} - - static void ptask_add_traces(void) { xbt_dict_cursor_t cursor = NULL; @@ -951,7 +922,7 @@ static void ptask_model_init_internal(void) ptask_maxmin_system = lmm_system_new(); routing_model_create(sizeof(link_L07_t), - ptask_link_new(xbt_strdup("__loopback__"), + ptask_link_create_resource(xbt_strdup("__loopback__"), 498000000, NULL, 0.000015, NULL, SURF_RESOURCE_ON, NULL, SURF_LINK_FATPIPE, NULL),