-/* Copyright (c) 2010-2018. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2010-2019. 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. */
+#include "simgrid/Exception.hpp"
#include "simgrid/msg.h"
-#include <xbt/ex.hpp>
#include <stdio.h> /* sscanf */
static void task_cleanup_handler(void* task)
{
- if (task)
- MSG_task_destroy(static_cast<msg_task_t>(task));
+ MSG_task_destroy(static_cast<msg_task_t>(task));
}
static int process_daemon(int /*argc*/, char** /*argv*/)
msg_task_t task = MSG_task_create("daemon", MSG_host_get_speed(MSG_host_self()), 0, NULL);
MSG_process_set_data(self, task);
XBT_INFO(" Execute daemon");
- msg_error_t res = MSG_task_execute(task);
+ MSG_task_execute(task);
MSG_task_destroy(task);
tasks_done++;
- if (res == MSG_HOST_FAILURE) {
- XBT_INFO("Host as died as expected, do nothing else");
- return 0;
- }
}
XBT_INFO(" daemon done. See you!");
return 0;
}
-static int process_sleep(int /*argc*/, char** /*argv*/)
-{
- for (;;) {
- XBT_INFO(" I'm alive but I should sleep");
- MSG_process_sleep(10);
- }
- XBT_INFO(" I'm done. See you!");
- return 0;
-}
-
static int commTX(int /*argc*/, char** /*argv*/)
{
const char* mailbox = "comm";
msg_task_t task = MSG_task_create("COMM", 0, 100000000, NULL);
MSG_task_dsend(task, mailbox, task_cleanup_handler);
// We should wait a bit (if not the process will end before the communication, hence an exception on the other side).
- try {
- MSG_process_sleep(30);
- } catch (xbt_ex& e) {
- if (e.category == host_error) {
- XBT_INFO("The host has died ... as expected.");
- } else {
- XBT_ERROR("An unexpected exception has been raised.");
- throw;
- }
+ int res = MSG_process_sleep(30);
+ if (res == MSG_HOST_FAILURE) {
+ XBT_INFO("The host has died ... as expected.");
}
XBT_INFO(" TX done");
return 0;
XBT_INFO(" Start RX");
msg_error_t error = MSG_task_receive(&(task), mailbox);
if (error == MSG_OK) {
- XBT_INFO(" Receive message: %s", task->name);
+ XBT_INFO(" Receive message: %s", MSG_task_get_name(task));
MSG_task_destroy(task);
} else if (error == MSG_HOST_FAILURE) {
XBT_INFO(" Receive message: HOST_FAILURE");
}
test = 2;
- // Create a process that on a host that is turned off (this should not be possible)
+ // Create a process that on a host that is turned off (this is not allowed)
if (xbt_dynar_search_or_negative(tests, &test) != -1) {
XBT_INFO("Test 2:");
XBT_INFO(" Turn off Jupiter");
argvF[0] = xbt_strdup("process_daemon");
MSG_process_create_with_arguments("process_daemon", process_daemon, NULL, jupiter, 1, argvF);
MSG_process_sleep(10);
- XBT_INFO(" Test 2 does not crash as it should (number of Process : %d, it should be 1)", MSG_process_get_number());
- XBT_INFO(" Ok so let's turn on/off the node to see whether the process is correctly bound to Jupiter");
- MSG_host_on(jupiter);
- XBT_INFO(" Turn off");
- MSG_host_off(jupiter);
- XBT_INFO(" sleep");
- MSG_process_sleep(10);
- XBT_INFO("number of Process : %d it should be 1. The daemon that has been created for test2 has been correctly "
- "destroyed....ok at least it looks rigorous, cool ! You just have to disallow the possibility to create "
- "a new process on a node when the node is off.)",
- MSG_process_get_number());
+ XBT_INFO(" Test 2 does crash as it should. This message will not be displayed.");
}
test = 3;
- // Create a process running sucessive sleeps on a host and turn the host off during the execution of the process.
+ // Create a process running successive sleeps on a host and turn the host off during the execution of the process.
if (xbt_dynar_search_or_negative(tests, &test) != -1) {
- XBT_INFO("Test 3:");
- MSG_host_on(jupiter);
- argvF = xbt_new(char*, 2);
- argvF[0] = xbt_strdup("process_sleep");
- MSG_process_create_with_arguments("process_sleep", process_sleep, NULL, jupiter, 1, argvF);
- MSG_process_sleep(100);
- XBT_INFO(" Turn off");
- MSG_host_off(jupiter);
- XBT_INFO(" sleep for 10 seconds");
- MSG_process_sleep(10000);
- XBT_INFO("number of Process : %d it should be 1 (i.e. the Test one))", MSG_process_get_number());
+ xbt_die("Test 3 is superseeded by activity-lifecycle");
}
test = 4;
MSG_create_environment(argv[1]);
+ MSG_process_set_data_cleanup(task_cleanup_handler);
MSG_process_create("test_launcher", test_launcher, NULL, MSG_get_host_by_name("Tremblay"));
res = MSG_main();
