X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6aff24ba47ceab30e29e122dc36c33995e6fc2dd..f440037b8c394baf8a480ba497a22e5768b7e818:/teshsuite/surf/surf_usage2/surf_usage2.cpp

diff --git a/teshsuite/surf/surf_usage2/surf_usage2.cpp b/teshsuite/surf/surf_usage2/surf_usage2.cpp
index b4467d24fb..27a1ac918e 100644
--- a/teshsuite/surf/surf_usage2/surf_usage2.cpp
+++ b/teshsuite/surf/surf_usage2/surf_usage2.cpp
@@ -25,16 +25,12 @@ int main(int argc, char **argv)
   xbt_cfg_set_parse("network/model:CM02");
   xbt_cfg_set_parse("cpu/model:Cas01");
 
-  xbt_assert(argc >1, "Usage : %s platform.txt\n", argv[0]);
+  xbt_assert(argc > 1, "Usage: %s platform.xml\n", argv[0]);
   parse_platform_file(argv[1]);
 
   /*********************** HOST ***********************************/
-  sg_host_t hostA = sg_host_by_name("Cpu A");
-  sg_host_t hostB = sg_host_by_name("Cpu B");
-
-  /* Let's check that those two processors exist */
-  XBT_DEBUG("%s : %p", sg_host_get_name(hostA), hostA);
-  XBT_DEBUG("%s : %p", sg_host_get_name(hostB), hostB);
+  simgrid::s4u::Host* hostA = sg_host_by_name("Cpu A");
+  simgrid::s4u::Host* hostB = sg_host_by_name("Cpu B");
 
   /* Let's do something on it */
   hostA->pimpl_cpu->execution_start(1000.0);
@@ -52,30 +48,29 @@ int main(int argc, char **argv)
     XBT_INFO("Next Event : %g", now);
 
     for (auto model: *all_existing_models) {
-      if (surf_model_running_action_set_size((surf_model_t)model)) {
+      if (surf_model_running_action_set_size(model)) {
         XBT_DEBUG("\t Running that model");
         running = 1;
       }
 
-      action = surf_model_extract_failed_action_set(static_cast<surf_model_t>(model));
+      action = surf_model_extract_failed_action_set(model);
       while (action != nullptr) {
         XBT_INFO("   * Done Action");
         XBT_DEBUG("\t * Failed Action: %p", action);
         action->unref();
-        action = surf_model_extract_failed_action_set(static_cast<surf_model_t>(model));
+        action = surf_model_extract_failed_action_set(model);
       }
 
-      action = surf_model_extract_done_action_set(static_cast<surf_model_t>(model));
+      action = surf_model_extract_done_action_set(model);
       while (action != nullptr){
         XBT_INFO("   * Done Action");
         XBT_DEBUG("\t * Done Action: %p", action);
         action->unref();
-        action = surf_model_extract_done_action_set(static_cast<surf_model_t>(model));
+        action = surf_model_extract_done_action_set(model);
       }
     }
   } while (running && surf_solve(-1.0) >= 0.0);
 
   XBT_INFO("Simulation Terminated");
-  surf_exit();
   return 0;
 }