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
move all network models to the kernel::resource namespace
[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
0b0f8af
..
d8a86cc
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-201
7
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2004-201
8
. 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. */
@@
-8,6
+8,9
@@
#include "simgrid/host.h"
#include "src/surf/cpu_interface.hpp"
#include "src/surf/network_interface.hpp"
#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.h"
XBT_LOG_NEW_DEFAULT_CATEGORY(surf_test, "Messages specific for surf example");
XBT_LOG_NEW_DEFAULT_CATEGORY(surf_test, "Messages specific for surf example");
@@
-36,13
+39,13
@@
int main(int argc, char **argv)
surf_solve(-1.0); /* Takes traces into account. Returns 0.0 */
do {
surf_solve(-1.0); /* Takes traces into account. Returns 0.0 */
do {
- s
urf_action_t
action = nullptr;
+ s
imgrid::kernel::resource::Action*
action = nullptr;
running = 0;
double now = surf_get_clock();
XBT_INFO("Next Event : %g", now);
running = 0;
double now = surf_get_clock();
XBT_INFO("Next Event : %g", now);
- for (auto
model
: *all_existing_models) {
+ for (auto
const& model
: *all_existing_models) {
if (surf_model_running_action_set_size(model)) {
XBT_DEBUG("\t Running that model");
running = 1;
if (surf_model_running_action_set_size(model)) {
XBT_DEBUG("\t Running that model");
running = 1;