X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a36e8044de323971221f5da46773d54e312d3b3c..f2907d4c4e2bfdd55ae8a7c41711b731d106f668:/teshsuite/surf/surf_usage/surf_usage.cpp?ds=sidebyside

diff --git a/teshsuite/surf/surf_usage/surf_usage.cpp b/teshsuite/surf/surf_usage/surf_usage.cpp
index 11f4c7ee54..6d71570aaa 100644
--- a/teshsuite/surf/surf_usage/surf_usage.cpp
+++ b/teshsuite/surf/surf_usage/surf_usage.cpp
@@ -1,19 +1,14 @@
 /* A few basic tests for the surf library                                   */
 
-/* Copyright (c) 2004-2015. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2004-2017. The SimGrid Team. All rights reserved.          */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include "surf/surf.h"
-#include "simgrid/s4u/host.hpp"
-#include "simgrid/sg_config.h"
+#include "simgrid/host.h"
 #include "src/surf/cpu_interface.hpp"
 #include "src/surf/network_interface.hpp"
-#include "src/surf/surf_interface.hpp"
-#include <stdio.h>
 
-#include "xbt/log.h"
 XBT_LOG_NEW_DEFAULT_CATEGORY(surf_test, "Messages specific for surf example");
 
 static const char *string_action(simgrid::surf::Action::State state)
@@ -50,9 +45,9 @@ int main(int argc, char **argv)
   simgrid::s4u::Host* hostB = sg_host_by_name("Cpu B");
 
   /* Let's do something on it */
-  simgrid::surf::Action *actionA = hostA->pimpl_cpu->execution_start(1000.0);
-  simgrid::surf::Action *actionB = hostB->pimpl_cpu->execution_start(1000.0);
-  simgrid::surf::Action *actionC = surf_host_sleep(hostB, 7.32);
+  simgrid::surf::Action* actionA = hostA->pimpl_cpu->execution_start(1000.0);
+  simgrid::surf::Action* actionB = hostB->pimpl_cpu->execution_start(1000.0);
+  simgrid::surf::Action* actionC = hostB->pimpl_cpu->sleep(7.32);
 
   simgrid::surf::Action::State stateActionA = actionA->getState();
   simgrid::surf::Action::State stateActionB = actionB->getState();
@@ -119,6 +114,5 @@ int main(int argc, char **argv)
 
   XBT_DEBUG("Simulation Terminated");
 
-  surf_exit();
   return 0;
 }