X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ecd5f7562caf1d443bf22788fa5f4fac408776ec..9d87ca5268acfd15dfaf5068cc40f9d00a03e8c3:/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 41e5c971bb..9ddc811823 100644 --- a/teshsuite/surf/surf_usage2/surf_usage2.cpp +++ b/teshsuite/surf/surf_usage2/surf_usage2.cpp @@ -1,6 +1,6 @@ /* A few basic tests for the surf library */ -/* Copyright (c) 2004-2017. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2004-2018. 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. */ @@ -8,6 +8,9 @@ #include "simgrid/host.h" #include "src/surf/cpu_interface.hpp" #include "src/surf/network_interface.hpp" +#include "src/surf/surf_interface.hpp" +#include "surf/surf.hpp" +#include "xbt/config.hpp" XBT_LOG_NEW_DEFAULT_CATEGORY(surf_test, "Messages specific for surf example"); @@ -17,8 +20,8 @@ int main(int argc, char **argv) surf_init(&argc, argv); /* Initialize some common structures */ - xbt_cfg_set_parse("network/model:CM02"); - xbt_cfg_set_parse("cpu/model:Cas01"); + simgrid::config::set_parse("network/model:CM02"); + simgrid::config::set_parse("cpu/model:Cas01"); xbt_assert(argc > 1, "Usage: %s platform.xml\n", argv[0]); parse_platform_file(argv[1]); @@ -36,7 +39,7 @@ int main(int argc, char **argv) surf_solve(-1.0); /* Takes traces into account. Returns 0.0 */ do { - surf_action_t action = nullptr; + simgrid::kernel::resource::Action* action = nullptr; running = 0; double now = surf_get_clock();