A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update copyright lines for 2022.
[simgrid.git]
/
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
6faa675
..
4354c4a
100644
(file)
--- 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 */
/* A few basic tests for the surf library */
-/* Copyright (c) 2004-202
1
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2004-202
2
. 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. */
/* 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. */
@@
-10,10
+10,9
@@
#include "simgrid/s4u/Engine.hpp"
#include "simgrid/zone.h"
#include "src/kernel/EngineImpl.hpp"
#include "simgrid/s4u/Engine.hpp"
#include "simgrid/zone.h"
#include "src/kernel/EngineImpl.hpp"
-#include "src/
surf/cpu_interface
.hpp"
-#include "src/
surf/network_interface
.hpp"
+#include "src/
kernel/resource/CpuImpl
.hpp"
+#include "src/
kernel/resource/LinkImpl
.hpp"
#include "src/surf/surf_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");
#include "xbt/config.hpp"
XBT_LOG_NEW_DEFAULT_CATEGORY(surf_test, "Messages specific for surf example");
@@
-43,12
+42,12
@@
int main(int argc, char** argv)
auto net_model = as_zone->get_impl()->get_network_model();
net_model->communicate(hostA, hostB, 150.0, -1.0);
auto net_model = as_zone->get_impl()->get_network_model();
net_model->communicate(hostA, hostB, 150.0, -1.0);
-
surf_
solve(-1.0); /* Takes traces into account. Returns 0.0 */
+
e.get_impl()->
solve(-1.0); /* Takes traces into account. Returns 0.0 */
do {
simgrid::kernel::resource::Action* action = nullptr;
running = 0;
do {
simgrid::kernel::resource::Action* action = nullptr;
running = 0;
- double now =
e.
get_clock();
+ double now =
simgrid::s4u::Engine::
get_clock();
XBT_INFO("Next Event : %g", now);
for (auto const& model : e.get_all_models()) {
XBT_INFO("Next Event : %g", now);
for (auto const& model : e.get_all_models()) {
@@
-73,7
+72,7
@@
int main(int argc, char** argv)
action = model->extract_done_action();
}
}
action = model->extract_done_action();
}
}
- } while (running &&
surf_
solve(-1.0) >= 0.0);
+ } while (running &&
e.get_impl()->
solve(-1.0) >= 0.0);
XBT_INFO("Simulation Terminated");
return 0;
XBT_INFO("Simulation Terminated");
return 0;