summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
24b8c09)
This avoids many SIMIX requests related to communications.
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@9525
48e7efb5-ca39-0410-a469-
dd3cf9ba447f
@{ */
typedef struct m_task *m_task_t;
@{ */
typedef struct m_task *m_task_t;
+/**
+ * \brief @brief Communication action
+ * \ingroup m_datatypes_management
+ *
+ * Communication actions transfer tasks between processes.
+ * For a given task, the sender and the receiver have distinct objects.
+ */
+typedef struct msg_comm_t *msg_comm_t;
+
/** \brief Default value for an uninitialized #m_task_t.
\ingroup m_datatypes_management
*/
#define MSG_TASK_UNINITIALIZED NULL
/** \brief Default value for an uninitialized #m_task_t.
\ingroup m_datatypes_management
*/
#define MSG_TASK_UNINITIALIZED NULL
-typedef struct s_smx_action *msg_comm_t;
}
/** \ingroup msg_gos_functions
}
/** \ingroup msg_gos_functions
- * \brief Send a task on a channel.
+ * \brief Sends a task on a mailbox.
+ *
+ * This is a non blocking function: use MSG_comm_wait() or MSG_comm_test()
+ * to end the communication.
- * This function takes two parameter.
* \param task a #m_task_t to send on another location.
* \param task a #m_task_t to send on another location.
- * \param alias the channel on which the agent should put this
- task. This value has to be >=0 and < than the maximal number of
- channels fixed with MSG_set_channel_number().
- * \return the msg_comm_t communication.
+ * \param alias name of the mailbox to sent the task to
+ * \return the msg_comm_t communication created
*/
msg_comm_t MSG_task_isend(m_task_t task, const char *alias)
{
*/
msg_comm_t MSG_task_isend(m_task_t task, const char *alias)
{
- /* FIXME: these functions are not tracable */
+ /* FIXME: these functions are not traceable */
/* Prepare the task to send */
t_simdata = task->simdata;
/* Prepare the task to send */
t_simdata = task->simdata;
xbt_assert0(t_simdata->isused == 0,
"This task is still being used somewhere else. You cannot send it now. Go fix your code!");
xbt_assert0(t_simdata->isused == 0,
"This task is still being used somewhere else. You cannot send it now. Go fix your code!");
msg_global->sent_msg++;
/* Send it by calling SIMIX network layer */
msg_global->sent_msg++;
/* Send it by calling SIMIX network layer */
+ msg_comm_t comm = xbt_new0(s_msg_comm_t, 1);
+ comm->task_sent = task;
+ comm->task_received = NULL;
+ comm->status = MSG_OK;
+ comm->s_comm =
SIMIX_req_comm_isend(mailbox, t_simdata->message_size,
t_simdata->rate, task, sizeof(void *), NULL, NULL);
SIMIX_req_comm_isend(mailbox, t_simdata->message_size,
t_simdata->rate, task, sizeof(void *), NULL, NULL);
- return t_simdata->comm;
+ t_simdata->comm = comm->s_comm; /* FIXME: is the field t_simdata->comm still useful? */
+
+ return comm;
}
/** \ingroup msg_gos_functions
}
/** \ingroup msg_gos_functions
- * \brief Listen on a channel for receiving a task from an asynchronous communication.
+ * \brief Starts listening for receiving a task from an asynchronous communication.
+ *
+ * This is a non blocking function: use MSG_comm_wait() or MSG_comm_test()
+ * to end the communication.
- * It takes two parameters.
* \param task a memory location for storing a #m_task_t.
* \param task a memory location for storing a #m_task_t.
- * \param alias the channel on which the agent should be
- listening. This value has to be >=0 and < than the maximal
- number of channels fixed with MSG_set_channel_number().
- * \return the msg_comm_t communication.
+ * \param name of the mailbox to receive the task on
+ * \return the msg_comm_t communication created
-msg_comm_t MSG_task_irecv(m_task_t * task, const char *alias)
+msg_comm_t MSG_task_irecv(m_task_t *task, const char *alias)
{
smx_rdv_t rdv = MSG_mailbox_get_by_alias(alias);
{
smx_rdv_t rdv = MSG_mailbox_get_by_alias(alias);
("MSG_task_get() was asked to write in a non empty task struct.");
/* Try to receive it by calling SIMIX network layer */
("MSG_task_get() was asked to write in a non empty task struct.");
/* Try to receive it by calling SIMIX network layer */
- return SIMIX_req_comm_irecv(rdv, task, NULL, NULL, NULL);
+ msg_comm_t comm = xbt_new0(s_msg_comm_t, 1);
+ comm->task_sent = NULL;
+ comm->task_received = task;
+ comm->status = MSG_OK;
+ comm->s_comm = SIMIX_req_comm_irecv(rdv, task, NULL, NULL, NULL);
+
+ return comm;
}
/** \ingroup msg_gos_functions
}
/** \ingroup msg_gos_functions
- * \brief Returns whether a communication is finished.
+ * \brief Checks whether a communication is done, and if yes, finalizes it.
* \param comm the communication to test
* \return TRUE if the communication is finished
* (but it may have failed, use MSG_comm_get_status() to know its status)
* \param comm the communication to test
* \return TRUE if the communication is finished
* (but it may have failed, use MSG_comm_get_status() to know its status)
xbt_ex_t e;
int finished = 0;
TRY {
xbt_ex_t e;
int finished = 0;
TRY {
- finished = SIMIX_req_comm_test(comm);
+ finished = SIMIX_req_comm_test(comm->s_comm);
}
CATCH(e) {
switch (e.category) {
case host_error:
}
CATCH(e) {
switch (e.category) {
case host_error:
+ comm->status = MSG_HOST_FAILURE;
+ finished = 1;
+ break;
+
+ comm->status = MSG_TRANSFER_FAILURE;
+ finished = 1;
+ break;
+
+ comm->status = MSG_TIMEOUT;
return finished;
}
/** \ingroup msg_gos_functions
return finished;
}
/** \ingroup msg_gos_functions
- * \brief This function checks if a communication is finished
+ * \brief This function checks if a communication is finished.
* \param comms a vector of communications
* \return the position of the finished communication if any
* (but it may have failed, use MSG_comm_get_status() to know its status),
* \param comms a vector of communications
* \return the position of the finished communication if any
* (but it may have failed, use MSG_comm_get_status() to know its status),
{
xbt_ex_t e;
int finished_index = -1;
{
xbt_ex_t e;
int finished_index = -1;
+
+ /* create the equivalent dynar with SIMIX objects */
+ xbt_dynar_t s_comms = xbt_dynar_new(sizeof(smx_action_t), NULL);
+ msg_comm_t comm;
+ unsigned int cursor;
+ xbt_dynar_foreach(comms, cursor, comm) {
+ xbt_dynar_push(s_comms, &comm->s_comm);
+ }
+
+ MSG_error_t status = MSG_OK;
- finished_index = SIMIX_req_comm_testany(comms);
+ finished_index = SIMIX_req_comm_testany(s_comms);
}
CATCH(e) {
switch (e.category) {
case host_error:
}
CATCH(e) {
switch (e.category) {
case host_error:
+ finished_index = e.value;
+ status = MSG_HOST_FAILURE;
+ break;
+
+ finished_index = e.value;
+ status = MSG_TRANSFER_FAILURE;
+ break;
+
case timeout_error:
finished_index = e.value;
case timeout_error:
finished_index = e.value;
+ xbt_dynar_free(&s_comms);
+
+ if (finished_index != -1) {
+ comm = xbt_dynar_get_as(comms, finished_index, msg_comm_t);
+ /* the communication is finished */
+ comm->status = status;
+ }
+
return finished_index;
}
/** \ingroup msg_gos_functions
return finished_index;
}
/** \ingroup msg_gos_functions
- * \brief After received TRUE to MSG_comm_test(), the communication should be destroyed.
- *
- * It takes one parameter.
+ * \brief Destroys a communication.
* \param comm the communication to destroy.
*/
void MSG_comm_destroy(msg_comm_t comm)
{
* \param comm the communication to destroy.
*/
void MSG_comm_destroy(msg_comm_t comm)
{
- if (SIMIX_req_comm_get_src_proc(comm) != SIMIX_process_self()
+ if (comm->task_received != NULL
+ && *comm->task_received != NULL
&& MSG_comm_get_status(comm) == MSG_OK) {
&& MSG_comm_get_status(comm) == MSG_OK) {
- m_task_t task;
- task = (m_task_t) SIMIX_req_comm_get_src_buff(comm);
- task->simdata->isused=0;
+ (*comm->task_received)->simdata->isused = 0;
- SIMIX_req_comm_destroy(comm);
+
+ /* FIXME auto-destroy comms from SIMIX to avoid this request */
+ SIMIX_req_comm_destroy(comm->s_comm);
+ free(comm);
}
/** \ingroup msg_gos_functions
}
/** \ingroup msg_gos_functions
MSG_error_t MSG_comm_wait(msg_comm_t comm, double timeout)
{
xbt_ex_t e;
MSG_error_t MSG_comm_wait(msg_comm_t comm, double timeout)
{
xbt_ex_t e;
- MSG_error_t res = MSG_OK;
- SIMIX_req_comm_wait(comm, timeout);
+ SIMIX_req_comm_wait(comm->s_comm, timeout);
- if (SIMIX_req_comm_get_src_proc(comm) != SIMIX_process_self()) {
- m_task_t task;
- task = (m_task_t) SIMIX_req_comm_get_src_buff(comm);
- task->simdata->isused=0;
+ if (comm->task_received != NULL) {
+ /* I am the receiver */
+ (*comm->task_received)->simdata->isused = 0;
- /* FIXME: these functions are not tracable */
+ /* FIXME: these functions are not traceable */
}
CATCH(e) {
switch (e.category) {
case host_error:
}
CATCH(e) {
switch (e.category) {
case host_error:
- res = MSG_HOST_FAILURE;
+ comm->status = MSG_HOST_FAILURE;
break;
case network_error:
break;
case network_error:
- res = MSG_TRANSFER_FAILURE;
+ comm->status = MSG_TRANSFER_FAILURE;
break;
case timeout_error:
break;
case timeout_error:
+ comm->status = MSG_TIMEOUT;
break;
default:
RETHROW;
}
xbt_ex_free(e);
}
break;
default:
RETHROW;
}
xbt_ex_free(e);
}
}
/** \ingroup msg_gos_functions
* \brief This function is called by a sender and permit to wait for each communication
*
}
/** \ingroup msg_gos_functions
* \brief This function is called by a sender and permit to wait for each communication
*
-* It takes three parameters.
* \param comm a vector of communication
* \param nb_elem is the size of the comm vector
* \param comm a vector of communication
* \param nb_elem is the size of the comm vector
-* \param timeout for each call of MSG_comm_wait
+* \param timeout for each call of MSG_comm_wait
*/
void MSG_comm_waitall(msg_comm_t * comm, int nb_elem, double timeout)
{
*/
void MSG_comm_waitall(msg_comm_t * comm, int nb_elem, double timeout)
{
}
/** \ingroup msg_gos_functions
}
/** \ingroup msg_gos_functions
-* \brief This function wait for the first completed communication
-*
-* It takes on parameter.
-* \param comms a vector of communication
-* \return the position of the completed communication from the xbt_dynar_t.
-*/
+ * \brief This function waits for the first communication finished in a list.
+ * \param comms a vector of communications
+ * \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)
{
xbt_ex_t e;
int finished_index = -1;
int MSG_comm_waitany(xbt_dynar_t comms)
{
xbt_ex_t e;
int finished_index = -1;
+
+ /* create the equivalent dynar with SIMIX objects */
+ xbt_dynar_t s_comms = xbt_dynar_new(sizeof(smx_action_t), NULL);
+ msg_comm_t comm;
+ unsigned int cursor;
+ xbt_dynar_foreach(comms, cursor, comm) {
+ xbt_dynar_push(s_comms, &comm->s_comm);
+ }
+
+ MSG_error_t status = MSG_OK;
- finished_index = SIMIX_req_comm_waitany(comms);
+ finished_index = SIMIX_req_comm_waitany(s_comms);
}
CATCH(e) {
switch (e.category) {
case host_error:
}
CATCH(e) {
switch (e.category) {
case host_error:
+ finished_index = e.value;
+ status = MSG_HOST_FAILURE;
+ break;
+
+ finished_index = e.value;
+ status = MSG_TRANSFER_FAILURE;
+ break;
+
case timeout_error:
finished_index = e.value;
case timeout_error:
finished_index = e.value;
+ status = MSG_TIMEOUT;
+ break;
+
default:
RETHROW;
}
xbt_ex_free(e);
}
default:
RETHROW;
}
xbt_ex_free(e);
}
+
+ xbt_assert0(finished_index != -1, "WaitAny returned -1");
+ xbt_dynar_free(&s_comms);
+
+ comm = xbt_dynar_get_as(comms, finished_index, msg_comm_t);
+ /* the communication is finished */
+ comm->status = status;
+
* \ingroup msg_gos_functions
* \brief Returns the error (if any) that occured during a finished communication.
* \param comm a finished communication
* \ingroup msg_gos_functions
* \brief Returns the error (if any) that occured during a finished communication.
* \param comm a finished communication
- * \return the status of the communication, or MSG_OK if the communication
- * was successfully completed
+ * \return the status of the communication, or MSG_OK if no error occured
+ * during the communication
*/
MSG_error_t MSG_comm_get_status(msg_comm_t comm) {
*/
MSG_error_t MSG_comm_get_status(msg_comm_t comm) {
- MSG_error_t result;
- e_smx_state_t smx_state = SIMIX_req_comm_get_state(comm);
-
- switch (smx_state) {
-
- case SIMIX_CANCELED:
- result = MSG_TASK_CANCELLED;
- break;
-
- case SIMIX_FAILED:
- case SIMIX_SRC_HOST_FAILURE:
- case SIMIX_DST_HOST_FAILURE:
- result = MSG_HOST_FAILURE;
- break;
-
- case SIMIX_LINK_FAILURE:
- result = MSG_TRANSFER_FAILURE;
- break;
-
- case SIMIX_SRC_TIMEOUT:
- case SIMIX_DST_TIMEOUT:
- result = MSG_TIMEOUT;
- break;
-
- default:
- result = MSG_OK;
- break;
- }
- return result;
}
m_task_t MSG_comm_get_task(msg_comm_t comm)
{
}
m_task_t MSG_comm_get_task(msg_comm_t comm)
{
- xbt_assert0(comm, "Invalid parameters");
- return (m_task_t) SIMIX_req_comm_get_src_buff(comm);
+ xbt_assert0(comm, "Invalid parameter");
+
+ return comm->task_received ? *comm->task_received : comm->task_sent;
}
/** \ingroup msg_gos_functions
}
/** \ingroup msg_gos_functions
/********************************* Task **************************************/
typedef struct simdata_task {
/********************************* Task **************************************/
typedef struct simdata_task {
- smx_action_t compute; /* SURF modeling of computation */
- smx_action_t comm; /* SIMIX communication */
- double message_size; /* Data size */
- double computation_amount; /* Computation size */
+ smx_action_t compute; /* SIMIX modeling of computation */
+ smx_action_t comm; /* SIMIX modeling of communication */
+ double message_size; /* Data size */
+ double computation_amount; /* Computation size */
m_process_t sender;
m_process_t receiver;
m_host_t source;
m_process_t sender;
m_process_t receiver;
m_host_t source;
double kill_time;
} s_process_arg_t, *process_arg_t;
double kill_time;
} s_process_arg_t, *process_arg_t;
+typedef struct msg_comm_t {
+ smx_action_t s_comm; /* SIMIX communication object encapsulated (the same for both processes) */
+ m_task_t task_sent; /* task sent (NULL for the receiver) */
+ m_task_t *task_received; /* where the task will be received (NULL for the sender) */
+ MSG_error_t status; /* status of the communication once finished */
+} s_msg_comm_t;
+
/************************** Global variables ********************************/
typedef struct MSG_Global {
xbt_fifo_t host;
/************************** Global variables ********************************/
typedef struct MSG_Global {
xbt_fifo_t host;
static void SIMIX_waitany_req_remove_from_actions(smx_req_t req);
static void SIMIX_comm_copy_data(smx_action_t comm);
static smx_action_t SIMIX_comm_new(e_smx_comm_type_t type);
static void SIMIX_waitany_req_remove_from_actions(smx_req_t req);
static void SIMIX_comm_copy_data(smx_action_t comm);
static smx_action_t SIMIX_comm_new(e_smx_comm_type_t type);
-static XBT_INLINE void SIMIX_comm_wait_for_completion(smx_action_t comm,
- double timeout);
static XBT_INLINE void SIMIX_rdv_push(smx_rdv_t rdv, smx_action_t comm);
static XBT_INLINE void SIMIX_rdv_remove(smx_rdv_t rdv, smx_action_t comm);
static smx_action_t SIMIX_rdv_get_request(smx_rdv_t rdv, e_smx_comm_type_t type,
static XBT_INLINE void SIMIX_rdv_push(smx_rdv_t rdv, smx_action_t comm);
static XBT_INLINE void SIMIX_rdv_remove(smx_rdv_t rdv, smx_action_t comm);
static smx_action_t SIMIX_rdv_get_request(smx_rdv_t rdv, e_smx_comm_type_t type,
void SIMIX_req_comm_destroy(smx_action_t comm)
{
void SIMIX_req_comm_destroy(smx_action_t comm)
{
+ xbt_assert0(comm, "Invalid parameter");
+
+ /* FIXME remove this request type (auto-destroy finished comms) */
smx_req_t req = SIMIX_req_mine();
req->call = REQ_COMM_DESTROY;
smx_req_t req = SIMIX_req_mine();
req->call = REQ_COMM_DESTROY;