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
try to avoid a false positive on sonar saying that on_exit() is deprecated
[simgrid.git]
/
examples
/
s4u
/
actor-lifetime
/
s4u-actor-lifetime.cpp
diff --git
a/examples/s4u/actor-lifetime/s4u-actor-lifetime.cpp
b/examples/s4u/actor-lifetime/s4u-actor-lifetime.cpp
index
0c47c27
..
6231737
100644
(file)
--- a/
examples/s4u/actor-lifetime/s4u-actor-lifetime.cpp
+++ b/
examples/s4u/actor-lifetime/s4u-actor-lifetime.cpp
@@
-1,28
+1,29
@@
-/* Copyright (c) 2007-201
7
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2007-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. */
+/* This C++ file acts as the foil to the corresponding XML file, where the
+ action takes place: Actors are started and stopped at predefined time. */
+
#include "simgrid/s4u.hpp"
XBT_LOG_NEW_DEFAULT_CATEGORY(test, "Messages specific for this s4u example");
#include "simgrid/s4u.hpp"
XBT_LOG_NEW_DEFAULT_CATEGORY(test, "Messages specific for this s4u example");
-/* Executed on process termination, to display a message helping to understand the output */
-static int my_onexit(void*, void*)
-{
- XBT_INFO("Exiting now (done sleeping or got killed).");
- return 0;
-}
-
-/* Just sleep until termination */
+/* This actor just sleeps until termination */
class sleeper {
public:
explicit sleeper(std::vector<std::string> /*args*/)
{
class sleeper {
public:
explicit sleeper(std::vector<std::string> /*args*/)
{
- XBT_INFO("Hello! I go to sleep.");
- simcall_process_on_exit(SIMIX_process_self(), my_onexit, NULL);
+ simgrid::s4u::this_actor::on_exit(
+ [](int, void*) {
+ /* Executed on process termination, to display a message helping to understand the output */
+ XBT_INFO("Exiting now (done sleeping or got killed).");
+ },
+ nullptr);
+ XBT_INFO("Hello! I go to sleep.");
simgrid::s4u::this_actor::sleep_for(10);
}
void operator()() { XBT_INFO("Done sleeping."); }
simgrid::s4u::this_actor::sleep_for(10);
}
void operator()() { XBT_INFO("Done sleeping."); }
@@
-36,9
+37,9
@@
int main(int argc, char* argv[])
"\tExample: %s msg_platform.xml msg_deployment.xml\n",
argv[0], argv[0]);
"\tExample: %s msg_platform.xml msg_deployment.xml\n",
argv[0], argv[0]);
- e.load
Platform(argv[1]); /* -
Load the platform description */
- e.register
Function
<sleeper>("sleeper");
- e.load
Deployment(argv[2]); /* -
Deploy the sleeper processes with explicit start/kill times */
+ e.load
_platform(argv[1]); /*
Load the platform description */
+ e.register
_actor
<sleeper>("sleeper");
+ e.load
_deployment(argv[2]); /*
Deploy the sleeper processes with explicit start/kill times */
e.run(); /* - Run the simulation */
e.run(); /* - Run the simulation */