Task* Task::create(const std::string& name, double flops_amount, double bytes_amount, void* data)
{
- return new Task(std::move(name), flops_amount, bytes_amount, data);
+ return new Task(name, flops_amount, bytes_amount, data);
}
Task* Task::create_parallel(const std::string& name, int host_nb, const msg_host_t* host_list, double* flops_amount,
double* bytes_amount, void* data)
{
- std::vector<s4u::Host*> hosts;
+ std::vector<s4u::Host*> hosts(host_list, host_list + host_nb);
std::vector<double> flops;
std::vector<double> bytes;
+ if (flops_amount != nullptr)
+ flops = std::vector<double>(flops_amount, flops_amount + host_nb);
+ if (bytes_amount != nullptr)
+ bytes = std::vector<double>(bytes_amount, bytes_amount + host_nb * host_nb);
- for (int i = 0; i < host_nb; i++) {
- hosts.push_back(host_list[i]);
- if (flops_amount != nullptr)
- flops.push_back(flops_amount[i]);
- if (bytes_amount != nullptr) {
- for (int j = 0; j < host_nb; j++)
- bytes.push_back(bytes_amount[host_nb * i + j]);
- }
- }
- return new Task(std::move(name), std::move(hosts), std::move(flops), std::move(bytes), data);
+ return new Task(name, std::move(hosts), std::move(flops), std::move(bytes), data);
}
msg_error_t Task::execute()
set_not_used();
XBT_DEBUG("Execution task '%s' finished", get_cname());
- } catch (HostFailureException& e) {
+ } catch (const HostFailureException&) {
status = MSG_HOST_FAILURE;
- } catch (TimeoutError& e) {
+ } catch (const TimeoutException&) {
status = MSG_TIMEOUT;
- } catch (CancelException& e) {
+ } catch (const CancelException&) {
status = MSG_TASK_CANCELED;
}
s4u::CommPtr Task::send_async(const std::string& alias, void_f_pvoid_t cleanup, bool detached)
{
if (TRACE_actor_is_enabled()) {
- container_t process_container = simgrid::instr::Container::by_name(instr_pid(MSG_process_self()));
+ container_t process_container = instr::Container::by_name(instr_pid(*MSG_process_self()));
std::string key = std::string("p") + std::to_string(get_id());
- simgrid::instr::Container::get_root()->get_link("ACTOR_TASK_LINK")->start_event(process_container, "SR", key);
+ instr::Container::get_root()->get_link("ACTOR_TASK_LINK")->start_event(process_container, "SR", key);
}
/* Prepare the task to send */
msg_global->sent_msg++;
s4u::CommPtr s4u_comm = s4u::Mailbox::by_name(alias)->put_init(this, bytes_amount)->set_rate(get_rate());
+ if (TRACE_is_enabled() && has_tracing_category())
+ s4u_comm->set_tracing_category(tracing_category_);
+
comm = s4u_comm;
if (detached)
else
comm->start();
- if (TRACE_is_enabled() && has_tracing_category())
- simgrid::simix::simcall([this] { comm->get_impl()->set_category(std::move(tracing_category_)); });
-
return comm;
}
s4u::CommPtr s4u_comm = send_async(alias, nullptr, false);
comm = s4u_comm;
comm->wait_for(timeout);
- } catch (simgrid::TimeoutError& e) {
+ } catch (const TimeoutException&) {
ret = MSG_TIMEOUT;
- } catch (simgrid::CancelException& e) {
+ } catch (const CancelException&) {
ret = MSG_HOST_FAILURE;
- } catch (xbt_ex& e) {
- if (e.category == network_error)
- ret = MSG_TRANSFER_FAILURE;
- else
- throw;
-
+ } catch (const NetworkFailureException&) {
+ ret = MSG_TRANSFER_FAILURE;
/* If the send failed, it is not used anymore */
set_not_used();
}
s4u::Actor* Task::get_sender()
{
- return comm ? comm->get_sender().get() : nullptr;
+ return comm ? comm->get_sender() : nullptr;
}
s4u::Host* Task::get_source()
void Task::report_multiple_use() const
{
- if (msg_global->debug_multiple_use){
+ if (MSG_Global_t::debug_multiple_use) {
XBT_ERROR("This task is already used in there:");
// TODO, backtrace
XBT_ERROR("<missing backtrace>");
*task = static_cast<msg_task_t>(payload);
XBT_DEBUG("Got task %s from %s", (*task)->get_cname(), alias);
(*task)->set_not_used();
- } catch (simgrid::HostFailureException& e) {
+ } catch (const simgrid::HostFailureException&) {
ret = MSG_HOST_FAILURE;
- } catch (simgrid::TimeoutError& e) {
+ } catch (const simgrid::TimeoutException&) {
ret = MSG_TIMEOUT;
- } catch (simgrid::CancelException& e) {
+ } catch (const simgrid::CancelException&) {
ret = MSG_TASK_CANCELED;
- } catch (xbt_ex& e) {
- if (e.category == network_error)
- ret = MSG_TRANSFER_FAILURE;
- else
- throw;
+ } catch (const simgrid::NetworkFailureException&) {
+ ret = MSG_TRANSFER_FAILURE;
}
if (TRACE_actor_is_enabled() && ret != MSG_HOST_FAILURE && ret != MSG_TRANSFER_FAILURE && ret != MSG_TIMEOUT) {
- container_t process_container = simgrid::instr::Container::by_name(instr_pid(MSG_process_self()));
+ container_t process_container = simgrid::instr::Container::by_name(instr_pid(*MSG_process_self()));
std::string key = std::string("p") + std::to_string((*task)->get_id());
simgrid::instr::Container::get_root()->get_link("ACTOR_TASK_LINK")->end_event(process_container, "SR", key);
*
* @param alias the name of the mailbox to be considered
*
- * @return Returns the PID of sender process,
- * -1 if there is no communication in the mailbox.#include <cmath>
+ * @return Returns the PID of sender process (or -1 if there is no communication in the mailbox)
*
*/
int MSG_task_listen_from(const char* alias)