-/* Copyright (c) 2007-2019. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2007-2020. 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. */
* To set such a profile, the first way is to use a file in the XML, while the second is to use the programmatic
* interface. Once this profile is in place, the resource will automatically be turned on and off.
*
- * The actors running on an host that is turned off will receive a simgrid::HostFailureException. Since we specified
- * on_failure="RESTART" for each actors in the XML file, they will be automatically restarted when the host starts
- * again.
+ * The actors running on an host that is turned off are forcefully killed
+ * once their on_exit callbacks are executed. They cannot avoid this fate.
+ * Since we specified on_failure="RESTART" for each actors in the XML file,
+ * they will be automatically restarted when the host starts again.
*
* Communications using failed links will .. fail.
*/
XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_test, "Messages specific for this s4u example");
-static int master(int argc, char* argv[])
+static void master(int argc, char* argv[])
{
xbt_assert(argc == 5, "Expecting one parameter");
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 (const simgrid::TimeoutError&) {
+ } catch (const simgrid::TimeoutException&) {
delete payload;
XBT_INFO("Mmh. Got timeouted while speaking to '%s'. Nevermind. Let's keep going!", mailbox->get_cname());
- } catch (xbt_ex& e) {
- if (e.category != network_error)
- xbt_die("Unexpected behavior");
- XBT_INFO("Mmh. The communication with '%s' failed. Nevermind. Let's keep going!", mailbox->get_cname());
+ } catch (const simgrid::NetworkFailureException&) {
delete payload;
+ XBT_INFO("Mmh. The communication with '%s' failed. Nevermind. Let's keep going!", mailbox->get_cname());
}
}
double* payload = new double(-1.0);
try {
mailbox->put(payload, 0, 1.0);
- } catch (const simgrid::TimeoutError&) {
+ } catch (const simgrid::TimeoutException&) {
delete payload;
XBT_INFO("Mmh. Got timeouted while speaking to '%s'. Nevermind. Let's keep going!", mailbox->get_cname());
- } catch (xbt_ex& e) {
+ } catch (const simgrid::NetworkFailureException&) {
delete payload;
- if (e.category != network_error)
- xbt_die("Unexpected behavior");
XBT_INFO("Mmh. Something went wrong with '%s'. Nevermind. Let's keep going!", mailbox->get_cname());
}
}
XBT_INFO("Goodbye now!");
- return 0;
}
-static int worker(int argc, char* argv[])
+static void 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* mailbox = simgrid::s4u::Mailbox::by_name(std::string("worker-") + std::to_string(id));
- double* payload = nullptr;
+ const double* payload = nullptr;
double comp_size = -1;
while (1) {
try {
XBT_INFO("Start execution...");
simgrid::s4u::this_actor::execute(comp_size);
XBT_INFO("Execution complete.");
- } catch (xbt_ex& e) {
- if (e.category != network_error)
- xbt_die("Unexpected behavior. Category: %s", xbt_ex_catname(e.category));
+ } catch (const simgrid::NetworkFailureException&) {
XBT_INFO("Mmh. Something went wrong. Nevermind. Let's keep going!");
}
}
- return 0;
}
int main(int argc, char* argv[])