X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0213e3927d6ac21f3089d8a2d60f3603c8cbac43..c2e921f7dfe65fd24e5e797fcb37cba28401f9f9:/src/surf/surf.c diff --git a/src/surf/surf.c b/src/surf/surf.c index 47d6bb712c..5e5937ffaf 100644 --- a/src/surf/surf.c +++ b/src/surf/surf.c @@ -9,6 +9,7 @@ #include "surf_private.h" #include "xbt/module.h" #include "mc/mc.h" +#include "surf/surf_resource.h" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_kernel, surf, "Logging specific to SURF (kernel)"); @@ -112,73 +113,79 @@ xbt_dynar_t surf_path = NULL; /* Don't forget to update the option description in smx_config when you change this */ s_surf_model_description_t surf_network_model_description[] = { - {"Constant", - "Simplistic network model where all communication take a constant time (one second)", - NULL, surf_network_model_init_Constant}, - {"CM02", - "Realistic network model with lmm_solve and no correction factors", - NULL, surf_network_model_init_CM02}, {"LV08", - "Realistic network model with lmm_solve, adequate correction factors (latency*=10.4, bandwidth*=.92, S=8775) and partial invalidation optimization", - NULL, im_surf_network_model_init_LegrandVelho}, - {"LV08_fullupdate", - "Realistic network model wit lmm_solve, adequate correction factors (latency*=10.4, bandwidth*=.92, S=8775) but no further optimization. Should produce the same results as LV08, only slower.", - NULL, surf_network_model_init_LegrandVelho}, + "Realistic network analytic model (slow-start modeled by multiplying latency by 10.4, bandwidth by .92; bottleneck sharing uses a payload of S=8775 for evaluating RTT). ", + surf_network_model_init_LegrandVelho}, + {"Constant", + "Simplistic network model where all communication take a constant time (one second). This model provides the lowest realism, but is (marginally) faster.", + surf_network_model_init_Constant}, {"SMPI", - "Realistic network model with lmm_solve and correction factors on three intervals (< 1KiB, < 64 KiB, >= 64 KiB)", - NULL, surf_network_model_init_SMPI}, + "Realistic network model specifically tailored for HPC settings (accurate modeling of slow start with correction factors on three intervals: < 1KiB, < 64 KiB, >= 64 KiB)", + surf_network_model_init_SMPI}, + {"CM02", + "Legacy network analytic model (Very similar to LV08, but without corrective factors. The timings of small messages are thus poorly modeled).", + surf_network_model_init_CM02}, #ifdef HAVE_GTNETS {"GTNets", - "Network Pseudo-model using the GTNets simulator instead of an analytic model", - NULL, surf_network_model_init_GTNETS}, + "Network pseudo-model using the GTNets simulator instead of an analytic model", + surf_network_model_init_GTNETS}, #endif #ifdef HAVE_NS3 {"NS3", - "Use NS3 tcp model", - NULL, surf_network_model_init_NS3}, + "Network pseudo-model using the NS3 tcp model instead of an analytic model", + surf_network_model_init_NS3}, #endif {"Reno", - "Model using lagrange_solve instead of lmm_solve (experts only)", NULL, + "Model from Steven H. Low using lagrange_solve instead of lmm_solve (experts only; check the code for more info).", surf_network_model_init_Reno}, {"Reno2", - "Model using lagrange_solve instead of lmm_solve (experts only)", NULL, + "Model from Steven H. Low using lagrange_solve instead of lmm_solve (experts only; check the code for more info).", surf_network_model_init_Reno2}, {"Vegas", - "Model using lagrange_solve instead of lmm_solve (experts only)", NULL, + "Model from Steven H. Low using lagrange_solve instead of lmm_solve (experts only; check the code for more info).", surf_network_model_init_Vegas}, - {NULL, NULL, NULL, NULL} /* this array must be NULL terminated */ + {NULL, NULL, NULL} /* this array must be NULL terminated */ }; s_surf_model_description_t surf_cpu_model_description[] = { - {"Cas01_fullupdate", "CPU classical model time=size/power", NULL, + {"Cas01_fullupdate", "CPU classical model time=size/power (Cas01). [Deprecated. Use Cas01 with option --cfg=cpu/optim:Full. The Full option updates all actions at every step, which may be useful for debug.]", surf_cpu_model_init_Cas01}, {"Cas01", - "Variation of Cas01_fullupdate with partial invalidation optimization of lmm system. Should produce the same values, only faster", - NULL, surf_cpu_model_init_Cas01_im}, + "Simplistic CPU model (time=size/power).", + surf_cpu_model_init_Cas01}, {"CpuTI", - "Variation of Cas01 with also trace integration. Should produce the same values, only faster if you use availability traces", - NULL, surf_cpu_model_init_ti}, - {NULL, NULL, NULL, NULL} /* this array must be NULL terminated */ + "CPU classical model time=size/power (Cas01). [Deprecated. Use Cas01 with option --cfg=cpu/optim:TI. The TI optimization is highly optimized when using traces]", + surf_cpu_model_init_ti}, + {NULL, NULL, NULL} /* this array must be NULL terminated */ }; s_surf_model_description_t surf_workstation_model_description[] = { + {"current_default", + "Curent default workstation model (may change with versions of SimGrid). Currently Cas01 and LV08 (with full duplex support) as CPU and Network", + surf_workstation_model_init_current_default}, {"CLM03", - "Default workstation model, using LV08 and CM02 as network and CPU", - NULL, surf_workstation_model_init_CLM03, create_workstations}, + "Default workstation model, using Cas01 and CM02 as CPU and Network", + surf_workstation_model_init_CLM03}, {"compound", - "Workstation model allowing you to use other network and CPU models", - NULL, surf_workstation_model_init_compound, create_workstations}, - {"ptask_L07", "Workstation model with better parallel task modeling", - NULL, surf_workstation_model_init_ptask_L07, NULL}, - {NULL, NULL, NULL, NULL} /* this array must be NULL terminated */ + "Workstation model that is automatically chosen if you change the network and CPU models", + surf_workstation_model_init_compound}, + {"ptask_L07", "Workstation model somehow similar to Cas01+CM02 but allowing parallel tasks", + surf_workstation_model_init_ptask_L07}, + {NULL, NULL, NULL} /* this array must be NULL terminated */ }; -void update_model_description(s_surf_model_description_t * table, - const char *name, surf_model_t model) -{ - int i = find_model_description(table, name); - table[i].model = model; -} +s_surf_model_description_t surf_optimization_mode_description[] = { + {"Lazy", + "Lazy action management (partial invalidation in lmm + heap in action remaining).", + NULL}, + {"TI", + "Trace integration. Highly optimized mode when using availability traces (only available for the Cas01 CPU model for now).", + NULL}, + {"Full", + "Full update of remaining and variables. Slow but may be useful when debugging.", + NULL}, + {NULL, NULL, NULL} /* this array must be NULL terminated */ +}; /** Displays the long description of all registered models, and quit */ void model_help(const char *category, s_surf_model_description_t * table) @@ -204,7 +211,7 @@ int find_model_description(s_surf_model_description_t * table, for (i = 1; table[i].name; i++) { name_list = xbt_realloc(name_list, - strlen(name_list) + strlen(table[i].name) + 2); + strlen(name_list) + strlen(table[i].name) + 3); strcat(name_list, ", "); strcat(name_list, table[i].name); } @@ -222,7 +229,6 @@ double generic_maxmin_share_resources(xbt_swag_t running_actions, double value = -1; #define VARIABLE(action) (*((lmm_variable_t*)(((char *) (action)) + (offset)))) - xbt_assert(solve, "Give me a real solver function!"); solve(sys); xbt_swag_foreach(action, running_actions) { @@ -373,6 +379,7 @@ void surf_exit(void) xbt_dynar_foreach(model_list, iter, model) model->model_private->finalize(); xbt_dynar_free(&model_list); + routing_exit(); if (maxmin_system) { lmm_system_free(maxmin_system); @@ -384,13 +391,13 @@ void surf_exit(void) } surf_action_exit(); - if (surf_path) - xbt_dynar_free(&surf_path); + xbt_dynar_free(&surf_path); xbt_lib_free(&host_lib); xbt_lib_free(&link_lib); xbt_lib_free(&as_router_lib); + tmgr_finalize(); surf_parse_lex_destroy(); surf_parse_free_callbacks();