Use the partial invalidation optimization by default for the network too

diff --git a/ChangeLog b/ChangeLog
index d1d6430..95f06ca 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+SimGrid (3.7) NOT RELEASED; urgency=low 
+
+  Models:
+  * Use the partial invalidation optimization by default for the
+    network too. Should produce the exact same results, only faster.
+
+  -- $date Da SimGrid team <simgrid-devel@lists.gforge.inria.fr>
+
 SimGrid (3.6.2) stable; urgency=low 
 
  The "Not coding new stuff allows to polish old things" release.

diff --git a/src/surf/network.c b/src/surf/network.c
index c8649e1..e22c2b6 100644 (file)
--- a/src/surf/network.c
+++ b/src/surf/network.c
@@ -911,7 +911,7 @@ void surf_network_model_init_LegrandVelho(const char *filename)
   xbt_cfg_setdefault_double(_surf_cfg_set, "network/weight_S", 8775);
 
   update_model_description(surf_network_model_description,
-                           "LV08", surf_network_model);
+                           "LV08_fullupdate", surf_network_model);
 }
 
 /***************************************************************************/

diff --git a/src/surf/network_im.c b/src/surf/network_im.c
index b5ba625..24b4942 100644 (file)
--- a/src/surf/network_im.c
+++ b/src/surf/network_im.c
@@ -873,8 +873,6 @@ static void im_net_finalize(void)
 static void im_surf_network_model_init_internal(void)
 {
   s_surf_action_network_CM02_im_t comm;
-  XBT_INFO("You are using the UNSAFE lazy management optimization, I hope you know what you are doing.");
-  XBT_INFO("====> For now this optimization is only available for LV08_im network model.");
 
   surf_network_model = surf_model_init();
 
@@ -951,7 +949,7 @@ void im_surf_network_model_init_LegrandVelho(const char *filename)
   xbt_cfg_setdefault_double(_surf_cfg_set, "network/weight_S", 8775);
 
   update_model_description(surf_network_model_description,
-                           "LV08_im", surf_network_model);
+                           "LV08", surf_network_model);
 }
 
 

diff --git a/src/surf/surf.c b/src/surf/surf.c
index 9623d4a..47d6bb7 100644 (file)
--- a/src/surf/surf.c
+++ b/src/surf/surf.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2004, 2005, 2006, 2007, 2008, 2009, 2010. The SimGrid Team.
+/* Copyright (c) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -119,11 +119,11 @@ s_surf_model_description_t surf_network_model_description[] = {
    "Realistic network model with lmm_solve and no correction factors",
    NULL, surf_network_model_init_CM02},
   {"LV08",
-   "Realistic network model with lmm_solve and these correction factors: latency*=10.4, bandwidth*=.92, S=8775",
-   NULL, surf_network_model_init_LegrandVelho},
-   {"LV08_im",
-    "Realistic network model with IMPROVED ACTION MANAGEMENT and these correction factors: latency*=10.4, bandwidth*=.92, S=8775",
-    NULL, im_surf_network_model_init_LegrandVelho},
+   "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},
   {"SMPI",
    "Realistic network model with lmm_solve and correction factors on three intervals (< 1KiB, < 64 KiB, >= 64 KiB)",
    NULL, surf_network_model_init_SMPI},