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
Cosmetics.
[simgrid.git]
/
examples
/
s4u
/
platform-failures
/
s4u-platform-failures.cpp
diff --git
a/examples/s4u/platform-failures/s4u-platform-failures.cpp
b/examples/s4u/platform-failures/s4u-platform-failures.cpp
index e4cca6a80aa180d3c89457d64e833f736317b268..ceea3140f7f66d2735e27955607944f4fae4765e 100644
(file)
--- a/
examples/s4u/platform-failures/s4u-platform-failures.cpp
+++ b/
examples/s4u/platform-failures/s4u-platform-failures.cpp
@@
-25,7
+25,7
@@
static int master(int argc, char* argv[])
{
xbt_assert(argc == 5, "Expecting one parameter");
- simgrid::s4u::Mailbox
Ptr
mailbox;
+ simgrid::s4u::Mailbox
*
mailbox;
long number_of_tasks = xbt_str_parse_int(argv[1], "Invalid amount of tasks: %s");
double comp_size = xbt_str_parse_double(argv[2], "Invalid computational size: %s");
double comm_size = xbt_str_parse_double(argv[3], "Invalid communication size: %s");
@@
-40,10
+40,7
@@
static int master(int argc, char* argv[])
XBT_INFO("Send a message to %s", mailbox->get_cname());
mailbox->put(payload, comm_size, 10.0);
XBT_INFO("Send to %s completed", mailbox->get_cname());
- } catch (simgrid::HostFailureException& e) {
- XBT_INFO("Gloups. The cpu on which I'm running just turned off!. See you!");
- return -1;
- } catch (simgrid::TimeoutError& e) {
+ } catch (const simgrid::TimeoutError&) {
delete payload;
XBT_INFO("Mmh. Got timeouted while speaking to '%s'. Nevermind. Let's keep going!", mailbox->get_cname());
} catch (xbt_ex& e) {
@@
-61,11
+58,7
@@
static int master(int argc, char* argv[])
double* payload = new double(-1.0);
try {
mailbox->put(payload, 0, 1.0);
- } catch (simgrid::HostFailureException& e) {
- delete payload;
- XBT_INFO("Gloups. The cpu on which I'm running just turned off!. See you!");
- return -1;
- } catch (simgrid::TimeoutError& e) {
+ } catch (const simgrid::TimeoutError&) {
delete payload;
XBT_INFO("Mmh. Got timeouted while speaking to '%s'. Nevermind. Let's keep going!", mailbox->get_cname());
} catch (xbt_ex& e) {
@@
-84,7
+77,7
@@
static int worker(int argc, char* argv[])
{
xbt_assert(argc == 2, "Expecting one parameter");
long id = xbt_str_parse_int(argv[1], "Invalid argument %s");
- simgrid::s4u::Mailbox
Ptr mailbox
= simgrid::s4u::Mailbox::by_name(std::string("worker-") + std::to_string(id));
+ simgrid::s4u::Mailbox
* mailbox
= simgrid::s4u::Mailbox::by_name(std::string("worker-") + std::to_string(id));
double* payload = nullptr;
double comp_size = -1;
while (1) {
@@
-93,20
+86,15
@@
static int worker(int argc, char* argv[])
payload = static_cast<double*>(mailbox->get());
xbt_assert(payload != nullptr, "mailbox->get() failed");
comp_size = *payload;
+ delete payload;
if (comp_size < 0) { /* - Exit when -1.0 is received */
XBT_INFO("I'm done. See you!");
- delete payload;
break;
}
/* - Otherwise, process the task */
XBT_INFO("Start execution...");
simgrid::s4u::this_actor::execute(comp_size);
XBT_INFO("Execution complete.");
- delete payload;
- } catch (simgrid::HostFailureException& e) {
- XBT_INFO("Gloups. The cpu on which I'm running just turned off!. See you!");
- delete payload;
- return -1;
} catch (xbt_ex& e) {
if (e.category != network_error)
xbt_die("Unexpected behavior. Category: %s", xbt_ex_catname(e.category));