A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rename sup-mmap.c into mmorecore.c and simplify the code since we want no more than...
[simgrid.git]
/
src
/
msg
/
msg_mailbox.c
diff --git
a/src/msg/msg_mailbox.c
b/src/msg/msg_mailbox.c
index
8d575a6
..
4eb5053
100644
(file)
--- a/
src/msg/msg_mailbox.c
+++ b/
src/msg/msg_mailbox.c
@@
-13,41
+13,41
@@
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_mailbox, msg,
msg_mailbox_t MSG_mailbox_new(const char *alias)
{
msg_mailbox_t MSG_mailbox_new(const char *alias)
{
- return
SIMIX_req
_rdv_create(alias);
+ return
simcall
_rdv_create(alias);
}
void MSG_mailbox_free(void *mailbox)
{
}
void MSG_mailbox_free(void *mailbox)
{
-
SIMIX_req
_rdv_destroy((msg_mailbox_t)mailbox);
+
simcall
_rdv_destroy((msg_mailbox_t)mailbox);
}
int MSG_mailbox_is_empty(msg_mailbox_t mailbox)
{
}
int MSG_mailbox_is_empty(msg_mailbox_t mailbox)
{
- return (NULL ==
SIMIX_req
_rdv_get_head(mailbox));
+ return (NULL ==
simcall
_rdv_get_head(mailbox));
}
m_task_t MSG_mailbox_get_head(msg_mailbox_t mailbox)
{
}
m_task_t MSG_mailbox_get_head(msg_mailbox_t mailbox)
{
- smx_action_t comm =
SIMIX_req
_rdv_get_head(mailbox);
+ smx_action_t comm =
simcall
_rdv_get_head(mailbox);
if (!comm)
return NULL;
if (!comm)
return NULL;
- return (m_task_t)
SIMIX_req
_comm_get_src_data(comm);
+ return (m_task_t)
simcall
_comm_get_src_data(comm);
}
int
MSG_mailbox_get_count_host_waiting_tasks(msg_mailbox_t mailbox,
m_host_t host)
{
}
int
MSG_mailbox_get_count_host_waiting_tasks(msg_mailbox_t mailbox,
m_host_t host)
{
- return
SIMIX_req
_rdv_comm_count_by_host(mailbox,
+ return
simcall
_rdv_comm_count_by_host(mailbox,
host->simdata->smx_host);
}
msg_mailbox_t MSG_mailbox_get_by_alias(const char *alias)
{
host->simdata->smx_host);
}
msg_mailbox_t MSG_mailbox_get_by_alias(const char *alias)
{
- msg_mailbox_t mailbox =
SIMIX_req
_rdv_get_by_name(alias);
+ msg_mailbox_t mailbox =
simcall
_rdv_get_by_name(alias);
if (!mailbox)
mailbox = MSG_mailbox_new(alias);
if (!mailbox)
mailbox = MSG_mailbox_new(alias);
@@
-92,7
+92,7
@@
MSG_mailbox_get_task_ext(msg_mailbox_t mailbox, m_task_t * task,
/* Try to receive it by calling SIMIX network layer */
TRY {
/* Try to receive it by calling SIMIX network layer */
TRY {
-
SIMIX_req
_comm_recv(mailbox, task, NULL, NULL, NULL, timeout);
+
simcall
_comm_recv(mailbox, task, NULL, NULL, NULL, timeout);
XBT_DEBUG("Got task %s from %p",(*task)->name,mailbox);
(*task)->simdata->isused=0;
}
XBT_DEBUG("Got task %s from %p",(*task)->name,mailbox);
(*task)->simdata->isused=0;
}
@@
-154,16
+154,16
@@
MSG_mailbox_put_with_timeout(msg_mailbox_t mailbox, m_task_t task,
/* Try to send it by calling SIMIX network layer */
TRY {
/* Try to send it by calling SIMIX network layer */
TRY {
- smx_action_t comm =
SIMIX_req
_comm_isend(mailbox, t_simdata->message_size,
+ smx_action_t comm =
simcall
_comm_isend(mailbox, t_simdata->message_size,
t_simdata->rate, task, sizeof(void *),
NULL, NULL, task, 0);
#ifdef HAVE_TRACING
if (TRACE_is_enabled()) {
t_simdata->rate, task, sizeof(void *),
NULL, NULL, task, 0);
#ifdef HAVE_TRACING
if (TRACE_is_enabled()) {
-
SIMIX_req
_set_category(comm, task->category);
+
simcall
_set_category(comm, task->category);
}
#endif
t_simdata->comm = comm;
}
#endif
t_simdata->comm = comm;
-
SIMIX_req
_comm_wait(comm, timeout);
+
simcall
_comm_wait(comm, timeout);
}
CATCH(e) {
}
CATCH(e) {