Cleanup to allow separation of model specification and of optimization mode for each...

[simgrid.git] / src / surf / cpu_im.c

diff --git a/src/surf/cpu_im.c b/src/surf/cpu_im.c
index 89ec8af..74815e3 100644 (file)
--- a/src/surf/cpu_im.c
+++ b/src/surf/cpu_im.c
@@ -677,12 +677,27 @@ static void surf_cpu_im_model_init_internal(const char* name)
 /*                  \url{http://grail.sdsc.edu/papers/simgrid_ccgrid01.ps.gz}." */
 /* } */
 
-void surf_cpu_model_init_Cas01_im()
+void surf_cpu_model_init_Cas01()
 {
-  if( strcmp(xbt_cfg_get_string(_surf_cfg_set, "cpu/model"),"Cas01"))
-    cpu_update_mechanism = UM_LAZY;
-  else
+  char *optim = xbt_cfg_get_string(_surf_cfg_set, "cpu/optim");
+  char *model = xbt_cfg_get_string(_surf_cfg_set, "cpu/model");
+
+  if(!strcmp(model,"Cas01_fullupdate")) {
+    XBT_WARN("[*Deprecated*. Use --cfg=cpu/model:Cas01 with option --cfg=cpu/optim:Full instead.]");
+  } else if(!strcmp(model,"CpuTI")) {
+    XBT_WARN("[*Deprecated*. Use --cfg=cpu/model:Cas01 with option --cfg=cpu/optim:TI instead.]");
+  }
+
+  if(!strcmp(optim,"Full")) {
     cpu_update_mechanism = UM_FULL;
+  } else if (strcmp(optim,"Lazy")) {
+    cpu_update_mechanism = UM_LAZY;
+  } else if (strcmp(optim,"TI")) {
+    surf_cpu_model_init_ti();
+    return;
+  } else {
+    xbt_die("Unsupported optimization (%s) for this model",optim);
+  }
 
   if (surf_cpu_model)
     return;