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
please sonar, get_clock is a static method
[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
1b9d258
..
18bc5b0
100644
(file)
--- a/
teshsuite/surf/surf_usage2/surf_usage2.cpp
+++ b/
teshsuite/surf/surf_usage2/surf_usage2.cpp
@@
-1,77
+1,80
@@
/* A few basic tests for the surf library */
/* A few basic tests for the surf library */
-/* Copyright (c) 2004-20
15
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2004-20
21
. 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. */
-#include "surf/surf.h"
-#include "simgrid/s4u/host.hpp"
-#include "simgrid/sg_config.h"
+#include "simgrid/host.h"
+#include "simgrid/kernel/routing/NetZoneImpl.hpp" // full type for NetZoneImpl object
+#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/surf/surf_interface.hpp"
#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"
-#include "xbt/log.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");
-int main(int argc, char
**
argv)
+int main(int argc, char
**
argv)
{
{
- double now = -1.0;
int running;
int running;
- s
urf_init(&argc, argv); /* Initialize some common structures */
+ s
imgrid::s4u::Engine e(&argc, argv);
-
xbt_cfg_set_parse
("network/model:CM02");
-
xbt_cfg_set_parse
("cpu/model:Cas01");
+
simgrid::s4u::Engine::set_config
("network/model:CM02");
+
simgrid::s4u::Engine::set_config
("cpu/model:Cas01");
xbt_assert(argc > 1, "Usage: %s platform.xml\n", argv[0]);
xbt_assert(argc > 1, "Usage: %s platform.xml\n", argv[0]);
-
parse_platform_file
(argv[1]);
+
e.load_platform
(argv[1]);
/*********************** HOST ***********************************/
/*********************** HOST ***********************************/
- simgrid::s4u::Host* hostA =
sg_
host_by_name("Cpu A");
- simgrid::s4u::Host* hostB =
sg_
host_by_name("Cpu B");
+ simgrid::s4u::Host* hostA =
e.
host_by_name("Cpu A");
+ simgrid::s4u::Host* hostB =
e.
host_by_name("Cpu B");
/* Let's do something on it */
/* Let's do something on it */
- hostA->
pimpl_cpu->execution_start(1000.0
);
- hostB->
pimpl_cpu->execution_start(1000.0
);
-
surf_host_sleep(hostB,
7.32);
+ hostA->
get_cpu()->execution_start(1000.0, -1
);
+ hostB->
get_cpu()->execution_start(1000.0, -1
);
+
hostB->get_cpu()->sleep(
7.32);
- surf_network_model->communicate(hostA, hostB, 150.0, -1.0);
+ const_sg_netzone_t as_zone = e.netzone_by_name_or_null("AS0");
+ 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 */
+ surf_solve(-1.0); /* Takes traces into account. Returns 0.0 */
do {
do {
- s
urf_action_t
action = nullptr;
- running = 0;
+ s
imgrid::kernel::resource::Action*
action = nullptr;
+ running
= 0;
-
now = surf_
get_clock();
+
double now = simgrid::s4u::Engine::
get_clock();
XBT_INFO("Next Event : %g", now);
XBT_INFO("Next Event : %g", now);
- for (auto
model: *all_existing_models
) {
- if (
surf_model_running_action_set_size(model
)) {
+ for (auto
const& model : e.get_all_models()
) {
+ if (
not model->get_started_action_set()->empty(
)) {
XBT_DEBUG("\t Running that model");
running = 1;
}
XBT_DEBUG("\t Running that model");
running = 1;
}
- action =
surf_model_extract_failed_action_set(model
);
+ action =
model->extract_failed_action(
);
while (action != nullptr) {
XBT_INFO(" * Done Action");
XBT_DEBUG("\t * Failed Action: %p", action);
action->unref();
while (action != nullptr) {
XBT_INFO(" * Done Action");
XBT_DEBUG("\t * Failed Action: %p", action);
action->unref();
- action =
surf_model_extract_failed_action_set(model
);
+ action =
model->extract_failed_action(
);
}
}
- action =
surf_model_extract_done_action_set(model
);
- while (action != nullptr){
+ action =
model->extract_done_action(
);
+ while (action != nullptr)
{
XBT_INFO(" * Done Action");
XBT_DEBUG("\t * Done Action: %p", action);
action->unref();
XBT_INFO(" * Done Action");
XBT_DEBUG("\t * Done Action: %p", action);
action->unref();
- action =
surf_model_extract_done_action_set(model
);
+ action =
model->extract_done_action(
);
}
}
} while (running && surf_solve(-1.0) >= 0.0);
XBT_INFO("Simulation Terminated");
}
}
} while (running && surf_solve(-1.0) >= 0.0);
XBT_INFO("Simulation Terminated");
- surf_exit();
return 0;
}
return 0;
}