#include "xbt/log.h"
#include "xbt/sysdep.h"
-
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_gos, msg,
"Logging specific to MSG (gos)");
p_simdata = SIMIX_process_self_get_data(self);
simdata->isused=1;
simdata->compute =
- SIMIX_req_host_execute(task->name, p_simdata->m_host->simdata->smx_host,
+ simcall_host_execute(task->name, p_simdata->m_host->simdata->smx_host,
simdata->computation_amount,
simdata->priority);
#ifdef HAVE_TRACING
- SIMIX_req_set_category(simdata->compute, task->category);
+ simcall_set_category(simdata->compute, task->category);
#endif
p_simdata->waiting_action = simdata->compute;
- comp_state = SIMIX_req_host_execution_wait(simdata->compute);
+ comp_state = simcall_host_execution_wait(simdata->compute);
p_simdata->waiting_action = NULL;
simdata->isused=0;
TRACE_msg_task_execute_end(task);
#endif
MSG_RETURN(MSG_OK);
- } else if (SIMIX_req_host_get_state(SIMIX_host_self()) == 0) {
+ } else if (simcall_host_get_state(SIMIX_host_self()) == 0) {
/* action ended, set comm and compute = NULL, the actions is already destroyed in the main function */
simdata->comm = NULL;
simdata->compute = NULL;
simdata->isused=1;
simdata->compute =
- SIMIX_req_host_parallel_execute(task->name, simdata->host_nb,
+ simcall_host_parallel_execute(task->name, simdata->host_nb,
simdata->host_list,
simdata->comp_amount,
simdata->comm_amount, 1.0, -1.0);
XBT_DEBUG("Parallel execution action created: %p", simdata->compute);
p_simdata->waiting_action = simdata->compute;
- comp_state = SIMIX_req_host_execution_wait(simdata->compute);
+ comp_state = simcall_host_execution_wait(simdata->compute);
p_simdata->waiting_action = NULL;
XBT_DEBUG("Finished waiting for execution of action %p, state = %d", simdata->compute, comp_state);
simdata->comm = NULL;
simdata->compute = NULL;
MSG_RETURN(MSG_OK);
- } else if (SIMIX_req_host_get_state(SIMIX_host_self()) == 0) {
+ } else if (simcall_host_get_state(SIMIX_host_self()) == 0) {
/* action ended, set comm and compute = NULL, the actions is already destroyed in the main function */
simdata->comm = NULL;
simdata->compute = NULL;
#endif
/* create action to sleep */
- state = SIMIX_req_process_sleep(nb_sec);
+ state = simcall_process_sleep(nb_sec);
/*proc->simdata->waiting_action = act_sleep;
MSG_error_t
MSG_task_get_from_host(m_task_t * task, m_channel_t channel, m_host_t host)
{
+ XBT_WARN("DEPRECATED! Now use MSG_task_receive_from_host");
return MSG_task_get_ext(task, channel, -1, host);
}
*/
MSG_error_t MSG_task_get(m_task_t * task, m_channel_t channel)
{
+ XBT_WARN("DEPRECATED! Now use MSG_task_receive");
return MSG_task_get_with_timeout(task, channel, -1);
}
MSG_task_get_with_timeout(m_task_t * task, m_channel_t channel,
double max_duration)
{
+ XBT_WARN("DEPRECATED! Now use MSG_task_receive_with_timeout");
return MSG_task_get_ext(task, channel, max_duration, NULL);
}
MSG_task_get_ext(m_task_t * task, m_channel_t channel, double timeout,
m_host_t host)
{
+ XBT_WARN("DEPRECATED! Now use MSG_task_receive_ext");
xbt_assert((channel >= 0)
&& (channel < msg_global->max_channel), "Invalid channel %d",
channel);
comm->task_received = NULL;
comm->status = MSG_OK;
comm->s_comm =
- SIMIX_req_comm_isend(mailbox, t_simdata->message_size,
+ simcall_comm_isend(mailbox, t_simdata->message_size,
t_simdata->rate, task, sizeof(void *), match_fun, NULL, match_data, 0);
t_simdata->comm = comm->s_comm; /* FIXME: is the field t_simdata->comm still useful? */
* \param task a #m_task_t to send on another location.
* \param alias name of the mailbox to sent the task to
* \param cleanup a function to destroy the task if the
- * communication fails (if NULL, MSG_task_destroy() will
- * be used by default)
+ * communication fails, e.g. MSG_task_destroy
+ * (if NULL, no function will be called)
*/
void MSG_task_dsend(m_task_t task, const char *alias, void_f_pvoid_t cleanup)
{
CHECK_HOST();
- if (cleanup == NULL) {
- cleanup = (void_f_pvoid_t) MSG_task_destroy;
- }
-
/* FIXME: these functions are not traceable */
/* Prepare the task to send */
msg_global->sent_msg++;
/* Send it by calling SIMIX network layer */
- smx_action_t comm = SIMIX_req_comm_isend(mailbox, t_simdata->message_size,
- t_simdata->rate, task, sizeof(void *), NULL,cleanup, NULL, 1);
+ smx_action_t comm = simcall_comm_isend(mailbox, t_simdata->message_size,
+ t_simdata->rate, task, sizeof(void *), NULL, cleanup, NULL, 1);
t_simdata->comm = comm;
}
comm->task_sent = NULL;
comm->task_received = task;
comm->status = MSG_OK;
- comm->s_comm = SIMIX_req_comm_irecv(rdv, task, NULL, NULL, NULL);
+ comm->s_comm = simcall_comm_irecv(rdv, task, NULL, NULL, NULL);
return comm;
}
xbt_ex_t e;
int finished = 0;
TRY {
- finished = SIMIX_req_comm_test(comm->s_comm);
+ finished = simcall_comm_test(comm->s_comm);
if (finished && comm->task_received != NULL) {
/* I am the receiver */
MSG_error_t status = MSG_OK;
TRY {
- finished_index = SIMIX_req_comm_testany(s_comms);
+ finished_index = simcall_comm_testany(s_comms);
}
CATCH(e) {
switch (e.category) {
*/
void MSG_comm_destroy(msg_comm_t comm)
{
- if (comm->task_received != NULL
- && *comm->task_received != NULL
- && MSG_comm_get_status(comm) == MSG_OK) {
- (*comm->task_received)->simdata->isused = 0;
- }
-
xbt_free(comm);
}
{
xbt_ex_t e;
TRY {
- SIMIX_req_comm_wait(comm->s_comm, timeout);
+ simcall_comm_wait(comm->s_comm, timeout);
if (comm->task_received != NULL) {
/* I am the receiver */
MSG_error_t status = MSG_OK;
TRY {
- finished_index = SIMIX_req_comm_waitany(s_comms);
+ finished_index = simcall_comm_waitany(s_comms);
}
CATCH(e) {
switch (e.category) {
/* the communication is finished */
comm->status = status;
+ if (comm->task_received != NULL) {
+ /* I am the receiver */
+ (*comm->task_received)->simdata->isused = 0;
+ }
+
return finished_index;
}
return comm->task_received ? *comm->task_received : comm->task_sent;
}
+/**
+ * \brief This function is called by SIMIX to copy the data of a comm.
+ * \param comm the comm
+ * \param buff the data copied
+ * \param buff_size size of the buffer
+ */
+void MSG_comm_copy_data_from_SIMIX(smx_action_t comm, void* buff, size_t buff_size) {
+
+ // copy the task
+ SIMIX_comm_copy_pointer_callback(comm, buff, buff_size);
+
+ // notify the user callback if any
+ if (msg_global->task_copy_callback) {
+ m_task_t task = buff;
+ msg_global->task_copy_callback(task,
+ simcall_comm_get_src_proc(comm), simcall_comm_get_dst_proc(comm));
+ }
+}
+
/** \ingroup msg_gos_functions
* \brief Put a task on a channel of an host and waits for the end of the
* transmission.
*/
MSG_error_t MSG_task_put(m_task_t task, m_host_t dest, m_channel_t channel)
{
+ XBT_WARN("DEPRECATED! Now use MSG_task_send");
return MSG_task_put_with_timeout(task, dest, channel, -1.0);
}
MSG_task_put_bounded(m_task_t task, m_host_t dest, m_channel_t channel,
double maxrate)
{
+ XBT_WARN("DEPRECATED! Now use MSG_task_send_bounded");
task->simdata->rate = maxrate;
return MSG_task_put(task, dest, channel);
}
MSG_task_put_with_timeout(m_task_t task, m_host_t dest,
m_channel_t channel, double timeout)
{
+ XBT_WARN("DEPRECATED! Now use MSG_task_send_with_timeout");
xbt_assert((channel >= 0)
&& (channel < msg_global->max_channel), "Invalid channel %d",
channel);
*/
int MSG_task_Iprobe(m_channel_t channel)
{
+ XBT_WARN("DEPRECATED!");
xbt_assert((channel >= 0)
&& (channel < msg_global->max_channel), "Invalid channel %d",
channel);
*/
int MSG_task_probe_from_host(int channel, m_host_t host)
{
+ XBT_WARN("DEPRECATED! Now use MSG_task_listen_from_host");
xbt_assert((channel >= 0)
&& (channel < msg_global->max_channel), "Invalid channel %d",
channel);
*/
int MSG_task_probe_from(m_channel_t channel)
{
+ XBT_WARN("DEPRECATED! Now use MSG_task_listen_from");
m_task_t task;
CHECK_HOST();
