cosmetics in the description of network models

diff --git a/src/surf/surf.c b/src/surf/surf.c
index d3d95b9..5e5937f 100644 (file)
--- a/src/surf/surf.c
+++ b/src/surf/surf.c
@@ -113,39 +113,36 @@ 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)",
-   surf_network_model_init_Constant},
-  {"CM02",
-   "Legacy network model with lmm_solve (slow-start and bottleneck sharing with small bandwidth poorly modeled).",
-   surf_network_model_init_CM02},
   {"LV08",
-   "Realistic network model (slow-start modeled by multiplying latency by 10.4, bandwidth by .92 and bottleneck sharing uses a payload of S=8775 for evaluating RTT). Uses partial invalidation optimization of lmm system and a heap for action management by default (option --cfg=network/optim:Lazy)",
-   surf_network_model_init_LegrandVelho},
-   {"LV08_fullupdate",
-    "Realistic network model (see LV08) [Deprecated. Use LV08 with option --cfg=network/optim:Full. The Full option updates all actions at every step, which may be useful for debug.]",
+   "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 specifically tailored for HPC setting (accurate modeling of slow start with correction factors on three intervals (< 1KiB, < 64 KiB, >= 64 KiB))",
+   "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",
+   "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",
+   "Network pseudo-model using the NS3 tcp model instead of an analytic model",
        surf_network_model_init_NS3},
 #endif
   {"Reno",
-   "Model from Steven H. Low using lagrange_solve instead of lmm_solve (experts only; check the code for more info)",
+   "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 from Steven H. Low using lagrange_solve instead of lmm_solve (experts only; check the code for more info)",
+   "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 from Steven H. Low using lagrange_solve instead of lmm_solve (experts only; check the code for more info)",
+   "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}      /* this array must be NULL terminated */
 };
@@ -154,7 +151,7 @@ s_surf_model_description_t surf_cpu_model_description[] = {
   {"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",
-   "CPU classical model time=size/power. Default version uses partial invalidation optimization of lmm system and a heap for action management (default option is --cfg=cpu/optim:Lazy)",
+   "Simplistic CPU model (time=size/power).",
    surf_cpu_model_init_Cas01},
   {"CpuTI",
    "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]",
@@ -170,9 +167,9 @@ s_surf_model_description_t surf_workstation_model_description[] = {
    "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",
+   "Workstation model that is automatically chosen if you change the network and CPU models",
    surf_workstation_model_init_compound},
-  {"ptask_L07", "Workstation model with better parallel task modeling",
+  {"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 */
 };
@@ -182,7 +179,7 @@ s_surf_model_description_t surf_optimization_mode_description[] = {
    "Lazy action management (partial invalidation in lmm + heap in action remaining).",
    NULL},
   {"TI",
-   "Trace integration. Highly optimized mode for the Cas01 model when using availability traces.",
+   "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.",

diff --git a/src/surf/surf_config.c b/src/surf/surf_config.c
index a75a59c..5656eb9 100644 (file)
--- a/src/surf/surf_config.c
+++ b/src/surf/surf_config.c
@@ -46,6 +46,10 @@ static void surf_config_cmd_line(int *argc, char **argv)
       model_help("workstation", surf_workstation_model_description);
       model_help("CPU", surf_cpu_model_description);
       model_help("network", surf_network_model_description);
+      printf("\nLong description of all optimization levels accepted by the models of this simulator:\n");
+      for (i = 0; surf_optimization_mode_description[i].name; i++)
+        printf("  %s: %s\n", surf_optimization_mode_description[i].name, surf_optimization_mode_description[i].description);
+      printf("Both network and CPU models have 'Lazy' as default optimization level\n");
       exit(0);
 #ifdef HAVE_TRACING
     } else if (!strncmp(argv[i], "--help-tracing", strlen("--help-tracing") + 1)) {