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
Remove unused typedefs.
[simgrid.git]
/
src
/
msg
/
instr_msg_task.cpp
diff --git
a/src/msg/instr_msg_task.cpp
b/src/msg/instr_msg_task.cpp
index
7a146ac
..
6c0d673
100644
(file)
--- a/
src/msg/instr_msg_task.cpp
+++ b/
src/msg/instr_msg_task.cpp
@@
-48,24
+48,18
@@
void TRACE_msg_task_execute_start(msg_task_t task)
{
XBT_DEBUG("EXEC,in %p, %lld, %s", task, task->counter, task->category);
- if (TRACE_msg_process_is_enabled()){
- container_t process_container = simgrid::instr::Container::byName(instr_process_id(MSG_process_self()));
- simgrid::instr::StateType* state =
- static_cast<simgrid::instr::StateType*>(process_container->type_->byName("MSG_PROCESS_STATE"));
- state->pushEvent(MSG_get_clock(), process_container, "task_execute");
- }
+ if (TRACE_actor_is_enabled())
+ simgrid::instr::Container::byName(instr_pid(MSG_process_self()))
+ ->getState("MSG_PROCESS_STATE")
+ ->pushEvent("task_execute");
}
void TRACE_msg_task_execute_end(msg_task_t task)
{
XBT_DEBUG("EXEC,out %p, %lld, %s", task, task->counter, task->category);
- if (TRACE_msg_process_is_enabled()){
- container_t process_container = simgrid::instr::Container::byName(instr_process_id(MSG_process_self()));
- simgrid::instr::StateType* state =
- static_cast<simgrid::instr::StateType*>(process_container->type_->byName("MSG_PROCESS_STATE"));
- state->popEvent(MSG_get_clock(), process_container);
- }
+ if (TRACE_actor_is_enabled())
+ simgrid::instr::Container::byName(instr_pid(MSG_process_self()))->getState("MSG_PROCESS_STATE")->popEvent();
}
/* MSG_task_destroy related functions */
@@
-83,28
+77,22
@@
void TRACE_msg_task_get_start()
{
XBT_DEBUG("GET,in");
- if (TRACE_msg_process_is_enabled()){
- container_t process_container = simgrid::instr::Container::byName(instr_process_id(MSG_process_self()));
- simgrid::instr::StateType* state =
- static_cast<simgrid::instr::StateType*>(process_container->type_->byName("MSG_PROCESS_STATE"));
- state->pushEvent(MSG_get_clock(), process_container, "receive");
- }
+ if (TRACE_actor_is_enabled())
+ simgrid::instr::Container::byName(instr_pid(MSG_process_self()))
+ ->getState("MSG_PROCESS_STATE")
+ ->pushEvent("receive");
}
-void TRACE_msg_task_get_end(
double start_time,
msg_task_t task)
+void TRACE_msg_task_get_end(msg_task_t task)
{
XBT_DEBUG("GET,out %p, %lld, %s", task, task->counter, task->category);
- if (TRACE_msg_process_is_enabled()){
- container_t process_container = simgrid::instr::Container::byName(instr_process_id(MSG_process_self()));
- simgrid::instr::StateType* state =
- static_cast<simgrid::instr::StateType*>(process_container->type_->byName("MSG_PROCESS_STATE"));
- state->popEvent(MSG_get_clock(), process_container);
+ if (TRACE_actor_is_enabled()) {
+ container_t process_container = simgrid::instr::Container::byName(instr_pid(MSG_process_self()));
+ process_container->getState("MSG_PROCESS_STATE")->popEvent();
std::string key = std::string("p") + std::to_string(task->counter);
- simgrid::instr::LinkType* link =
- static_cast<simgrid::instr::LinkType*>(simgrid::instr::Type::getRootType()->byName("MSG_PROCESS_TASK_LINK"));
- link->endEvent(MSG_get_clock(), simgrid::instr::Container::getRootContainer(), process_container, "SR", key);
+ simgrid::instr::Container::getRoot()->getLink("MSG_PROCESS_TASK_LINK")->endEvent(process_container, "SR", key);
}
}
@@
-113,16
+101,12
@@
int TRACE_msg_task_put_start(msg_task_t task)
{
XBT_DEBUG("PUT,in %p, %lld, %s", task, task->counter, task->category);
- if (TRACE_msg_process_is_enabled()){
- container_t process_container = simgrid::instr::Container::byName(instr_process_id(MSG_process_self()));
- simgrid::instr::StateType* state =
- static_cast<simgrid::instr::StateType*>(process_container->type_->byName("MSG_PROCESS_STATE"));
- state->pushEvent(MSG_get_clock(), process_container, "send");
+ if (TRACE_actor_is_enabled()) {
+ container_t process_container = simgrid::instr::Container::byName(instr_pid(MSG_process_self()));
+ process_container->getState("MSG_PROCESS_STATE")->pushEvent("send");
std::string key = std::string("p") + std::to_string(task->counter);
- simgrid::instr::LinkType* link =
- static_cast<simgrid::instr::LinkType*>(simgrid::instr::Type::getRootType()->byName("MSG_PROCESS_TASK_LINK"));
- link->startEvent(MSG_get_clock(), simgrid::instr::Container::getRootContainer(), process_container, "SR", key);
+ simgrid::instr::Container::getRoot()->getLink("MSG_PROCESS_TASK_LINK")->startEvent(process_container, "SR", key);
}
return 1;
@@
-132,10
+116,6
@@
void TRACE_msg_task_put_end()
{
XBT_DEBUG("PUT,out");
- if (TRACE_msg_process_is_enabled()){
- container_t process_container = simgrid::instr::Container::byName(instr_process_id(MSG_process_self()));
- simgrid::instr::StateType* state =
- static_cast<simgrid::instr::StateType*>(process_container->type_->byName("MSG_PROCESS_STATE"));
- state->popEvent(MSG_get_clock(), process_container);
- }
+ if (TRACE_actor_is_enabled())
+ simgrid::instr::Container::byName(instr_pid(MSG_process_self()))->getState("MSG_PROCESS_STATE")->popEvent();
}