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
Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid
[simgrid.git]
/
src
/
msg
/
msg_gos.cpp
diff --git
a/src/msg/msg_gos.cpp
b/src/msg/msg_gos.cpp
index
3846e9e
..
ad50af0
100644
(file)
--- a/
src/msg/msg_gos.cpp
+++ b/
src/msg/msg_gos.cpp
@@
-22,14
+22,7
@@
extern "C" {
*/
msg_error_t MSG_task_execute(msg_task_t task)
{
*/
msg_error_t MSG_task_execute(msg_task_t task)
{
- /* TODO: add this to other locations */
- msg_host_t host = MSG_process_get_host(MSG_process_self());
- MSG_host_add_task(host, task);
-
- msg_error_t ret = MSG_parallel_task_execute(task);
-
- MSG_host_del_task(host, task);
- return ret;
+ return MSG_parallel_task_execute(task);
}
/** \ingroup msg_task_usage
}
/** \ingroup msg_task_usage
@@
-74,7
+67,8
@@
msg_error_t MSG_parallel_task_execute_with_timeout(msg_task_t task, double timeo
XBT_DEBUG("Parallel execution action created: %p", simdata->compute.get());
} else {
simdata->compute = boost::static_pointer_cast<simgrid::kernel::activity::ExecImpl>(
XBT_DEBUG("Parallel execution action created: %p", simdata->compute.get());
} else {
simdata->compute = boost::static_pointer_cast<simgrid::kernel::activity::ExecImpl>(
- simcall_execution_start(task->name, simdata->flops_amount, simdata->priority, simdata->bound));
+ simcall_execution_start(task->name, simdata->flops_amount, simdata->priority, simdata->bound,
+ MSG_process_get_host(MSG_process_self())));
}
simcall_set_category(simdata->compute, task->category);
comp_state = simcall_execution_wait(simdata->compute);
}
simcall_set_category(simdata->compute, task->category);
comp_state = simcall_execution_wait(simdata->compute);
@@
-259,7
+253,6
@@
msg_error_t MSG_task_receive_ext_bounded(msg_task_t * task, const char *alias, d
THROW_UNIMPLEMENTED;
TRACE_msg_task_get_start();
THROW_UNIMPLEMENTED;
TRACE_msg_task_get_start();
- double start_time = MSG_get_clock();
/* Sanity check */
xbt_assert(task, "Null pointer for the task storage");
/* Sanity check */
xbt_assert(task, "Null pointer for the task storage");
@@
-270,7
+263,7
@@
msg_error_t MSG_task_receive_ext_bounded(msg_task_t * task, const char *alias, d
/* Try to receive it by calling SIMIX network layer */
try {
simcall_comm_recv(MSG_process_self()->getImpl(), mailbox->getImpl(), task, nullptr, nullptr, nullptr, nullptr, timeout, rate);
/* Try to receive it by calling SIMIX network layer */
try {
simcall_comm_recv(MSG_process_self()->getImpl(), mailbox->getImpl(), task, nullptr, nullptr, nullptr, nullptr, timeout, rate);
- XBT_DEBUG("Got task %s from %s", (*task)->name, mailbox->get
N
ame());
+ XBT_DEBUG("Got task %s from %s", (*task)->name, mailbox->get
Cn
ame());
(*task)->simdata->setNotUsed();
}
catch (xbt_ex& e) {
(*task)->simdata->setNotUsed();
}
catch (xbt_ex& e) {
@@
-291,7
+284,7
@@
msg_error_t MSG_task_receive_ext_bounded(msg_task_t * task, const char *alias, d
}
if (ret != MSG_HOST_FAILURE && ret != MSG_TRANSFER_FAILURE && ret != MSG_TIMEOUT) {
}
if (ret != MSG_HOST_FAILURE && ret != MSG_TRANSFER_FAILURE && ret != MSG_TIMEOUT) {
- TRACE_msg_task_get_end(
start_time,
*task);
+ TRACE_msg_task_get_end(*task);
}
return ret;
}
}
return ret;
}