-/* Copyright (c) 2010-2015. 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 <xbt/ex.hpp>
+#include "simgrid/Exception.hpp"
#include "simgrid/msg.h"
XBT_LOG_NEW_DEFAULT_CATEGORY(msg_test, "Messages specific for this msg example");
double timeout = 1;
msg_task_t task = MSG_task_create("normal", task_comp_size, task_comm_size, NULL);
- XBT_INFO("Sending task: \"%s\"", task->name);
+ XBT_INFO("Sending task: \"%s\"", MSG_task_get_name(task));
MSG_task_send_with_timeout(task, "worker_mailbox", timeout);
task = MSG_task_create("cancel directly", task_comp_size, task_comm_size, NULL);
- XBT_INFO("Canceling task \"%s\" directly", task->name);
+ XBT_INFO("Canceling task \"%s\" directly", MSG_task_get_name(task));
MSG_task_cancel(task);
MSG_task_destroy(task);
task = MSG_task_create("destroy directly", task_comp_size, task_comm_size, NULL);
- XBT_INFO("Destroying task \"%s\" directly", task->name);
+ XBT_INFO("Destroying task \"%s\" directly", MSG_task_get_name(task));
MSG_task_destroy(task);
task = MSG_task_create("cancel", task_comp_size, task_comm_size, NULL);
msg_comm_t comm = MSG_task_isend(task, "worker_mailbox");
- XBT_INFO("Canceling task \"%s\" during comm", task->name);
+ XBT_INFO("Canceling task \"%s\" during comm", MSG_task_get_name(task));
MSG_task_cancel(task);
- try {
- MSG_comm_wait(comm, -1);
- }
- catch (xbt_ex& ex) {
+ if (MSG_comm_wait(comm, -1) != MSG_OK)
MSG_comm_destroy(comm);
- }
MSG_task_destroy(task);
task = MSG_task_create("finalize", task_comp_size, task_comm_size, NULL);
comm = MSG_task_isend(task, "worker_mailbox");
- XBT_INFO("Destroying task \"%s\" during comm", task->name);
+ XBT_INFO("Destroying task \"%s\" during comm", MSG_task_get_name(task));
MSG_task_destroy(task);
- try {
- MSG_comm_wait(comm, -1);
- }
- catch (xbt_ex& ex) {
+ if (MSG_comm_wait(comm, -1) != MSG_OK)
MSG_comm_destroy(comm);
- }
task = MSG_task_create("cancel", task_comp_size, task_comm_size, NULL);
MSG_task_send_with_timeout(task, "worker_mailbox", timeout);
{
msg_task_t task = (msg_task_t) MSG_process_get_data(MSG_process_self());
msg_error_t res;
- XBT_INFO("Start %s", task->name);
+ XBT_INFO("Start %s", MSG_task_get_name(task));
res = MSG_task_execute(task);
XBT_INFO("Task %s", res == MSG_OK ? "done" : "failed");
MSG_task_destroy(task);
XBT_INFO("Handling task \"%s\"", MSG_task_get_name(task));
if (not strcmp(MSG_task_get_name(task), "finalize")) {
- XBT_INFO("Destroying task \"%s\"", task->name);
+ XBT_INFO("Destroying task \"%s\"", MSG_task_get_name(task));
MSG_task_destroy(task);
break;
}
if (not strcmp(MSG_task_get_name(task), "cancel")) {
MSG_process_create("worker1", worker_main, task, MSG_host_self());
MSG_process_sleep(0.1);
- XBT_INFO("Canceling task \"%s\"", task->name);
+ XBT_INFO("Canceling task \"%s\"", MSG_task_get_name(task));
MSG_task_cancel(task);
continue;
}
MSG_task_execute(task);
double end = MSG_get_clock();
XBT_INFO("Task \"%s\" done in %f (amount %f)", MSG_task_get_name(task), end - start,
- MSG_task_get_remaining_work_ratio(task));
+ MSG_task_get_flops_amount(task));
MSG_task_destroy(task);
}