-/* Copyright (c) 2004, 2005, 2006, 2007, 2008, 2009, 2010. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2004-2011. 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. */
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_gos, msg,
"Logging specific to MSG (gos)");
-/** \ingroup msg_gos_functions
- *
- * \brief Return the last value returned by a MSG function (except
- * MSG_get_errno...).
- */
-MSG_error_t MSG_get_errno(void)
-{
- return PROCESS_GET_ERRNO();
-}
-
/** \ingroup msg_gos_functions
* \brief Executes a task and waits for its termination.
*
* takes only one parameter.
* \param task a #m_task_t to execute on the location on which the
agent is running.
- * \return #MSG_FATAL if \a task is not properly initialized and
- * #MSG_OK otherwise.
+ * \return #MSG_OK if the task was successfully completed, #MSG_TASK_CANCELED
+ * or #MSG_HOST_FAILURE otherwise
*/
MSG_error_t MSG_task_execute(m_task_t task)
{
#endif
return MSG_OK;
}
+
+ m_process_t self = SIMIX_process_self();
+ p_simdata = SIMIX_process_self_get_data(self);
simdata->isused=1;
simdata->compute =
- SIMIX_req_host_execute(task->name, SIMIX_host_self(),
+ SIMIX_req_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);
#endif
- p_simdata = SIMIX_process_self_get_data();
p_simdata->waiting_action = simdata->compute;
comp_state = SIMIX_req_host_execution_wait(simdata->compute);
p_simdata->waiting_action = NULL;
#ifdef HAVE_TRACING
TRACE_msg_task_execute_end(task);
#endif
- MSG_RETURN(MSG_TASK_CANCELLED);
+ MSG_RETURN(MSG_TASK_CANCELED);
}
}
CHECK_HOST();
simdata = task->simdata;
- p_simdata = SIMIX_process_self_get_data();
+ p_simdata = SIMIX_process_self_get_data(SIMIX_process_self());
xbt_assert((!simdata->compute)
&& (task->simdata->isused == 0),
/* action ended, set comm and compute = NULL, the actions is already destroyed in the main function */
simdata->comm = NULL;
simdata->compute = NULL;
- MSG_RETURN(MSG_TASK_CANCELLED);
+ MSG_RETURN(MSG_TASK_CANCELED);
}
}
listening. This value has to be >=0 and < than the maximal
number of channels fixed with MSG_set_channel_number().
* \param host the host that is to be watched.
- * \return #MSG_FATAL if \a task is equal to \c NULL, #MSG_WARNING
- if \a *task is not equal to \c NULL, and #MSG_OK otherwise.
+ * \return a #MSG_error_t indicating whether the operation was successful (#MSG_OK), or why it failed otherwise.
*/
MSG_error_t
MSG_task_get_from_host(m_task_t * task, m_channel_t channel, m_host_t host)
* \param channel 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 #MSG_FATAL if \a task is equal to \c NULL, #MSG_WARNING
- * if \a *task is not equal to \c NULL, and #MSG_OK otherwise.
+ * \return a #MSG_error_t indicating whether the operation was successful (#MSG_OK), or why it failed otherwise.
*/
MSG_error_t MSG_task_get(m_task_t * task, m_channel_t channel)
{
up. In such a case, #MSG_TRANSFER_FAILURE will be returned, \a task
will not be modified and will still be
equal to \c NULL when returning.
- * \return #MSG_FATAL if \a task is equal to \c NULL, #MSG_WARNING
- if \a *task is not equal to \c NULL, and #MSG_OK otherwise.
+ * \return a #MSG_error_t indicating whether the operation was successful (#MSG_OK), or why it failed otherwise.
*/
MSG_error_t
MSG_task_get_with_timeout(m_task_t * task, m_channel_t channel,
{
return MSG_task_isend_with_matching(task,alias,NULL,NULL);
}
+
/** \ingroup msg_gos_functions
* \brief Sends a task on a mailbox, with support for matching requests
*
/* Prepare the task to send */
t_simdata = task->simdata;
t_simdata->sender = process;
- t_simdata->source = MSG_host_self();
+ t_simdata->source = ((simdata_process_t) SIMIX_process_self_get_data(process))->m_host;
xbt_assert(t_simdata->isused == 0,
"This task is still being used somewhere else. You cannot send it now. Go fix your code!");
comm->status = MSG_OK;
comm->s_comm =
SIMIX_req_comm_isend(mailbox, t_simdata->message_size,
- t_simdata->rate, task, sizeof(void *), match_fun, match_data, 0);
+ 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? */
return comm;
/* Prepare the task to send */
t_simdata = task->simdata;
t_simdata->sender = process;
- t_simdata->source = MSG_host_self();
+ t_simdata->source = ((simdata_process_t) SIMIX_process_self_get_data(process))->m_host;
xbt_assert(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 */
- SIMIX_req_comm_isend(mailbox, t_simdata->message_size,
- t_simdata->rate, task, sizeof(void *), NULL, cleanup, 1);
+ smx_action_t comm = SIMIX_req_comm_isend(mailbox, t_simdata->message_size,
+ t_simdata->rate, task, sizeof(void *), NULL,cleanup, NULL, 1);
+ t_simdata->comm = comm;
}
/** \ingroup msg_gos_functions
if (*task)
XBT_CRITICAL
- ("MSG_task_get() was asked to write in a non empty task struct.");
+ ("MSG_task_irecv() was asked to write in a non empty task struct.");
/* Try to receive it by calling SIMIX network layer */
msg_comm_t comm = xbt_new0(s_msg_comm_t, 1);
int finished = 0;
TRY {
finished = SIMIX_req_comm_test(comm->s_comm);
+
+ if (finished && comm->task_received != NULL) {
+ /* I am the receiver */
+ (*comm->task_received)->simdata->isused = 0;
+ }
}
CATCH(e) {
switch (e.category) {
comm = xbt_dynar_get_as(comms, finished_index, msg_comm_t);
/* the communication is finished */
comm->status = status;
+
+ if (status == MSG_OK && comm->task_received != NULL) {
+ /* I am the receiver */
+ (*comm->task_received)->simdata->isused = 0;
+ }
}
return finished_index;
* \param channel 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 #MSG_FATAL if \a task is not properly initialized and
- * #MSG_OK otherwise. Returns #MSG_HOST_FAILURE if the host on which
- * this function was called was shut down. Returns
+ * \return #MSG_HOST_FAILURE if the host on which
+ * this function was called was shut down,
* #MSG_TRANSFER_FAILURE if the transfer could not be properly done
- * (network failure, dest failure)
+ * (network failure, dest failure) or #MSG_OK if it succeeded.
*/
MSG_error_t MSG_task_put(m_task_t task, m_host_t dest, m_channel_t channel)
{
* \param timeout the maximum time to wait for a task before giving
up. In such a case, #MSG_TRANSFER_FAILURE will be returned, \a task
will not be modified
- * \return #MSG_FATAL if \a task is not properly initialized and
-#MSG_OK otherwise. Returns #MSG_HOST_FAILURE if the host on which
-this function was called was shut down. Returns
+ * \return #MSG_HOST_FAILURE if the host on which
+this function was called was shut down,
#MSG_TRANSFER_FAILURE if the transfer could not be properly done
-(network failure, dest failure, timeout...)
+(network failure, dest failure, timeout...) or #MSG_OK if the communication succeeded.
*/
MSG_error_t
MSG_task_put_with_timeout(m_task_t task, m_host_t dest,
return MSG_process_get_PID(task->simdata->sender);
}
+
+#ifdef MSG_USE_DEPRECATED
+/** \ingroup msg_gos_functions
+ *
+ * \brief Return the last value returned by a MSG function (except
+ * MSG_get_errno...).
+ */
+MSG_error_t MSG_get_errno(void)
+{
+ return PROCESS_GET_ERRNO();
+}
+#endif
