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
reorganize *LinkImpl stuff
[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 18bc5b0a124e5aafe6c5de624b8035c27c6bd7ba..74bdf88392aa94b3c0d56447f7f5ae70e131dbc9 100644
(file)
--- a/
teshsuite/surf/surf_usage2/surf_usage2.cpp
+++ b/
teshsuite/surf/surf_usage2/surf_usage2.cpp
@@
-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,7
+42,7
@@
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;
@@
-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;