X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ecb32cd3b952528d41f0163b255c94dfae14f2fe..419bdaa87416d96b72f6848b04b130637df71ee3:/src/surf/surf.c diff --git a/src/surf/surf.c b/src/surf/surf.c index e78088e9ee..36980e102f 100644 --- a/src/surf/surf.c +++ b/src/surf/surf.c @@ -12,6 +12,7 @@ #include "surf/surf_resource.h" #include "xbt/xbt_os_thread.h" +XBT_LOG_NEW_CATEGORY(surf, "All SURF categories"); XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_kernel, surf, "Logging specific to SURF (kernel)"); @@ -180,6 +181,13 @@ s_surf_model_description_t surf_optimization_mode_description[] = { {NULL, NULL, NULL} /* this array must be NULL terminated */ }; +s_surf_model_description_t surf_storage_model_description[] = { + {"default", + "Simplistic storage model.", + surf_storage_model_init_default}, + {NULL, NULL, NULL} /* this array must be NULL terminated */ +}; + #ifdef CONTEXT_THREADS static xbt_parmap_t surf_parmap = NULL; /* parallel map on models */ #endif @@ -281,56 +289,102 @@ double generic_maxmin_share_resources(xbt_swag_t running_actions, return min; } -XBT_LOG_EXTERNAL_CATEGORY(surf_cpu); -XBT_LOG_EXTERNAL_CATEGORY(surf_kernel); -XBT_LOG_EXTERNAL_CATEGORY(surf_lagrange); -XBT_LOG_EXTERNAL_CATEGORY(surf_lagrange_dichotomy); -XBT_LOG_EXTERNAL_CATEGORY(surf_maxmin); -XBT_LOG_EXTERNAL_CATEGORY(surf_network); -XBT_LOG_EXTERNAL_CATEGORY(surf_trace); -XBT_LOG_EXTERNAL_CATEGORY(surf_parse); -XBT_LOG_EXTERNAL_CATEGORY(surf_timer); -XBT_LOG_EXTERNAL_CATEGORY(surf_workstation); -XBT_LOG_EXTERNAL_CATEGORY(surf_config); -XBT_LOG_EXTERNAL_CATEGORY(surf_route); +double generic_share_resources_lazy(double now, surf_model_t model) +{ + surf_action_lmm_t action = NULL; + double min = -1; + double value; -#ifdef HAVE_GTNETS -XBT_LOG_EXTERNAL_CATEGORY(surf_network_gtnets); -#endif + XBT_DEBUG + ("Before share resources, the size of modified actions set is %d", + xbt_swag_size(model->model_private->modified_set)); -void surf_init(int *argc, char **argv) + lmm_solve(model->model_private->maxmin_system); + + XBT_DEBUG + ("After share resources, The size of modified actions set is %d", + xbt_swag_size(model->model_private->modified_set)); + + while((action = xbt_swag_extract(model->model_private->modified_set))) { + int max_dur_flag = 0; + + if (action->generic_action.state_set != + model->states.running_action_set) + continue; + + /* bogus priority, skip it */ + if (action->generic_action.priority <= 0) + continue; + + generic_update_action_remaining_lazy(action,now); + + min = -1; + value = lmm_variable_getvalue(action->variable); + if (value > 0) { + if (action->generic_action.remains > 0) { + value = action->generic_action.remains / value; + min = now + value; + } else { + value = 0.0; + min = now; + } + } + + if ((action->generic_action.max_duration != NO_MAX_DURATION) + && (min == -1 + || action->generic_action.start + + action->generic_action.max_duration < min)) { + min = action->generic_action.start + + action->generic_action.max_duration; + max_dur_flag = 1; + } + + XBT_DEBUG("Action(%p) Start %lf Finish %lf Max_duration %lf", action, + action->generic_action.start, now + value, + action->generic_action.max_duration); + + if (min != -1) { + surf_action_lmm_heap_remove(model->model_private->action_heap,action); + surf_action_lmm_heap_insert(model->model_private->action_heap,action, min, max_dur_flag ? MAX_DURATION : NORMAL); + XBT_DEBUG("Insert at heap action(%p) min %lf now %lf", action, min, + now); + } else DIE_IMPOSSIBLE; + } + + //hereafter must have already the min value for this resource model + if (xbt_heap_size(model->model_private->action_heap) > 0) + min = xbt_heap_maxkey(model->model_private->action_heap) - now; + else + min = -1; + + XBT_DEBUG("The minimum with the HEAP %lf", min); + + return min; +} +static XBT_INLINE void routing_asr_host_free(void *p) { - XBT_DEBUG("Create all Libs"); - host_lib = xbt_lib_new(); - link_lib = xbt_lib_new(); - as_router_lib = xbt_lib_new(); - - XBT_DEBUG("ADD ROUTING LEVEL"); - ROUTING_HOST_LEVEL = xbt_lib_add_level(host_lib,xbt_free); - ROUTING_ASR_LEVEL = xbt_lib_add_level(as_router_lib,xbt_free); - - XBT_DEBUG("ADD SURF LEVELS"); - SURF_CPU_LEVEL = xbt_lib_add_level(host_lib,surf_resource_free); - SURF_WKS_LEVEL = xbt_lib_add_level(host_lib,surf_resource_free); - SURF_LINK_LEVEL = xbt_lib_add_level(link_lib,surf_resource_free); - - /* Connect our log channels: that must be done manually under windows */ - XBT_LOG_CONNECT(surf_cpu, surf); - XBT_LOG_CONNECT(surf_kernel, surf); - XBT_LOG_CONNECT(surf_lagrange, surf); - XBT_LOG_CONNECT(surf_lagrange_dichotomy, surf_lagrange); - XBT_LOG_CONNECT(surf_maxmin, surf); - XBT_LOG_CONNECT(surf_network, surf); - XBT_LOG_CONNECT(surf_trace, surf); - XBT_LOG_CONNECT(surf_parse, surf); - XBT_LOG_CONNECT(surf_timer, surf); - XBT_LOG_CONNECT(surf_workstation, surf); - XBT_LOG_CONNECT(surf_config, surf); - XBT_LOG_CONNECT(surf_route, surf); + sg_routing_edge_t elm = p; + free(elm->name); + xbt_free(elm); +} -#ifdef HAVE_GTNETS - XBT_LOG_CONNECT(surf_network_gtnets, surf); -#endif +void surf_init(int *argc, char **argv) +{ + XBT_DEBUG("Create all Libs"); + host_lib = xbt_lib_new(); + link_lib = xbt_lib_new(); + as_router_lib = xbt_lib_new(); + storage_lib = xbt_lib_new(); + storage_type_lib = xbt_lib_new(); + + XBT_DEBUG("ADD ROUTING LEVEL"); + ROUTING_HOST_LEVEL = xbt_lib_add_level(host_lib,routing_asr_host_free); + ROUTING_ASR_LEVEL = xbt_lib_add_level(as_router_lib,routing_asr_host_free); + + XBT_DEBUG("ADD SURF LEVELS"); + SURF_CPU_LEVEL = xbt_lib_add_level(host_lib,surf_resource_free); + SURF_WKS_LEVEL = xbt_lib_add_level(host_lib,surf_resource_free); + SURF_LINK_LEVEL = xbt_lib_add_level(link_lib,surf_resource_free); xbt_init(argc, argv); if (!model_list) @@ -407,7 +461,8 @@ void surf_exit(void) xbt_lib_free(&host_lib); xbt_lib_free(&link_lib); xbt_lib_free(&as_router_lib); - + xbt_lib_free(&storage_lib); + xbt_lib_free(&storage_type_lib); tmgr_finalize(); surf_parse_lex_destroy(); @@ -579,14 +634,15 @@ XBT_INLINE double surf_get_clock(void) static void surf_share_resources(surf_model_t model) { + double next_action_end = -1.0; + int i = __sync_fetch_and_add(&surf_min_index, 1); if (strcmp(model->name,"network NS3")) { XBT_DEBUG("Running for Resource [%s]", model->name); - double next_action_end = model->model_private->share_resources(NOW); + next_action_end = model->model_private->share_resources(NOW); XBT_DEBUG("Resource [%s] : next action end = %f", model->name, next_action_end); - int i = __sync_fetch_and_add(&surf_min_index, 1); - surf_mins[i] = next_action_end; } + surf_mins[i] = next_action_end; } static void surf_update_actions_state(surf_model_t model)