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
mc_api::get_automaton_transition_label() defined and called in run()
[simgrid.git]
/
src
/
msg
/
msg_task.cpp
diff --git
a/src/msg/msg_task.cpp
b/src/msg/msg_task.cpp
index 139ebc8f4742d0dc365249bc30981e5fc7be5425..e7b181cd508a2c62807a2b69173a5af3a2cd76c2 100644
(file)
--- a/
src/msg/msg_task.cpp
+++ b/
src/msg/msg_task.cpp
@@
-103,9
+103,9
@@
msg_error_t Task::execute()
s4u::CommPtr Task::send_async(const std::string& alias, void_f_pvoid_t cleanup, bool detached)
{
if (TRACE_actor_is_enabled()) {
s4u::CommPtr Task::send_async(const std::string& alias, void_f_pvoid_t cleanup, bool detached)
{
if (TRACE_actor_is_enabled()) {
-
container_t process_container
= instr::Container::by_name(instr_pid(*MSG_process_self()));
+
auto* process_container
= instr::Container::by_name(instr_pid(*MSG_process_self()));
std::string key = std::string("p") + std::to_string(get_id());
std::string key = std::string("p") + std::to_string(get_id());
- instr::Container::get_root()->get_link("ACTOR_
TASK_
LINK")->start_event(process_container, "SR", key);
+ instr::Container::get_root()->get_link("ACTOR_LINK")->start_event(process_container, "SR", key);
}
/* Prepare the task to send */
}
/* Prepare the task to send */
@@
-573,10
+573,10
@@
msg_error_t MSG_task_receive_with_timeout_bounded(msg_task_t* task, const char*
}
if (TRACE_actor_is_enabled() && ret != MSG_HOST_FAILURE && ret != MSG_TRANSFER_FAILURE && ret != MSG_TIMEOUT) {
}
if (TRACE_actor_is_enabled() && ret != MSG_HOST_FAILURE && ret != MSG_TRANSFER_FAILURE && ret != MSG_TIMEOUT) {
-
container_t
process_container = simgrid::instr::Container::by_name(instr_pid(*MSG_process_self()));
+
auto*
process_container = simgrid::instr::Container::by_name(instr_pid(*MSG_process_self()));
std::string key = std::string("p") + std::to_string((*task)->get_id());
std::string key = std::string("p") + std::to_string((*task)->get_id());
- simgrid::instr::Container::get_root()->get_link("ACTOR_
TASK_
LINK")->end_event(process_container, "SR", key);
+ simgrid::instr::Container::get_root()->get_link("ACTOR_LINK")->end_event(process_container, "SR", key);
}
return ret;
}
}
return ret;
}
@@
-637,13
+637,7
@@
msg_comm_t MSG_task_irecv_bounded(msg_task_t* task, const char* name, double rat
*/
int MSG_task_listen_from(const char* alias)
{
*/
int MSG_task_listen_from(const char* alias)
{
- /* looks inside the rdv directly. Not clean. */
- simgrid::kernel::activity::CommImplPtr comm = simgrid::s4u::Mailbox::by_name(alias)->front();
-
- if (comm && comm->src_actor_)
- return comm->src_actor_->get_pid();
- else
- return -1;
+ return simgrid::s4u::Mailbox::by_name(alias)->listen_from();
}
/** @brief Destroys the given task.
}
/** @brief Destroys the given task.