-/* Copyright (c) 2004-2019. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2004-2022. 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 "src/instr/instr_private.hpp"
#include "src/msg/msg_private.hpp"
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_comm, msg, "Logging specific to MSG (comm)");
-
namespace simgrid {
namespace msg {
/* I am the receiver */
(*task_received)->set_not_used();
}
- } catch (const simgrid::TimeoutError&) {
+ } catch (const simgrid::TimeoutException&) {
status_ = MSG_TIMEOUT;
finished = true;
} catch (const simgrid::CancelException&) {
status_ = MSG_TASK_CANCELED;
finished = true;
- } catch (xbt_ex& e) {
- if (e.category == network_error) {
- status_ = MSG_TRANSFER_FAILURE;
- finished = true;
- } else {
- throw;
- }
+ } catch (const simgrid::NetworkFailureException&) {
+ status_ = MSG_TRANSFER_FAILURE;
+ finished = true;
}
return finished;
}
/* FIXME: these functions are not traceable */
- } catch (const simgrid::TimeoutError&) {
+ } catch (const simgrid::TimeoutException&) {
status_ = MSG_TIMEOUT;
} catch (const simgrid::CancelException&) {
status_ = MSG_TASK_CANCELED;
- } catch (xbt_ex& e) {
- if (e.category == network_error)
- status_ = MSG_TRANSFER_FAILURE;
- else
- throw;
+ } catch (const simgrid::NetworkFailureException&) {
+ status_ = MSG_TRANSFER_FAILURE;
}
return status_;
* @return the position of the finished communication if any
* (but it may have failed, use MSG_comm_get_status() to know its status), or -1 if none is finished
*/
-int MSG_comm_testany(xbt_dynar_t comms)
+int MSG_comm_testany(const_xbt_dynar_t comms)
{
- int finished_index = -1;
+ ssize_t finished_index = -1;
/* Create the equivalent array with SIMIX objects: */
std::vector<simgrid::kernel::activity::CommImpl*> s_comms;
msg_error_t status = MSG_OK;
try {
finished_index = simcall_comm_testany(s_comms.data(), s_comms.size());
- } catch (simgrid::TimeoutError& e) {
- finished_index = e.value;
+ } catch (const simgrid::TimeoutException& e) {
+ finished_index = e.get_value();
status = MSG_TIMEOUT;
- } catch (simgrid::CancelException& e) {
- finished_index = e.value;
+ } catch (const simgrid::CancelException& e) {
+ finished_index = e.get_value();
status = MSG_TASK_CANCELED;
- } catch (xbt_ex& e) {
- if (e.category != network_error)
- throw;
- finished_index = e.value;
+ } catch (const simgrid::NetworkFailureException& e) {
+ finished_index = e.get_value();
status = MSG_TRANSFER_FAILURE;
}
}
}
- return finished_index;
+ return static_cast<int>(finished_index);
}
/** @brief Destroys the provided communication. */
-void MSG_comm_destroy(msg_comm_t comm)
+void MSG_comm_destroy(const_msg_comm_t comm)
{
delete comm;
}
return comm->wait_for(timeout);
}
-/** @brief This function is called by a sender and permit to wait for each communication
+/** @brief This function is called by a sender and permits waiting for each communication
*
* @param comm a vector of communication
* @param nb_elem is the size of the comm vector
* @return the position of the first finished communication
* (but it may have failed, use MSG_comm_get_status() to know its status)
*/
-int MSG_comm_waitany(xbt_dynar_t comms)
+int MSG_comm_waitany(const_xbt_dynar_t comms)
{
- int finished_index = -1;
+ ssize_t finished_index = -1;
/* Create the equivalent array with SIMIX objects: */
std::vector<simgrid::kernel::activity::CommImpl*> s_comms;
msg_error_t status = MSG_OK;
try {
finished_index = simcall_comm_waitany(s_comms.data(), s_comms.size(), -1);
- } catch (simgrid::TimeoutError& e) {
- finished_index = e.value;
+ } catch (const simgrid::TimeoutException& e) {
+ finished_index = e.get_value();
status = MSG_TIMEOUT;
- } catch (simgrid::CancelException& e) {
- finished_index = e.value;
+ } catch (const simgrid::CancelException& e) {
+ finished_index = e.get_value();
status = MSG_TASK_CANCELED;
- } catch (xbt_ex& e) {
- if (e.category == network_error) {
- finished_index = e.value;
- status = MSG_TRANSFER_FAILURE;
- } else {
- throw;
- }
+ } catch (const simgrid::NetworkFailureException& e) {
+ finished_index = e.get_value();
+ status = MSG_TRANSFER_FAILURE;
}
xbt_assert(finished_index != -1, "WaitAny returned -1");
(*comm->task_received)->set_not_used();
}
- return finished_index;
+ return static_cast<int>(finished_index);
}
/**
* @param comm a finished communication
* @return the status of the communication, or #MSG_OK if no error occurred during the communication
*/
-msg_error_t MSG_comm_get_status(msg_comm_t comm)
+msg_error_t MSG_comm_get_status(const_msg_comm_t comm)
{
-
return comm->get_status();
}
* @param comm the communication where to get the task
* @return the task from the communication
*/
-msg_task_t MSG_comm_get_task(msg_comm_t comm)
+msg_task_t MSG_comm_get_task(const_msg_comm_t comm)
{
xbt_assert(comm, "Invalid parameter");
return comm->task_received ? *comm->task_received : comm->task_sent;
}
-
-/**
- * @brief This function is called by SIMIX in kernel mode to copy the data of a comm.
- * @param comm the comm
- * @param buff the data copied
- * @param buff_size size of the buffer
- */
-// deprecated but used by MSG_set_copy_callback. Should be removed in v325
-void MSG_comm_copy_data_from_SIMIX(simgrid::kernel::activity::CommImpl* comm, void* buff, size_t buff_size)
-{
- SIMIX_comm_copy_pointer_callback(comm, buff, buff_size);
-
- // notify the user callback if any
- if (msg_global->task_copy_callback) {
- msg_task_t task = static_cast<msg_task_t>(buff);
- msg_global->task_copy_callback(task, comm->src_actor_->ciface(), comm->dst_actor_->ciface());
- }
-}
